diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f502d382..5b86865a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,6 +8,18 @@ body:
       value: |
         Thanks for taking the time to report this bug! Please fill out the details below.
 
+  - type: dropdown
+    id: device-type
+    attributes:
+      label: Device
+      description: Which device is this affecting?
+      options:
+        - X4
+        - X3
+        - Both
+    validations:
+      required: true
+
   - type: input
     id: version
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ac299f43..3e95c63e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,5 @@
 ## Summary
 
-- **What changes are included?**
+### **What changes are included?**
+
+
diff --git a/.github/workflows/release-fonts.yml b/.github/workflows/release-fonts.yml
new file mode 100644
index 00000000..c95c0927
--- /dev/null
+++ b/.github/workflows/release-fonts.yml
@@ -0,0 +1,106 @@
+name: Build & Publish SD Card Fonts
+
+# Fonts change rarely — run manually when font sources or the conversion
+# pipeline are updated.  Publishes .cpfont files + fonts.json manifest as
+# GitHub Release assets on the crosspoint-fonts repo so font releases don't
+# clutter the firmware releases page.
+#
+# Requires a repository secret FONTS_REPO_TOKEN — a fine-grained PAT (or
+# classic PAT) with contents:write permission on the target fonts repo.
+on:
+  workflow_dispatch:
+
+env:
+  FONTS_REPO: crosspoint-reader/crosspoint-fonts
+
+jobs:
+  build-fonts:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: '3.14'
+
+      - name: Install font tools
+        run: pip install freetype-py fonttools pyyaml
+
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y libfreetype6-dev
+
+      - name: Read version constants
+        id: versions
+        run: |
+          cd lib/EpdFont/scripts
+          echo "binary=$(python3 -c 'from cpfont_version import CPFONT_VERSION; print(CPFONT_VERSION)')" >> "$GITHUB_OUTPUT"
+          echo "metadata=$(python3 -c 'from cpfont_version import FONTS_MANIFEST_VERSION; print(FONTS_MANIFEST_VERSION)')" >> "$GITHUB_OUTPUT"
+
+      - name: Build SD card fonts
+        run: python3 lib/EpdFont/scripts/build-sd-fonts.py --clean --verbose -j 1
+
+      - name: Flatten output for release assets
+        run: |
+          mkdir -p dist
+          find lib/EpdFont/scripts/output -name '*.cpfont' -exec cp {} dist/ \;
+
+      - name: Compute release tags
+        id: tags
+        env:
+          GH_TOKEN: ${{ secrets.FONTS_REPO_TOKEN }}
+        run: |
+          BASE="sd-fonts-m${{ steps.versions.outputs.metadata }}-b${{ steps.versions.outputs.binary }}"
+          echo "base=$BASE" >> "$GITHUB_OUTPUT"
+
+          # Find the highest existing revision for this m/b pair
+          LAST=$(gh release list --repo "${{ env.FONTS_REPO }}" \
+            --json tagName --jq \
+            '[.[] | select(.tagName | startswith("'"${BASE}-r"'")) | .tagName | split("-r")[1] | tonumber] | max // 0')
+          NEXT=$((LAST + 1))
+          echo "revision=$NEXT" >> "$GITHUB_OUTPUT"
+          echo "versioned=${BASE}-r${NEXT}" >> "$GITHUB_OUTPUT"
+
+      - name: Generate manifest
+        run: |
+          python3 scripts/generate-font-manifest.py \
+            --input dist \
+            --base-url "https://github.com/${{ env.FONTS_REPO }}/releases/download/${{ steps.tags.outputs.base }}/" \
+            --output dist/fonts.json \
+            --descriptions-from lib/EpdFont/scripts/sd-fonts.yaml
+
+      - name: Publish versioned release to fonts repo
+        env:
+          GH_TOKEN: ${{ secrets.FONTS_REPO_TOKEN }}
+        run: |
+          VERSIONED="${{ steps.tags.outputs.versioned }}"
+          TITLE="SD Card Fonts (${VERSIONED#sd-fonts-})"
+
+          gh release create "$VERSIONED" dist/* \
+            --repo "${{ env.FONTS_REPO }}" \
+            --title "$TITLE" \
+            --notes "Pre-built \`.cpfont\` font files for CrossPoint Reader.
+
+          Download individual files or use **Settings > System > Manage Fonts** on the device.
+
+          See [SD Card Fonts documentation](https://github.com/${{ github.repository }}/blob/main/docs/sd-card-fonts.md) for details."
+
+      - name: Update stable tag for device downloads
+        env:
+          GH_TOKEN: ${{ secrets.FONTS_REPO_TOKEN }}
+        run: |
+          BASE="${{ steps.tags.outputs.base }}"
+
+          # Delete the old stable release for this m/b pair (the versioned releases are kept)
+          gh release delete "$BASE" --repo "${{ env.FONTS_REPO }}" --yes 2>/dev/null || true
+
+          gh release create "$BASE" dist/* \
+            --repo "${{ env.FONTS_REPO }}" \
+            --title "SD Card Fonts (${BASE#sd-fonts-})" \
+            --notes "Current font build for manifest v${{ steps.versions.outputs.metadata }}, binary format v${{ steps.versions.outputs.binary }}. Devices with this firmware version download from this release.
+
+          This is revision **${{ steps.tags.outputs.revision }}** — see [\`${{ steps.tags.outputs.versioned }}\`](https://github.com/${{ env.FONTS_REPO }}/releases/tag/${{ steps.tags.outputs.versioned }}) for the immutable copy.
+
+          Download individual files or use **Settings > System > Manage fonts** on the device."
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7440aeb2..3957b19d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Release version, without the leading v. Example: 1.2.9.1"
+        description: "Compile release builds"
         required: true
         type: string
   push:
     tags:
-      - "v*"
+      - 'v[0-9]+.[0-9]+.[0-9]+'
 
 permissions:
   contents: write
@@ -20,6 +20,14 @@ jobs:
       - uses: actions/checkout@v6
         with:
           submodules: recursive
+          fetch-depth: 0
+
+      - name: Verify release tag is on main
+        if: github.event_name == 'push'
+        run: |
+          git fetch origin main:refs/remotes/origin/main
+          TAG_COMMIT="$(git rev-list -n 1 "$GITHUB_REF_NAME")"
+          git merge-base --is-ancestor "$TAG_COMMIT" origin/main
 
       - uses: actions/setup-python@v6
         with:
@@ -53,26 +61,47 @@ jobs:
           echo "RELEASE_VERSION=$VERSION" >> "$GITHUB_ENV"
           sed -i "s/crossink_version = .*/crossink_version = $VERSION/" platformio.ini
 
-      - name: Build CrossInk-Carousel
+      - name: Build CrossPoint
         env:
           CROSSPOINT_RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
         run: pio run -e tiny -e xlarge -e no_emoji
 
-      - name: Rename binaries with carousel prefix
+      - name: Generate release catalog
+        run: |
+          python3 scripts/generate_release_catalog.py \
+            --version "${{ env.RELEASE_VERSION }}" \
+            --repo "${{ github.repository }}" \
+            --firmware ".pio/build/tiny/firmware-tiny-v${{ env.RELEASE_VERSION }}.bin" \
+            --firmware ".pio/build/xlarge/firmware-xlarge-v${{ env.RELEASE_VERSION }}.bin" \
+            --firmware ".pio/build/no_emoji/firmware-no_emoji-v${{ env.RELEASE_VERSION }}.bin" \
+            --output ".pio/build/catalog"
+
+      - name: Publish catalog to GitHub Pages source
+        env:
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
         run: |
-          for v in tiny xlarge no_emoji; do
-            cp ".pio/build/$v/firmware-$v-v${RELEASE_VERSION}.bin" \
-               ".pio/build/$v/carousel-firmware-$v-v${RELEASE_VERSION}.bin"
-          done
+          git config user.name "uxjulia"
+          git config user.email "julia@uxj.io"
+          git fetch origin "$DEFAULT_BRANCH"
+          git worktree add ../crossink-pages "origin/$DEFAULT_BRANCH"
+          cp ".pio/build/catalog" "../crossink-pages/docs/catalog"
+          cd ../crossink-pages
+          if git diff --quiet -- docs/catalog; then
+            echo "docs/catalog is already current"
+            exit 0
+          fi
+          git add docs/catalog
+          git commit -m "Update release catalog for v${RELEASE_VERSION}"
+          git push origin "HEAD:$DEFAULT_BRANCH"
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v3
         with:
+          token: ${{ secrets.RELEASE_PAT }}
           tag_name: v${{ env.RELEASE_VERSION }}
           target_commitish: ${{ github.sha }}
           draft: true
-          generate_release_notes: true
           files: |
-            .pio/build/tiny/carousel-firmware-tiny-v${{ env.RELEASE_VERSION }}.bin
-            .pio/build/xlarge/carousel-firmware-xlarge-v${{ env.RELEASE_VERSION }}.bin
-            .pio/build/no_emoji/carousel-firmware-no_emoji-v${{ env.RELEASE_VERSION }}.bin
+            .pio/build/tiny/firmware-tiny-v${{ env.RELEASE_VERSION }}.bin
+            .pio/build/xlarge/firmware-xlarge-v${{ env.RELEASE_VERSION }}.bin
+            .pio/build/no_emoji/firmware-no_emoji-v${{ env.RELEASE_VERSION }}.bin
diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
index 9da43548..3d5ab853 100644
--- a/.github/workflows/release_candidate.yml
+++ b/.github/workflows/release_candidate.yml
@@ -93,6 +93,7 @@ jobs:
       - name: Create GitHub RC Prerelease
         uses: softprops/action-gh-release@v3
         with:
+          token: ${{ secrets.RELEASE_PAT }}
           tag_name: ${{ env.RC_TAG }}
           target_commitish: ${{ github.sha }}
           name: RC ${{ env.RC_BRANCH_SAFE }} ${{ env.RC_HASH_SHORT }}
diff --git a/.gitignore b/.gitignore
index e861e414..0a5a03ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,8 @@ fs_/
 releases/
 
 # scratchpad used as release notes for next crossink version
-release.md
\ No newline at end of file
+release.md
+*.cpfont
+lib/EpdFont/scripts/downloaded_fonts/
+lib/EpdFont/scripts/instanced_fonts/
+lib/EpdFont/scripts/output/
diff --git a/.gitmodules b/.gitmodules
index b0d8e240..80308f05 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "open-x4-sdk"]
 	path = open-x4-sdk
-	url = https://github.com/open-x4-epaper/community-sdk.git
+	url = https://github.com/crosspoint-reader/community-sdk.git
diff --git a/AGENTS.md b/AGENTS.md
index 2ac669e5..eaf1bde1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -37,6 +37,7 @@ Project: Open-source e-reader firmware for Xteink X4 (ESP32-C3).
 6. Prefer `constexpr` for compile-time constants.
 7. Reserve `std::vector` capacity before push loops.
 8. Debounce persistent writes. Do not write progress on every page turn.
+9. `new` is not nothrow on ESP32. With exceptions disabled, bare `new` calls `abort()` on allocation failure instead of returning `nullptr`. Use `new (std::nothrow)` or `makeUniqueNoThrow<T>()` from `lib/Memory/Memory.h` for fallible allocations.
 
 ## HAL And Platform Rules
 
@@ -84,11 +85,21 @@ Project: Open-source e-reader firmware for Xteink X4 (ESP32-C3).
 
 ## Changelog
 
-When new features are added or issues are fixed, make sure to add an entry to `CHANGELOG.md`. Types of changes should have their own section:
+When new features are added or issues are fixed, make sure to add an entry to `CHANGELOG.md` with the user-facing description of the change. Types of changes should have their own section.
 
-Added - for new features.
-Changed - for changes in existing functionality.
-Deprecated - for soon-to-be removed features.
-Removed - for now removed features.
-Fixed - for any bug fixes.
-Security - in case of vulnerabilities.
\ No newline at end of file
+### Changelog Guiding Principles
+
+- Changelogs are _for humans_, not machines.
+- There should be an entry for every single version.
+- The same types of changes should be grouped.
+- Versions and sections should be linkable.
+- The latest version comes first.
+- The release date of each version is displayed.
+
+### Types of Changelog Changes
+- Added - for new features.
+- Changed - for changes in existing functionality.
+- Deprecated - for soon-to-be removed features.
+- Removed - for now removed features.
+- Fixed - for any bug fixes.
+- Security - in case of vulnerabilities.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378990b5..bb969fde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,20 +2,98 @@
 
 ## [Unreleased]
 
-### Added
-- New "Tap Power While Asleep to Cycle" display setting. When on, a brief power-button tap from sleep picks a fresh random image from `/.sleep` and re-enters deep sleep, instead of waking. Off by default — each cycle costs a boot + e-ink half-refresh worth of battery. Pinned sleep images are skipped in cycle mode (always random)
+## [flexble-v1.0.0] - 2026-05-17
+First stable FlexBLE release post-upstream-merge. FlexBLE now uses its own semver (`flexble_version`) independent of upstream CrossInk's versioning. The `crossink_version` field continues to track the upstream sync point (currently 1.2.11.1).
+
+### Added (FlexBLE fork)
 - BLE HID page-turner support. From inside a book, open the reader menu and select **Bluetooth** to pair a Bluetooth remote (e.g. IINE GameBrick) and use its buttons as virtual page-turn keys. Reader-session-only: BLE auto-disables when you exit the book. Pairing is remembered across reboots; enable Bluetooth in a later reader session to auto-reconnect.
+- **BT Quick Connect** action in the Global Book Settings drawer. From inside a book, long-press the menu button → scroll to "BT Quick Connect" → activates BLE and reconnects to the last bonded remote (or launches the pairing UI if no remote is saved). Closes the drawer back to the book on success.
+- After a successful BT connection from the in-book Bluetooth menu, FlexBLE now auto-pops both the BT settings and the reader menu so the user lands straight back in the book — no manual back-tapping required.
+- New "Tap Power While Asleep to Cycle" display setting. When on, a brief power-button tap from sleep picks a fresh random image from `/.sleep` and re-enters deep sleep, instead of waking. Off by default — each cycle costs a boot + e-ink half-refresh worth of battery. Pinned sleep images are skipped in cycle mode (always random).
 - `.png` sleep images (including transparency) are now accepted in **Custom** Sleep Screen mode, not just Page Overlay. Transparent regions compose over the last reader page so a transparent PNG sleep screen reveals book text underneath. On the deep-sleep cycle path (tap-power-while-asleep), the last reader page is restored from a small SD-cached snapshot written when leaving a book.
 - **Global Book Settings** drawer. Long-press the menu button in a book to pop up a bottom-drawer-style quick-settings panel with a "Global Book Settings" tab on top. Lists every reader setting (font, layout, hyphenation, bionic, images, etc.) and uses e-ink fast refresh so toggling is snappy. Closing the drawer re-flows the page immediately when a setting was actually changed; a no-op visit skips the re-layout. Triggered via the existing `longPressMenuAction` setting (default flipped to the new "Book Settings" option). Architecture adapted from [inx by Dave Allie](https://github.com/obijuankenobiii/inx) (MIT).
+- **PackBits-compressed BW backup** for the grayscale anti-aliasing pass. Replaces the chunked 12 × 4 KB lazy allocation with a single 16-32 KB worst-case bounded buffer. Typical reader pages compress to 2-5 KB, dramatically reducing the fragmentation pressure that caused grayscale to fail when BLE was active.
+- Auto-retry on chapter-layout abort: if the parser trips the low-heap floor while BLE is consuming its ~58 KB share, FlexBLE silently drops BLE, retries the layout (now with the extra headroom), and lets the existing auto-reconnect logic re-establish the link on the user's next remote button press.
 
-### Changed
+### Changed (FlexBLE fork)
+- Bluetooth main menu now uses Up/Down labels and binds both side U/D and front L/R to navigation, matching Reader Options and Controls Options conventions.
+- LYRA_FLOW (5-book carousel) preserved as a first-class theme option through the upstream merge. Front Prev/Next iterates within the carousel only; side Up/Down jumps to the menu list and iterates through it, with the carousel staying pinned to the last selected book.
 - Reader setting labels dropped the redundant "Reader" prefix ("Font Family", "Font Size", "Line Spacing", "Screen Margin", "Paragraph Alignment") so they fit better in the drawer.
+- Default `tiny` build now omits the Teensy (8px) font variant to make room for the NimBLE-Arduino BLE stack. Re-enable by removing `OMIT_TEENSY_FONT` from `platformio.ini` if you don't need Bluetooth.
+- EPUB layout heap thresholds relaxed for BLE-paired sessions: text-layout floor 48 → 16 KB free, image-extraction floor 72 → 56 KB free. Brings parser within reach of the heap remaining after NimBLE allocations; failures still degrade gracefully (image extraction falls back to "page rendered without images"; layout aborts trigger the new BLE-disable-and-retry path).
+- BookSettingsDrawer hint area enlarged so the bottom button labels render fully (were clipped against the screen edge at the previous height).
+- Settings → System now displays `FlexBLE x.y.z (CrossInk x.y.z.z)` so both the fork and upstream sync version are visible.
+- Merged upstream CrossInk v1.2.10 and v1.2.11/v1.2.11.1 (see entries below for what those releases brought).
+
+### Fixed (FlexBLE fork)
+- BLE page-turner could hang at chapter boundaries when a release HID frame was dropped (NimBLE task starvation during the heavy section-load render is a common trigger). Subsequent presses were silently filtered out by both the BLE-side `activeInjectedButton` gate and HalGPIO's same-state short-circuit, requiring a book exit/re-enter to recover. Added two backstops: a 2 s max-hold auto-release on virtual buttons (suppressed release edge so no phantom page turn fires), and a force-release of a stuck injection in Game Brick's same-key re-press promotion path.
+- BluetoothSettings used `wasPressed(Confirm)` for action triggers instead of `wasReleased`, causing the Confirm release to leak through pop transitions and re-launch the BT menu from the reader menu underneath. All five action handlers now consistently use `wasReleased`.
+- Reader exit during BLE reconnect: tapping Back impatiently during the 2-3 s connect freeze used to leak the release through to the reader's home-on-back-release handler, exiting the book and auto-disabling BLE. The next Back release is now suppressed when `checkAutoReconnect` blocked for >500 ms.
+- Flow theme home carousel input grammar fixed across the merge — front Prev/Next stays within the carousel, side U/D moves through menu items without dragging the carousel along.
+
+## [v1.2.11.1] - 2026-05-15
 
 ### Changed
-- Default `tiny` build now omits the Teensy (8px) font variant to make room for the NimBLE-Arduino BLE stack. Re-enable by removing `OMIT_TEENSY_FONT` from `platformio.ini` if you don't need Bluetooth.
+- Removed Medium font size from `xlarge` build to get it below the size limit
 
 ### Fixed
-- BLE page-turner could hang at chapter boundaries when a release HID frame was dropped (NimBLE task starvation during the heavy section-load render is a common trigger). Subsequent presses were silently filtered out by both the BLE-side `activeInjectedButton` gate and HalGPIO's same-state short-circuit, requiring a book exit/re-enter to recover. Added two backstops: a 2 s max-hold auto-release on virtual buttons (suppressed release edge so no phantom page turn fires), and a force-release of a stuck injection in Game Brick's same-key re-press promotion path.
+- Included Lyra Carousel by activating the build flag `DCROSSINK_ENABLE_LYRA_CAROUSEL=1`
+
+## [v1.2.11] - 2026-05-14
+
+### Added
+- Added new personal theme: "Minimal"
+- Added a custom sleep timer picker so `Time to Sleep` can be set from 1 to 30 minutes instead of cycling fixed presets.
+- Added an in-reader Controls shortcut so you can customize your buttons without leaving the book.
+- Added bookmark cleanup shortcuts: hold Select on a bookmark to delete it, or hold Open on a book in Bookmarks to clear that book's bookmark list.
+- Added a confirmation message after deleting a book's cache from the reader or File Browser.
+- Added a File Browser long-press action for deleting an EPUB or XTC book's cache
+- Added a File Browser long-press action for marking EPUB books as finished or unfinished.
+
+### Changed
+- Hardened deep sleep entry by shutting WiFi down before waiting for the power button to be released.
+- Raised the web file-transfer filename limit from 100 to 150 bytes so longer uploaded filenames are preserved.
+- Made the in-reader Reader Options menu include the same Reader settings and actions as Settings > Reader.
+
+### Fixed
+- Fixed inline EPUB images disappearing in landscape when their bottom edge slightly overlaps the screen margin.
+- Reduced unnecessary low-memory image suppression for JPEG-heavy EPUB chapters and added CSS heap diagnostics during chapter rebuilds.
+- Allowed wider inline JPEG images in EPUBs to render when they still fit the total pixel and heap safety limits.
+- Fixed the SD-card font picker reopening immediately after selecting a font from Settings > Reader > Font Family.
+- Fixed in-reader font-size changes for SD card fonts not working
+- Fixed in-reader SD-card font changes not always rebuilding the current EPUB page layout.
+
+## [v1.2.10] - 2026-05-11
+
+### Added
+- Added a `Recent Books View` setting so the dedicated Recent Books screen can switch between the classic list and a 3x3 cover grid.
+- Added more flexible reader controls, including orientation-aware front/side button settings, nav-only or all-button front inversion, tilt page turn shortcuts, and side-button long-press rotation actions.
+- Added a per-session auto page turn interval picker with values from 5 to 120 seconds.
+- Added a file-browser Home/Back long-press action for toggling hidden files and folders.
+- Added EPUB rendering and diagnostics improvements, including visible `<hr>` separators and heap logs around section rebuilds, image extraction, page serialization, and sleep-cache rebuilds.
+- Added reader font coverage for block redactions, black-square ornaments, Greek category letters, and turned-comma punctuation (PR #104).
+- Added simulator tools for testing sleep/wake behavior and smoke-testing common screens and EPUB reader menus.
+
+### Changed
+- Reduced Controls settings section spacing so the grouped controls fit better on X3 screens.
+- Made front reader long-press actions trigger when the hold delay is reached while normal page turns still trigger on release.
+
+- Used the fast EPUB spine/TOC indexing path for books with 300+ spine entries so heavily split books build `book.bin` faster on first open.
+- Allowed the web file manager and WebDAV to browse dot-prefixed hidden files when hidden files are enabled, matching the device file browser.
+
+### Fixed
+- Fixed reader button and shortcut behavior, including X3 power-button wake filtering, folder delete long-press timing, and WiFi scan/connect screens that could not be exited while work was in progress.
+- Fixed RoundedRaff home-menu, keyboard, and button-hint rendering issues so Settings remains reachable and compact labels no longer overlap or disappear.
+- Fixed font and glyph handling by reducing persistent SD-card font advance-cache memory, releasing optional font caches before image extraction only when heap is tight, and showing a visible replacement symbol when compact UI fonts lack `U+FFFD`.
+- Fixed KOReader Sync authentication diagnostics and an in-reader sync crash, including clearer handling when a server or proxy returns non-JSON content.
+- Fixed EPUB text rendering for redactions, whitespace-only XHTML text nodes, simple black CSS span backgrounds, list bullets in `<li><p>...</p></li>` items, and very long base64-like text runs.
+- Fixed EPUB image, thumbnail, and section-rebuild stability so image-heavy chapters use less temporary memory, scale images more reliably, avoid stale dimensions, and suppress optional image work earlier under heap pressure.
+- Fixed EPUB low-memory and cache safety by skipping optional next-chapter indexing and sleep-page cache rebuilds when heap is tight, failing safely with a malformed-book warning and Home exit path, rebuilding incompatible fork-written caches, and handling low-memory CSS parsing, truncated SD writes, invalid serialized strings, and failed temp-cache promotion.
+- Fixed a Home crash after clearing reading cache by skipping optional EPUB thumbnail rebuilds when the source EPUB cache is missing.
+- Fixed reader prewarm behavior by skipping image decoding, keeping mixed-style font glyphs cached together, and avoiding section rebuilds for render-quality-only option changes.
+- Fixed concurrent render/storage crashes by serializing `GfxRenderer` scratch-buffer access, shared SPI bus access, and failed SPI lock cleanup.
+- Fixed Recent Books, EPUB/XTC thumbnail caches, deleted-folder metadata, and XTC cover scaling so cached book data stays in sync and grid covers fill their slots correctly.
+- Fixed simulator build configuration so SDL2 and simulator-provided network/OTA shims compile cleanly.
 
 ## [v1.2.9.1] - 2026-05-03
 
@@ -23,10 +101,7 @@
 - Cleaned up EPUB table rendering by removing synthetic row/cell labels and defaulting table cells to readable left alignment
 - Allow simple EPUB tables with full-width note rows so a single `colspan` cell spanning the whole table no longer forces the entire table back to paragraph fallback
 
-### Added
-- Short-press power button acts as confirm within the in-reader menus
-
 ### Fixed
 - Fix power-button shortcut conflicts outside the reader so reader-only actions fall back to `Confirm` while Sleep, Refresh, Screenshot, Sync Progress, and File Transfer remain real power actions. Those that had short-press power button to act as sleep saw unstable behavior previously. This should be fixed now
 - Fix a potential crash when using `Go to %` in EPUBs
-- Fix a potential crash when entering sleep with Page Overlay enabled if the cached EPUB page data is invalid
\ No newline at end of file
+- Fix a potential crash when entering sleep with Page Overlay enabled if the cached EPUB page data is invalid
diff --git a/README.md b/README.md
index 7f45f072..0e97b23a 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,13 @@ My goal with this fork was to maintain the core Crosspoint firmware while integr
 ### Highlights
 
 - New reader fonts: ChareInk, Lexend Deca, and Bitter
-- Unicode emoji and miscellaneous symbols support
+- Unicode emoji and miscellaneous symbols support (a limited subset)
 - Adjusted font sizes: Teensy (8pt), Tiny (10pt), Small (12pt), Medium (14pt), Large (16pt), Extra Large (18pt), Huge (20pt). See [Font Sizes](#font-sizes) for more details.
 - Added ~~strikethrough~~ support
 - Made <u>underlines</u> thicker for better visibility
+- Added support for `<hr>` section breaks
+- Added support for "redaction" style rendering
+- Added improved support for tables with simple markup
 - Added ability to add bookmarks
 - Added ability to remap front buttons that only applies in the reader
 - Added Bionic Reading and Guide Dots as optional reader modes
@@ -70,10 +73,11 @@ My goal with this fork was to maintain the core Crosspoint firmware while integr
   - To turn this on, go to Settings > System > Move finished books to Read folder. Once a book is marked as finished, the book will be moved to the folder when the book is closed.
 - In-book menu to quickly adjust reader options without having to exit the book
 - Reading stats: total books read, total reading time, number of sessions, pages turned, average session time, pages turned per minute. You can also set your reading stats as your sleep screen.
-- Changed label for "Auto Turn (Pages Per Minute)" to "Auto Page Turn Interval (seconds)"
-  - Added additional page turn intervals (how many seconds pass between page turns). Options are now (in seconds): 60, 45, 30, 20, 15, 10, 5, OFF.
-- Added Vietnamese language support
+- Added customizable Auto Page Turn Interval (anything between 5-120 seconds)
+- Added ability to view Recent Books as a 3x3 grid view
+- Added ability to install custom fonts on the SD card
 - Device simulator during development
+- To view a more detailed list for each version, visit the [releases](https://github.com/uxjulia/CrossInk/releases) page to read release notes.
 
 ---
 
@@ -87,6 +91,18 @@ The default fonts have been replaced with ChareInk, Lexend Deca, and Bitter. The
 
 The UI now uses [Inter](https://fonts.google.com/specimen/Inter) as the display font which has improved readability at smaller sizes.
 
+### Wireless workflows
+
+- File transfer web UI
+- EPUB Optimizer
+- Web settings UI/API (edit many device settings from browser)
+- WebSocket fast uploads
+- WebDAV handler
+- AP mode (hotspot) and STA mode (join existing WiFi), both with QR helpers
+- Calibre wireless connect flow
+- OPDS browser with saved servers (up to 8), search, pagination, and direct download
+- OTA update checks and installs from GitHub releases
+
 ### Emojis and Misc Glyphs
 
 - Support for a limited set of Unicode [Emoticons](https://unicode-explorer.com/b/1F600) and [Miscellaneous Symbols](https://unicode-explorer.com/b/2600) using [Noto Emoji](https://fonts.google.com/noto/specimen/Noto+Emoji) and [Noto Sans Symbols](https://fonts.google.com/noto/specimen/Noto+Sans+Symbols) font.
@@ -114,19 +130,17 @@ There are 3 available build variants to choose from due to build size constraint
 > Teensy, Tiny, and Small font sizes had to be removed to reduce build size and still support emoji/symbols.
 
 - Emoji & Misc. Symbols Support
-- 4 Font sizes:
-  - Medium (14pt)
+- 3 Font sizes:
   - Large (16pt)
   - Extra Large (18pt)
   - Huge (20pt)
 
 **no_emoji**
 
-> All standard font sizes through Extra Large are available, but no emoji/symbols support.
+> All standard font sizes from Tiny through Extra Large are available, but no emoji/symbols support.
 
 - **No** Emoji & Misc. Symbols Support
-- 6 Font sizes:
-  - Teensy (8pt)
+- 5 Font sizes:
   - Tiny (10pt)
   - Small (12pt)
   - Medium (14pt)
@@ -196,6 +210,7 @@ Map the **Power** or **Menu** button short/long-press action to one of the follo
 - Take Screenshot (takes a screenshot)
 - Auto Page Turn (cycles through the page turn intervals: **Off → 5s → 10s → 15s → 20s → 30s → 45s → 60s → Off →**)
 - File Transfer (opens the File Transfer menu)
+- Tilt Page Turn (turns tilt-based page turning on/off on supported devices)
 
 ### Reading stats
 
@@ -266,7 +281,9 @@ pio run -e simulator
 
 ---
 
-## Installing
+### Localization
+
+CrossPoint includes 22 UI languages and counting.
 
 ### Web
 
@@ -278,7 +295,52 @@ pio run -e simulator
 
 To revert back to the official firmware, you can flash the latest official firmware from https://crosspointreader.com/#flash-tools
 
-### Command line (specific firmware version)
+---
+
+## USB-locked devices (Xteink Unlocker)
+
+Some Xteink units purchased from third-party stores (e.g. AliExpress) ship with USB flashing locked from the factory.
+If your device is locked, you will need to use the **Xteink Unlocker** tool available at
+https://crosspointreader.com/#unlock-tool before you can flash CrossPoint.
+
+**You do not need this tool if you bought your device directly from xteink.com.** Those units are not locked.
+
+**Not sure if your device is locked?** Power it on, connect the USB-C cable, and try flashing via the web flasher first (see
+[Install firmware](#install-firmware) below). If the browser's serial device picker does not show your device, try a different
+USB port or browser before assuming the device is locked. Only reach for the unlocker if the device still doesn't appear.
+
+### ⚠️ WARNING: READ THIS BEFORE USING THE UNLOCKER ⚠️
+
+**The only officially supported firmwares in the unlock tool are CrossPoint and CrossInk.**
+
+Flashing any other firmware on a USB-locked device may **permanently brick the device** or leave it **permanently
+stuck on that firmware with no recovery path**. Once USB flashing is re-locked, your only way back is via OTA, and if
+the firmware you flashed doesn't support OTA, **there is no way out**.
+
+**The Papyrix fork has removed OTA update support from its code.** If you flash Papyrix onto a
+USB-locked unit, you will have **zero update or recovery path** and will be stuck on it forever. **Do not flash
+Papyrix (or any other unsupported firmware) on a locked device.**
+
+## Install firmware
+
+### Web installer (recommended)
+
+1. Connect your device to your computer via USB-C and wake/unlock the device
+2. Go to https://crosspointreader.com/#flash-tools, select device (X3 or X4), and choose an official CrossPoint release.
+
+### Web installer (specific version)
+
+1. Connect your device to your computer via USB-C and wake/unlock the device
+2. Download a `firmware.bin` from [Releases](https://github.com/crosspoint-reader/crosspoint-reader/releases), local build, or continuous integration artifact.
+3. Go to https://crosspointreader.com/#flash-tools, select device (X3 or X4), click "Custom .bin" and upload a `firmware.bin`.
+
+### Revert to Official Firmware
+
+To revert to the official firmware, you can also flash the latest official firmware using https://crosspointreader.com/#flash-tools.
+
+### Command line
+
+1. Install [`esptool`](https://github.com/espressif/esptool):
 
 > **Note:** These instructions are for macOS and Linux. Windows users should use the [Web installer](#web) instead.
 
@@ -306,7 +368,19 @@ esptool.py --chip esp32c3 --port /dev/cu.usbmodem2101 --baud 921600 write_flash
 # Swap the filename for the variant (tiny / xlarge / no_emoji) and version you downloaded.
 ```
 
-## Development
+---
+
+## Documentation
+
+- [User Guide](./USER_GUIDE.md)
+- [Web server usage](./docs/webserver.md)
+- [Web server endpoints](./docs/webserver-endpoints.md)
+- [Project scope](./SCOPE.md)
+- [Contributing docs](./docs/contributing/README.md)
+
+---
+
+## Development quick start
 
 ### Prerequisites
 
@@ -315,18 +389,18 @@ esptool.py --chip esp32c3 --port /dev/cu.usbmodem2101 --baud 921600 write_flash
 - USB-C cable for flashing the ESP32-C3
 - Xteink X4
 
-### Checking out the code
+### Setup
 
 CrossPoint uses PlatformIO for building and flashing the firmware. To get started, clone the repository:
 
 ```
 git clone --recursive https://github.com/chintanvajariya/CrossInk-Carousel
 
-# Or, if you've already cloned without --recursive:
+# if cloned without --recursive:
 git submodule update --init --recursive
 ```
 
-### Flashing your device
+### Build / flash / monitor
 
 Connect your Xteink X4 to your computer via USB-C and run the following command. Replace `tiny` with `xlarge` or `no_emoji` if you prefer a different build variant (see [Font Sizes](#font-sizes)).
 
@@ -344,7 +418,7 @@ First, make sure all required Python packages are installed:
 python3 -m pip install pyserial colorama matplotlib
 ```
 
-after that run the script:
+After that run the script:
 
 ```sh
 # For Linux
@@ -357,6 +431,8 @@ python3 scripts/debugging_monitor.py /dev/cu.usbmodem2101
 
 Minor adjustments may be required for Windows.
 
+---
+
 ## Internals
 
 The firmware is pretty aggressive about caching data down to the SD card to minimise RAM usage. The ESP32-C3 only
@@ -379,8 +455,6 @@ cache. This cache directory exists at `.crosspoint` on the SD card. The structur
 │       ├── 0.bin        # Chapter data (screen count, all text layout info, etc.)
 │       ├── 1.bin        #     files are named by their index in the spine
 │       └── ...
-│
-└── epub_189013891/
 ```
 
 Deleting the `.crosspoint` directory will clear the entire cache.
diff --git a/USER_GUIDE.md b/USER_GUIDE.md
index f565b720..82719cf8 100644
--- a/USER_GUIDE.md
+++ b/USER_GUIDE.md
@@ -23,6 +23,8 @@ Welcome to the **CrossInk** firmware. This guide outlines the hardware controls,
       - [3.6.5 OPDS Servers (Multiple Libraries)](#365-opds-servers-multiple-libraries)
       - [3.6.6 Web Settings (WiFi + OPDS)](#366-web-settings-wifi--opds)
       - [3.6.7 KOReader Sync Quick Setup](#367-koreader-sync-quick-setup)
+      - [3.6.6 Web Settings (WiFi + OPDS)](#366-web-settings-wifi--opds)
+      - [3.6.7 KOReader Sync Quick Setup](#367-koreader-sync-quick-setup)
     - [3.7 Sleep Screen](#37-sleep-screen)
   - [4. Reading Mode](#4-reading-mode)
     - [Page Turning](#page-turning)
@@ -196,7 +198,7 @@ The Settings screen allows you to configure the device's behavior. There are a f
 
 - **WiFi Networks**: Connect to WiFi networks for file transfers and firmware updates.
 - **KOReader Sync**: Options for setting up KOReader for syncing book progress.
-- **OPDS Servers**: Manage one or more OPDS libraries for browsing and downloading books. See [OPDS Servers (Multiple Libraries)](#365-opds-servers-multiple-libraries) below.
+- **OPDS Servers**: Manage one or more OPDS [(Open Publication Distribution System)](https://en.wikipedia.org/wiki/Open_Publication_Distribution_System) libraries for browsing and downloading books. See [OPDS Servers (Multiple Libraries)](#365-opds-servers-multiple-libraries) below.
 - **Clear Reading Cache**: Clear the internal SD card cache.
 - **Check for updates**: Check for CrossInk firmware updates over WiFi.
 - **Language**: Set the system language (see **[Supported Languages](#supported-languages)** for more information).
diff --git a/docs/catalog b/docs/catalog
index faaa50a9..3e63feab 100644
--- a/docs/catalog
+++ b/docs/catalog
@@ -2,48 +2,48 @@
   "schema_version": 1,
   "releases": [
     {
-      "id": "stable-1.2.9.1-tiny",
+      "id": "stable-1.2.11-tiny",
       "channel": "stable",
-      "name": "1.2.9.1",
-      "version": "1.2.9.1",
+      "name": "1.2.11",
+      "version": "1.2.11",
       "variant": "tiny",
-      "released_at": "2026-05-06T00:17:55Z",
-      "notes": "CrossInk 1.2.9.1 stable firmware",
-      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-tiny-v1.2.9.1.bin",
-      "firmware_sha256": "0ca2cf87bf3b2915778d588a059698574bd896b41a41a08b91daa283b34adc1f",
-      "size": 6290704,
+      "released_at": "2026-05-15T02:32:34Z",
+      "notes": "CrossInk 1.2.11 stable firmware",
+      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-tiny-v1.2.11.bin",
+      "firmware_sha256": "83fea31801331bb3e694b480a06eef46774508360bdc4fbc96b127f555ada41d",
+      "size": 6485680,
       "supported_devices": [
         "x4",
         "x3"
       ]
     },
     {
-      "id": "stable-1.2.9.1-xlarge",
+      "id": "stable-1.2.11-xlarge",
       "channel": "stable",
-      "name": "1.2.9.1",
-      "version": "1.2.9.1",
+      "name": "1.2.11",
+      "version": "1.2.11",
       "variant": "xlarge",
-      "released_at": "2026-05-06T00:17:55Z",
-      "notes": "CrossInk 1.2.9.1 stable firmware",
-      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-xlarge-v1.2.9.1.bin",
-      "firmware_sha256": "3f422e565d2acf2ad1765dfc4954f435c17e33146ef64298155d18010d5660de",
-      "size": 6365376,
+      "released_at": "2026-05-15T02:32:34Z",
+      "notes": "CrossInk 1.2.11 stable firmware",
+      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-xlarge-v1.2.11.bin",
+      "firmware_sha256": "c3937885d9199db354df2170ce09ec4118c2c5429e8d821fff1e2756ce5f3d17",
+      "size": 6560240,
       "supported_devices": [
         "x4",
         "x3"
       ]
     },
     {
-      "id": "stable-1.2.9.1-no_emoji",
+      "id": "stable-1.2.11-no_emoji",
       "channel": "stable",
-      "name": "1.2.9.1",
-      "version": "1.2.9.1",
+      "name": "1.2.11",
+      "version": "1.2.11",
       "variant": "no_emoji",
-      "released_at": "2026-05-06T00:17:55Z",
-      "notes": "CrossInk 1.2.9.1 stable firmware",
-      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-no_emoji-v1.2.9.1.bin",
-      "firmware_sha256": "0b076b925c0378231c9a15f007eb60dc83cb41efd1aa241ba7d452789623b136",
-      "size": 6471904,
+      "released_at": "2026-05-15T02:32:34Z",
+      "notes": "CrossInk 1.2.11 stable firmware",
+      "firmware_url": "https://github.com/uxjulia/CrossInk/releases/latest/download/firmware-no_emoji-v1.2.11.bin",
+      "firmware_sha256": "349711f9f189d9fe9aba3f3e62527cc5cd2ca68ae646766ac33dca4b7c45c88b",
+      "size": 6213904,
       "supported_devices": [
         "x4",
         "x3"
diff --git a/docs/file-formats.md b/docs/file-formats.md
index a408043b..9a8a4a51 100644
--- a/docs/file-formats.md
+++ b/docs/file-formats.md
@@ -7,7 +7,9 @@ nav_order: 8
 
 ## `book.bin`
 
-### Version 3
+### Version 6
+
+Adds a Crossink-owned cache magic before the version byte so `book.bin` files written by upstream CrossPoint or other forks are rejected and rebuilt instead of being parsed as compatible Crossink metadata caches.
 
 ImHex Pattern:
 
@@ -17,7 +19,8 @@ import std.string;
 import std.core;
 
 // === Configuration ===
-#define EXPECTED_VERSION 3
+#define EXPECTED_MAGIC 0x425843FF
+#define EXPECTED_VERSION 6
 #define MAX_STRING_LENGTH 65535
 
 // === String Structure ===
@@ -39,6 +42,7 @@ fn format_string(String s) {
 struct Metadata {
     String title [[comment("Book title")]];
     String author [[comment("Book author")]];
+    String language [[comment("Book language")]];
     String coverItemHref [[comment("Path to cover image")]];
     String textReferenceHref [[comment("Path to guided first text reference")]];
 } [[comment("Book metadata information")]];
@@ -65,6 +69,11 @@ struct TocEntry {
 
 struct BookBin {
     // Header
+    u32 magic [[comment("Crossink cache magic: 0xFF CXB"), color("B8F7D4")]];
+    if (magic != EXPECTED_MAGIC) {
+        std::error(std::format("Unsupported cache magic: 0x{:08X} (expected 0x{:08X})", magic, EXPECTED_MAGIC));
+    }
+
     u8 version [[comment("Format version"), color("FFD93D")]];
     
     // Version validation
@@ -109,6 +118,34 @@ if (parsedSize != fileSize) {
 
 ## `section.bin`
 
+### Version 36
+
+Adds a per-`TextBlock` Guide Dots metadata flag before the guide-dot offset vector. When no word in the block has a guide dot, the guide-dot offset vector is omitted; background bytes remain per-word.
+
+### Version 35
+
+Adds a per-`TextBlock` Bionic Reading metadata flag before the bionic boundary/suffix vectors. When no word in the block has a bionic split, the boundary and suffix vectors are omitted; guide-dot offsets and background bytes remain per-word.
+
+### Version 34
+
+Adds a Crossink-owned cache magic before the version byte so `sections/*.bin` files written by upstream CrossPoint or other forks are rejected and rebuilt instead of being parsed as compatible Crossink section caches.
+
+### Version 33
+
+Adds one per-word `backgroundBlack` byte to serialized `TextBlock` records so EPUB text runs with simple black CSS backgrounds can repaint correctly from section cache.
+
+### Version 32
+
+Invalidates cached EPUB section files after image rendering and image-cache behavior changes, so old rendered page data is rebuilt instead of reusing stale `ImageBlock` cache references. No binary layout fields changed from version 31.
+
+### Version 31
+
+Invalidates cached EPUB section files after section-cache write hardening and parser/layout compatibility changes from the upstream merge. No binary layout fields changed from version 30.
+
+### Version 30
+
+Added `PageHorizontalRule` page elements (tag `4`) for rendered EPUB `<hr>` separators. Horizontal rules store their x/y position, width, and thickness. This invalidates cached section layouts so horizontal rules are serialized as first-class page elements instead of being ignored.
+
 ### Version 29
 
 Added `PageTableFragment` page elements (tag `3`) for paginated simple-table layout. Table fragments store their fragment width, column count, cell padding, line height, per-row heights/header-divider flags, and per-cell serialized `TextBlock` lines. This invalidates cached section layouts so simple EPUB tables can render as buffered multi-column grids instead of flattened cell paragraphs.
@@ -131,7 +168,7 @@ Bionic Reading words are now stored as a single merged TextBlock entry instead o
 
 ### Version 23
 
-Added `guideReadingEnabled` (bool) to the header after `focusReadingEnabled`. Guide Dots feature flag: when enabled, a middle dot (U+00B7) is inserted between words during layout (skipped for Justify alignment).
+Added `guideReadingEnabled` (bool) to the header after `bionicReadingEnabled`. Guide Dots feature flag: when enabled, a middle dot (U+00B7) is inserted between words during layout (skipped for Justify alignment).
 
 ### Version 22
 
@@ -145,7 +182,8 @@ import std.string;
 import std.core;
 
 // === Configuration ===
-#define EXPECTED_VERSION 29
+#define EXPECTED_MAGIC 0x535843FF
+#define EXPECTED_VERSION 36
 #define MAX_STRING_LENGTH 65535
 #define MAX_WORD_STRING_LENGTH 4096
 #define FOOTNOTE_NUMBER_LEN 32
@@ -182,7 +220,8 @@ fn format_word_string(WordString s) {
 enum PageElementTag : u8 {
     PageLine = 1,
     PageImage = 2,
-    PageTableFragment = 3
+    PageTableFragment = 3,
+    PageHorizontalRule = 4
 };
 
 enum WordStyle : u8 {
@@ -206,9 +245,16 @@ struct TextBlock {
   WordString words[wordCount];
   s16 wordXPos[wordCount];
   WordStyle wordStyle[wordCount];
-  u8 wordBionicBoundary[wordCount];
-  u16 wordBionicSuffixX[wordCount];
-  u16 wordGuideDotXOffset[wordCount];
+  u8 hasBionicMetadata;
+  if (hasBionicMetadata != 0) {
+    u8 wordBionicBoundary[wordCount];
+    u16 wordBionicSuffixX[wordCount];
+  }
+  u8 hasGuideDotMetadata;
+  if (hasGuideDotMetadata != 0) {
+    u16 wordGuideDotXOffset[wordCount];
+  }
+  u8 wordBackgroundBlack[wordCount];
   BlockStyle blockStyle;
   bool textAlignDefined;
   s16 marginTop;
@@ -229,6 +275,13 @@ struct PageLine {
     TextBlock textBlock [[inline]];
 };
 
+struct PageHorizontalRule {
+    s16 xPos;
+    s16 yPos;
+    u16 width;
+    u8 thickness;
+};
+
 struct ImageBlock {
     String imagePath [[comment("Original cached image path")]];
     s16 width;
@@ -278,6 +331,8 @@ struct PageElement {
         PageImage pageImage [[inline]];
     } else if (pageElementType == 3) {
         PageTableFragment pageTableFragment [[inline]];
+    } else if (pageElementType == 4) {
+        PageHorizontalRule pageHorizontalRule [[inline]];
     } else {
         std::error(std::format("Unknown page element type: {}", pageElementType));
     }
@@ -299,6 +354,11 @@ struct AnchorEntry {
 
 struct SectionBin {
     // Header
+    u32 magic [[comment("Crossink cache magic: 0xFF CXS"), color("B8F7D4")]];
+    if (magic != EXPECTED_MAGIC) {
+        std::error(std::format("Unsupported cache magic: 0x{:08X} (expected 0x{:08X})", magic, EXPECTED_MAGIC));
+    }
+
     u8 version [[comment("Format version"), color("FFD93D")]];
     
     // Version validation
@@ -323,6 +383,7 @@ struct SectionBin {
     u32 lutOffset;
     u32 anchorMapOffset;
     u32 paragraphLutOffset;
+    u32 liLutOffset;
 
     Page pages[pageCount] [[inline]];
     
@@ -350,6 +411,13 @@ struct SectionBin {
     }
     u16 paragraphCount;
     u16 paragraphIndices[paragraphCount];
+
+    // List-item index -> page lookup
+    u32 liOffsetCheck = $;
+    if (liOffsetCheck != liLutOffset) {
+        std::warning(std::format("List-item LUT offset mismatch: expected 0x{:X}, got 0x{:X}", liLutOffset, liOffsetCheck));
+    }
+    u16 listItemIndices[paragraphCount];
 };
 
 // === File Parsing ===
@@ -364,3 +432,9 @@ if (parsedSize != fileSize) {
     std::warning(std::format("Unparsed data detected: {} bytes remaining at offset 0x{:X}", fileSize - parsedSize, parsedSize));
 }
 ```
+
+## `css_rules.cache`
+
+### Version 8
+
+Adds a Crossink-owned cache magic before the version byte so cached EPUB CSS rules written by upstream CrossPoint or other forks are rejected and rebuilt before section caches are regenerated.
diff --git a/docs/focus-reading.md b/docs/focus-reading.md
new file mode 100644
index 00000000..992c9e62
--- /dev/null
+++ b/docs/focus-reading.md
@@ -0,0 +1,33 @@
+# Bionic Reading
+
+Bionic Reading is a reading aid that bolds the first portion of each word, guiding your eyes to natural fixation points and helping you read faster with less effort. Some readers - particularly those with ADHD - find it helps them stay engaged with the text and reduces mind-wandering.
+
+<img src="./images/focus-reading/focus-reading.jpg" height="500" alt="Comparison of the same page with and without Bionic Reading enabled" />
+
+*Left: Bionic Reading off. Right: Bionic Reading on. Both using Literata.*
+
+## Enabling Bionic Reading
+
+1. Open **Settings > Reader**
+2. Toggle **Bionic Reading** on
+
+Toggling the setting will trigger a re-index of your current book, the same as when changing font settings. Once indexing is complete, page turns proceed as normal. No changes are made to your EPUB files.
+
+## Examples
+
+<img src="./images/focus-reading/focus-reading-notoserif.jpg" height="500" alt="Bionic Reading with Noto Serif font" />
+
+*Bionic Reading with Noto Serif font*
+
+<img src="./images/focus-reading/focus-reading-merriweather.jpg" height="500" alt="Bionic Reading with Merriweather font" />
+
+*Bionic Reading with Merriweather font*
+
+<img src="./images/focus-reading/focus-reading-atkinson.jpg" height="500" alt="Bionic Reading with Atkinson Hyperlegible Next font" />
+
+*Bionic Reading with Atkinson Hyperlegible Next font*
+
+## Notes
+
+- Bionic Reading only applies to regular body text. Already-bold text (headings, emphasis) is left unchanged.
+- The setting is per-device, not per-book — it applies to all books while enabled.
diff --git a/docs/hyphenation-trie-format.md b/docs/hyphenation-trie-format.md
index efe4af8d..2fa24e68 100644
--- a/docs/hyphenation-trie-format.md
+++ b/docs/hyphenation-trie-format.md
@@ -54,5 +54,5 @@ A convenient script `update_hyphenation.sh` is used to update all languages.
 To use it, run:
 
 ```sh
-./scripts/update_hypenation.sh
+./scripts/update_hyphenation.sh
 ```
diff --git a/docs/images/focus-reading/focus-reading-atkinson.jpg b/docs/images/focus-reading/focus-reading-atkinson.jpg
new file mode 100644
index 00000000..8ec77b10
Binary files /dev/null and b/docs/images/focus-reading/focus-reading-atkinson.jpg differ
diff --git a/docs/images/focus-reading/focus-reading-merriweather.jpg b/docs/images/focus-reading/focus-reading-merriweather.jpg
new file mode 100644
index 00000000..59d82371
Binary files /dev/null and b/docs/images/focus-reading/focus-reading-merriweather.jpg differ
diff --git a/docs/images/focus-reading/focus-reading-notoserif.jpg b/docs/images/focus-reading/focus-reading-notoserif.jpg
new file mode 100644
index 00000000..8ffc869d
Binary files /dev/null and b/docs/images/focus-reading/focus-reading-notoserif.jpg differ
diff --git a/docs/images/focus-reading/focus-reading.jpg b/docs/images/focus-reading/focus-reading.jpg
new file mode 100644
index 00000000..97318e7b
Binary files /dev/null and b/docs/images/focus-reading/focus-reading.jpg differ
diff --git a/docs/sd-card-fonts.md b/docs/sd-card-fonts.md
new file mode 100644
index 00000000..db9b1277
--- /dev/null
+++ b/docs/sd-card-fonts.md
@@ -0,0 +1,104 @@
+# SD Card Fonts
+
+CrossPoint supports loading additional fonts from the SD card, including fonts
+with extended Unicode coverage (CJK, Cyrillic, Greek, etc.).
+
+## Installing Fonts
+
+There are three ways to install fonts:
+
+### Option 1: Download from device (recommended)
+
+1. Connect your CrossPoint reader to WiFi
+2. Go to **Settings > System > Manage Fonts**
+3. Browse available font families and tap to download
+4. Downloaded fonts appear immediately in **Settings > Reader > Font Family**
+
+### Option 2: Upload via web browser
+
+1. Connect your CrossPoint reader to WiFi
+2. Open the web interface in your browser (shown on the WiFi screen)
+3. Navigate to the **Fonts** tab
+4. Upload `.cpfont` files using the upload form
+
+### Option 3: Manual SD card copy
+
+1. Download font files from the
+   [crosspoint-fonts repository](https://github.com/crosspoint-reader/crosspoint-fonts)
+2. Copy font family folders to one of two locations on your SD card:
+
+   - `/.fonts/` — hidden directory (preferred; keeps the SD root tidy
+     when mounted on a desktop)
+   - `/fonts/` — visible directory (use this if your OS hides dot-files
+     and you'd rather see the folder in your file manager)
+
+   Both roots are always scanned at boot and the results are merged: a
+   family installed in `/fonts/` shows up even when `/.fonts/` also
+   exists, and vice versa. The two roots only collide if the same family
+   name appears in both — in that case the copy in `/.fonts/` wins and
+   the duplicate in `/fonts/` is ignored.
+
+       SD Card Root/
+       ├── .fonts/                     ← Hidden root (preferred)
+       │   └── Literata/
+       │       ├── Literata_12.cpfont
+       │       ├── Literata_14.cpfont
+       │       ├── Literata_16.cpfont
+       │       └── Literata_18.cpfont
+       └── fonts/                      ← Visible root (equally valid)
+           └── Merriweather/
+               ├── Merriweather_12.cpfont
+               └── ...
+
+3. Insert the SD card and power on your CrossPoint reader
+
+## Available Pre-Built Fonts
+
+The current list of pre-built fonts is maintained in the
+[crosspoint-fonts repository](https://github.com/crosspoint-reader/crosspoint-fonts).
+
+## Converting Custom Fonts
+
+To convert your own TrueType/OpenType fonts:
+
+### Prerequisites
+
+    pip install freetype-py fonttools
+
+### Single font (one style)
+
+    python3 lib/EpdFont/scripts/fontconvert_sdcard.py \
+      MyFont-Regular.ttf \
+      --intervals latin-ext \
+      --sizes 12,14,16,18 \
+      --style regular \
+      --name MyFont \
+      --output-dir ./MyFont/
+
+### Multi-style font
+
+    python3 lib/EpdFont/scripts/fontconvert_sdcard.py \
+      --regular MyFont-Regular.ttf \
+      --bold MyFont-Bold.ttf \
+      --italic MyFont-Italic.ttf \
+      --bolditalic MyFont-BoldItalic.ttf \
+      --intervals latin-ext \
+      --sizes 12,14,16,18 \
+      --name MyFont \
+      --output-dir ./MyFont/
+
+### Available Unicode interval presets
+
+| Preset | Coverage |
+|--------|----------|
+| `ascii` | U+0020-U+007E (Basic Latin) |
+| `latin-ext` | European languages (Latin + Extended-A/B) |
+| `greek` | Greek + Extended Greek |
+| `cyrillic` | Cyrillic + Supplement |
+| `cjk` | CJK Unified Ideographs + Hiragana + Katakana + Fullwidth |
+| `hangul` | Korean Hangul syllables |
+| `builtin` | Matches built-in Bookerly coverage exactly |
+
+Combine presets with commas: `--intervals latin-ext,greek,cyrillic`
+
+Install custom fonts via WiFi upload or manual SD card copy.
diff --git a/docs/translators.md b/docs/translators.md
index b945476e..90d87ebe 100644
--- a/docs/translators.md
+++ b/docs/translators.md
@@ -58,6 +58,7 @@ If you'd like to add your name to this list, please open a PR adding yourself an
 
 ## Ukrainian
 - [mirus-ua](https://github.com/mirus-ua)
+- [KymAndriy](https://github.com/KymAndriy)
 
 ## Belarusian
 - [Dexif](https://github.com/dexif)
diff --git a/lib/EpdFont/EpdFont.cpp b/lib/EpdFont/EpdFont.cpp
index c3aafd52..3a418213 100644
--- a/lib/EpdFont/EpdFont.cpp
+++ b/lib/EpdFont/EpdFont.cpp
@@ -153,21 +153,23 @@ uint32_t EpdFont::applyLigatures(uint32_t cp, const char*& text) const {
 
 const EpdGlyph* EpdFont::findGlyph(const uint32_t cp) const {
   const int count = data->intervalCount;
-  if (count == 0) return nullptr;
-
-  const EpdUnicodeInterval* intervals = data->intervals;
-  const auto* end = intervals + count;
-
-  // upper_bound: range lookup. Finds the first interval with first > cp, so the
-  // interval just before it is the last one with first <= cp. That's the only
-  // candidate that could contain cp. Then we verify cp <= candidate.last.
-  const auto it = std::upper_bound(
-      intervals, end, cp, [](uint32_t value, const EpdUnicodeInterval& interval) { return value < interval.first; });
-
-  if (it != intervals) {
-    const auto& interval = *(it - 1);
-    if (cp <= interval.last) {
-      return &data->glyph[interval.offset + (cp - interval.first)];
+  if (count == 0 && !data->glyphMissHandler) return nullptr;
+
+  if (count > 0) {
+    const EpdUnicodeInterval* intervals = data->intervals;
+    const auto* end = intervals + count;
+
+    // upper_bound: range lookup. Finds the first interval with first > cp, so the
+    // interval just before it is the last one with first <= cp. That's the only
+    // candidate that could contain cp. Then we verify cp <= candidate.last.
+    const auto it = std::upper_bound(
+        intervals, end, cp, [](uint32_t value, const EpdUnicodeInterval& interval) { return value < interval.first; });
+
+    if (it != intervals) {
+      const auto& interval = *(it - 1);
+      if (cp <= interval.last) {
+        return &data->glyph[interval.offset + (cp - interval.first)];
+      }
     }
   }
 
@@ -179,6 +181,12 @@ const EpdGlyph* EpdFont::getGlyph(const uint32_t cp) const {
     return glyph;
   }
 
+  // Codepoint not in interval table — try on-demand loading (SD card fonts).
+  if (data->glyphMissHandler) {
+    const EpdGlyph* loaded = data->glyphMissHandler(data->glyphMissCtx, cp);
+    if (loaded) return loaded;
+  }
+
   if (cp != REPLACEMENT_GLYPH) {
     return getGlyph(REPLACEMENT_GLYPH);
   }
diff --git a/lib/EpdFont/EpdFontData.h b/lib/EpdFont/EpdFontData.h
index 380c5733..d01c0281 100644
--- a/lib/EpdFont/EpdFontData.h
+++ b/lib/EpdFont/EpdFontData.h
@@ -129,4 +129,148 @@ typedef struct {
   uint8_t kernRightClassCount;           ///< Number of distinct right classes (matrix cols)
   const EpdLigaturePair* ligaturePairs;  ///< Sorted ligature pair table (nullptr if none)
   uint32_t ligaturePairCount;            ///< Number of entries in ligaturePairs
+
+  /// On-demand glyph loading for fonts that don't keep all glyphs in RAM (e.g. SD card fonts).
+  /// Called by getGlyph() when a codepoint is not found in the interval table.
+  /// Returns a valid EpdGlyph* with correct metadata, or nullptr to fall back to the
+  /// replacement glyph.  The returned pointer is valid until the next glyphMissHandler
+  /// call that causes a ring-buffer eviction — callers must consume it (measure or draw)
+  /// before requesting another missed glyph.
+  const EpdGlyph* (*glyphMissHandler)(void* ctx, uint32_t codepoint);
+
+  /// Context pointer for glyphMissHandler (typically SdCardFont*).  Also used by
+  /// GfxRenderer::getGlyphBitmap() to retrieve overflow bitmaps via SdCardFont.
+  void* glyphMissCtx;
 } EpdFontData;
+
+namespace syntheticGlyph {
+
+constexpr uint32_t FULL_BLOCK = 0x2588;
+constexpr uint32_t BLACK_SQUARE = 0x25A0;
+constexpr uint32_t GREEK_CAPITAL_GAMMA = 0x0393;
+constexpr uint32_t GREEK_SMALL_EPSILON = 0x03B5;
+constexpr uint32_t GREEK_SMALL_OMEGA = 0x03C9;
+constexpr uint32_t MODIFIER_LETTER_TURNED_COMMA = 0x02BB;
+constexpr uint32_t LEFT_SINGLE_QUOTATION_MARK = 0x2018;
+
+constexpr bool isSolid(uint32_t cp) { return cp == FULL_BLOCK || cp == BLACK_SQUARE; }
+constexpr bool isGreekFallback(uint32_t cp) {
+  return cp == GREEK_CAPITAL_GAMMA || cp == GREEK_SMALL_EPSILON || cp == GREEK_SMALL_OMEGA;
+}
+constexpr bool isReplacementFallback(uint32_t cp) { return cp == 0xFFFD; }
+constexpr bool isSpaceFallback(uint32_t cp) {
+  return cp == 0x00A0 || cp == 0x1680 || (cp >= 0x2000 && cp <= 0x200A) || cp == 0x202F || cp == 0x205F || cp == 0x3000;
+}
+constexpr uint32_t aliasCodepoint(uint32_t cp) {
+  return cp == MODIFIER_LETTER_TURNED_COMMA ? LEFT_SINGLE_QUOTATION_MARK : cp;
+}
+
+inline uint16_t solidAdvanceX(const EpdFontData* data, const EpdGlyph* emGlyph) {
+  if (emGlyph && emGlyph->advanceX > 0) {
+    return emGlyph->advanceX;
+  }
+  int px = data && data->ascender > 0 ? (data->ascender * 3 + 3) / 4 : 8;
+  if (px < 1) px = 1;
+  return static_cast<uint16_t>(fp4::fromPixel(px));
+}
+
+inline int solidHeight(const EpdFontData* data, uint32_t cp) {
+  int ascender = data && data->ascender > 0 ? data->ascender : 8;
+  if (cp == BLACK_SQUARE) {
+    int height = (ascender * 2 + 2) / 3;
+    return height > 1 ? height : 1;
+  }
+  return ascender > 1 ? ascender : 1;
+}
+
+inline int solidWidth(uint32_t cp, uint16_t advanceX, int height) {
+  const int advancePx = fp4::toPixel(advanceX);
+  if (cp == BLACK_SQUARE) {
+    return height < advancePx ? height : advancePx;
+  }
+  return advancePx > 1 ? advancePx : 1;
+}
+
+inline int solidLeft(uint32_t cp, uint16_t advanceX, int width) {
+  if (cp != BLACK_SQUARE) return 0;
+  const int advancePx = fp4::toPixel(advanceX);
+  return advancePx > width ? (advancePx - width) / 2 : 0;
+}
+
+inline int solidTop(const EpdFontData* data, uint32_t cp, int height) {
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  if (cp != BLACK_SQUARE || ascender <= height) return height;
+  return height + (ascender - height) / 2;
+}
+
+inline uint16_t replacementAdvanceX(const EpdFontData* data, const EpdGlyph* emGlyph) {
+  if (emGlyph && emGlyph->advanceX > 0) {
+    return emGlyph->advanceX;
+  }
+  int px = data && data->ascender > 0 ? (data->ascender * 3 + 3) / 4 : 8;
+  if (px < 3) px = 3;
+  return static_cast<uint16_t>(fp4::fromPixel(px));
+}
+
+inline int replacementHeight(const EpdFontData* data) {
+  const int ascender = data && data->ascender > 0 ? data->ascender : 8;
+  return ascender > 3 ? ascender : 3;
+}
+
+inline int replacementWidth(uint16_t advanceX, int height) {
+  const int advancePx = fp4::toPixel(advanceX);
+  int width = advancePx < height ? advancePx : height;
+  if (width < 3) width = 3;
+  return width;
+}
+
+inline int replacementLeft(uint16_t advanceX, int width) {
+  const int advancePx = fp4::toPixel(advanceX);
+  return advancePx > width ? (advancePx - width) / 2 : 0;
+}
+
+inline int replacementTop(const EpdFontData* data, int height) {
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  return ascender > height ? height + (ascender - height) / 2 : height;
+}
+
+inline uint16_t greekAdvanceX(const EpdFontData* data, const EpdGlyph* emGlyph, uint32_t cp) {
+  if (cp == GREEK_SMALL_OMEGA && emGlyph && emGlyph->advanceX > 0) {
+    return emGlyph->advanceX;
+  }
+  const int ascender = data && data->ascender > 0 ? data->ascender : 8;
+  int px = cp == GREEK_CAPITAL_GAMMA ? (ascender * 7 + 5) / 10 : (ascender * 3 + 3) / 4;
+  if (px < 1) px = 1;
+  return static_cast<uint16_t>(fp4::fromPixel(px));
+}
+
+inline int greekHeight(const EpdFontData* data, uint32_t cp) {
+  int ascender = data && data->ascender > 0 ? data->ascender : 8;
+  if (cp != GREEK_CAPITAL_GAMMA) {
+    ascender = (ascender * 3 + 3) / 4;
+  }
+  return ascender > 1 ? ascender : 1;
+}
+
+inline int greekWidth(uint32_t cp, uint16_t advanceX, int height) {
+  const int advancePx = fp4::toPixel(advanceX);
+  if (cp == GREEK_CAPITAL_GAMMA) {
+    const int width = height > 2 ? (height * 6 + 5) / 10 : height;
+    return width < advancePx ? width : advancePx;
+  }
+  return advancePx > 1 ? advancePx : 1;
+}
+
+inline int greekLeft(uint32_t cp, uint16_t advanceX, int width) {
+  const int advancePx = fp4::toPixel(advanceX);
+  if (cp == GREEK_CAPITAL_GAMMA) return 0;
+  return advancePx > width ? (advancePx - width) / 2 : 0;
+}
+
+inline int greekTop(const EpdFontData* data, uint32_t cp, int height) {
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  if (cp == GREEK_CAPITAL_GAMMA || ascender <= height) return height;
+  return height + (ascender - height) / 2;
+}
+
+}  // namespace syntheticGlyph
diff --git a/lib/EpdFont/EpdFontFamily.cpp b/lib/EpdFont/EpdFontFamily.cpp
index f91607cc..51a9f170 100644
--- a/lib/EpdFont/EpdFontFamily.cpp
+++ b/lib/EpdFont/EpdFontFamily.cpp
@@ -43,6 +43,97 @@ void EpdFontFamily::getTextDimensions(const char* string, int* w, int* h, const
 
     if (!isCombining) {
       cp = applyLigatures(cp, string, style);
+      cp = getFallbackCodepoint(cp, style);
+    }
+
+    const bool hasRealGlyph = findGlyphData(cp, style).glyph != nullptr;
+
+    if (!isCombining && !hasRealGlyph && syntheticGlyph::isSpaceFallback(cp)) {
+      lastBaseX += fp4::toPixel(prevAdvanceFP);
+      prevCp = 0;
+      prevAdvanceFP = 0;
+      lastBaseLeft = 0;
+      lastBaseWidth = 0;
+      lastBaseTop = 0;
+      continue;
+    }
+
+    if (!isCombining && !hasRealGlyph && syntheticGlyph::isSolid(cp)) {
+      const EpdFontData* data = getData(style);
+      const uint16_t advanceX = syntheticGlyph::solidAdvanceX(data, getGlyph('M', style));
+      const int glyphHeight = syntheticGlyph::solidHeight(data, cp);
+      const int glyphWidth = syntheticGlyph::solidWidth(cp, advanceX, glyphHeight);
+      const int glyphLeft = syntheticGlyph::solidLeft(cp, advanceX, glyphWidth);
+      const int glyphTop = syntheticGlyph::solidTop(data, cp, glyphHeight);
+
+      if (prevCp != 0) {
+        const auto kernFP = getKerning(prevCp, cp, style);
+        lastBaseX += fp4::toPixel(prevAdvanceFP + kernFP);
+      }
+
+      minX = std::min(minX, lastBaseX + glyphLeft);
+      maxX = std::max(maxX, lastBaseX + glyphLeft + glyphWidth);
+      minY = std::min(minY, glyphTop - glyphHeight);
+      maxY = std::max(maxY, glyphTop);
+
+      lastBaseLeft = glyphLeft;
+      lastBaseWidth = glyphWidth;
+      lastBaseTop = glyphTop;
+      prevAdvanceFP = advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!isCombining && !hasRealGlyph && syntheticGlyph::isGreekFallback(cp)) {
+      const EpdFontData* data = getData(style);
+      const uint16_t advanceX = syntheticGlyph::greekAdvanceX(data, getGlyph('M', style), cp);
+      const int glyphHeight = syntheticGlyph::greekHeight(data, cp);
+      const int glyphWidth = syntheticGlyph::greekWidth(cp, advanceX, glyphHeight);
+      const int glyphLeft = syntheticGlyph::greekLeft(cp, advanceX, glyphWidth);
+      const int glyphTop = syntheticGlyph::greekTop(data, cp, glyphHeight);
+
+      if (prevCp != 0) {
+        const auto kernFP = getKerning(prevCp, cp, style);
+        lastBaseX += fp4::toPixel(prevAdvanceFP + kernFP);
+      }
+
+      minX = std::min(minX, lastBaseX + glyphLeft);
+      maxX = std::max(maxX, lastBaseX + glyphLeft + glyphWidth);
+      minY = std::min(minY, glyphTop - glyphHeight);
+      maxY = std::max(maxY, glyphTop);
+
+      lastBaseLeft = glyphLeft;
+      lastBaseWidth = glyphWidth;
+      lastBaseTop = glyphTop;
+      prevAdvanceFP = advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!isCombining && !hasRealGlyph && syntheticGlyph::isReplacementFallback(cp)) {
+      const EpdFontData* data = getData(style);
+      const uint16_t advanceX = syntheticGlyph::replacementAdvanceX(data, getGlyph('M', style));
+      const int glyphHeight = syntheticGlyph::replacementHeight(data);
+      const int glyphWidth = syntheticGlyph::replacementWidth(advanceX, glyphHeight);
+      const int glyphLeft = syntheticGlyph::replacementLeft(advanceX, glyphWidth);
+      const int glyphTop = syntheticGlyph::replacementTop(data, glyphHeight);
+
+      if (prevCp != 0) {
+        const auto kernFP = getKerning(prevCp, cp, style);
+        lastBaseX += fp4::toPixel(prevAdvanceFP + kernFP);
+      }
+
+      minX = std::min(minX, lastBaseX + glyphLeft);
+      maxX = std::max(maxX, lastBaseX + glyphLeft + glyphWidth);
+      minY = std::min(minY, glyphTop - glyphHeight);
+      maxY = std::max(maxY, glyphTop);
+
+      lastBaseLeft = glyphLeft;
+      lastBaseWidth = glyphWidth;
+      lastBaseTop = glyphTop;
+      prevAdvanceFP = advanceX;
+      prevCp = cp;
+      continue;
     }
 
     const EpdGlyph* glyph = getGlyph(cp, style);
@@ -90,7 +181,7 @@ void EpdFontFamily::getTextDimensions(const char* string, int* w, int* h, const
 
 const EpdFontData* EpdFontFamily::getData(const Style style) const { return getFont(style)->data; }
 
-EpdFontFamily::GlyphData EpdFontFamily::getGlyphData(const uint32_t cp, const Style style) const {
+EpdFontFamily::GlyphData EpdFontFamily::findGlyphData(const uint32_t cp, const Style style) const {
   const EpdFont* font = getFont(style);
   if (const EpdGlyph* glyph = font->findGlyph(cp)) {
     return {font->data, glyph};
@@ -102,6 +193,14 @@ EpdFontFamily::GlyphData EpdFontFamily::getGlyphData(const uint32_t cp, const St
     }
   }
 
+  return {nullptr, nullptr};
+}
+
+EpdFontFamily::GlyphData EpdFontFamily::getGlyphData(const uint32_t cp, const Style style) const {
+  if (const GlyphData glyphData = findGlyphData(cp, style); glyphData.glyph) {
+    return glyphData;
+  }
+
   if (cp != REPLACEMENT_GLYPH) {
     return getGlyphData(REPLACEMENT_GLYPH, style);
   }
@@ -112,6 +211,17 @@ const EpdGlyph* EpdFontFamily::getGlyph(const uint32_t cp, const Style style) co
   return getGlyphData(cp, style).glyph;
 }
 
+uint32_t EpdFontFamily::getFallbackCodepoint(const uint32_t cp, const Style style) const {
+  if (findGlyphData(cp, style).glyph) return cp;
+  const uint32_t aliasCp = syntheticGlyph::aliasCodepoint(cp);
+  if (aliasCp != cp) {
+    return findGlyphData(aliasCp, style).glyph ? aliasCp : REPLACEMENT_GLYPH;
+  }
+  if (syntheticGlyph::isSpaceFallback(cp)) return cp;
+  if (syntheticGlyph::isSolid(cp) || syntheticGlyph::isGreekFallback(cp)) return cp;
+  return REPLACEMENT_GLYPH;
+}
+
 int8_t EpdFontFamily::getKerning(const uint32_t leftCp, const uint32_t rightCp, const Style style) const {
   return getFont(style)->getKerning(leftCp, rightCp);
 }
diff --git a/lib/EpdFont/EpdFontFamily.h b/lib/EpdFont/EpdFontFamily.h
index d3d575f0..e4fa51e5 100644
--- a/lib/EpdFont/EpdFontFamily.h
+++ b/lib/EpdFont/EpdFontFamily.h
@@ -15,8 +15,10 @@ class EpdFontFamily {
   ~EpdFontFamily() = default;
   void getTextDimensions(const char* string, int* w, int* h, Style style = REGULAR) const;
   const EpdFontData* getData(Style style = REGULAR) const;
+  GlyphData findGlyphData(uint32_t cp, Style style = REGULAR) const;
   GlyphData getGlyphData(uint32_t cp, Style style = REGULAR) const;
   const EpdGlyph* getGlyph(uint32_t cp, Style style = REGULAR) const;
+  uint32_t getFallbackCodepoint(uint32_t cp, Style style = REGULAR) const;
   int8_t getKerning(uint32_t leftCp, uint32_t rightCp, Style style = REGULAR) const;
   uint32_t applyLigatures(uint32_t cp, const char*& text, Style style = REGULAR) const;
 
diff --git a/lib/EpdFont/FontDecompressor.cpp b/lib/EpdFont/FontDecompressor.cpp
index 181bf8d0..b4a940f6 100644
--- a/lib/EpdFont/FontDecompressor.cpp
+++ b/lib/EpdFont/FontDecompressor.cpp
@@ -24,12 +24,12 @@ void FontDecompressor::clearCache() {
 }
 
 void FontDecompressor::freePageBuffer() {
-  free(pageBuffer);
-  pageBuffer = nullptr;
-  free(pageGlyphs);
-  pageGlyphs = nullptr;
-  pageFont = nullptr;
-  pageGlyphCount = 0;
+  for (uint8_t i = 0; i < pageSlotCount; i++) {
+    free(pageSlots[i].buffer);
+    free(pageSlots[i].glyphs);
+    pageSlots[i] = {};
+  }
+  pageSlotCount = 0;
 }
 
 void FontDecompressor::freeHotGroup() {
@@ -126,7 +126,7 @@ void FontDecompressor::compactSingleGlyph(const uint8_t* alignedSrc, uint8_t* pa
   if (outBits > 0) packedDst[writeIdx] = outByte << (8 - outBits);
 }
 
-// --- getBitmap: page buffer → hot group → decompress ---
+// --- getBitmap: page slots → hot group → decompress ---
 
 const uint8_t* FontDecompressor::getBitmap(const EpdFontData* fontData, const EpdGlyph* glyph, uint32_t glyphIndex) {
   const uint32_t tStart = micros();
@@ -137,24 +137,28 @@ const uint8_t* FontDecompressor::getBitmap(const EpdFontData* fontData, const Ep
     return &fontData->bitmap[glyph->dataOffset];
   }
 
-  // Check page buffer first (populated by prewarmCache)
-  if (pageBuffer && pageFont == fontData && pageGlyphCount > 0) {
-    int left = 0, right = pageGlyphCount - 1;
+  // Check page buffers first (populated by prewarmCache)
+  for (uint8_t slotIndex = 0; slotIndex < pageSlotCount; slotIndex++) {
+    PageSlot& slot = pageSlots[slotIndex];
+    if (!slot.buffer || !slot.glyphs || slot.fontData != fontData || slot.glyphCount == 0) continue;
+
+    int left = 0, right = slot.glyphCount - 1;
     while (left <= right) {
       int mid = left + (right - left) / 2;
-      if (pageGlyphs[mid].glyphIndex == glyphIndex) {
-        if (pageGlyphs[mid].bufferOffset != UINT32_MAX) {
+      if (slot.glyphs[mid].glyphIndex == glyphIndex) {
+        if (slot.glyphs[mid].bufferOffset != UINT32_MAX) {
           stats.cacheHits++;
           stats.getBitmapTimeUs += micros() - tStart;
-          return &pageBuffer[pageGlyphs[mid].bufferOffset];
+          return &slot.buffer[slot.glyphs[mid].bufferOffset];
         }
         break;  // Not extracted during prewarm; fall through to hot-group path
       }
-      if (pageGlyphs[mid].glyphIndex < glyphIndex)
+      if (slot.glyphs[mid].glyphIndex < glyphIndex)
         left = mid + 1;
       else
         right = mid - 1;
     }
+    break;
   }
 
   // Fallback: hot group slot
@@ -239,8 +243,11 @@ int32_t FontDecompressor::findGlyphIndex(const EpdFontData* fontData, uint32_t c
 }
 
 int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8Text) {
-  freePageBuffer();
   if (!fontData || !fontData->groups || !utf8Text) return 0;
+  if (pageSlotCount >= MAX_PAGE_SLOTS) {
+    LOG_DBG("FDC", "Prewarm slot cap (%u) reached; using hot-group fallback", MAX_PAGE_SLOTS);
+    return -1;
+  }
 
   // Step 1: Collect unique glyph indices needed for this page
   uint32_t neededGlyphs[MAX_PAGE_GLYPHS];
@@ -253,6 +260,9 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
     if (cp == 0) break;
 
     int32_t glyphIdx = findGlyphIndex(fontData, cp);
+    if (glyphIdx < 0 && !syntheticGlyph::isSpaceFallback(cp)) {
+      glyphIdx = findGlyphIndex(fontData, REPLACEMENT_GLYPH);
+    }
     if (glyphIdx < 0) continue;
 
     // Deduplicate
@@ -274,6 +284,43 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
     }
   }
 
+  // Add ligature output glyphs: if both input codepoints of a ligature pair are
+  // in the needed set, the output glyph will be queried during rendering.
+  if (fontData->ligaturePairs && fontData->ligaturePairCount > 0) {
+    for (uint32_t li = 0; li < fontData->ligaturePairCount && glyphCount < MAX_PAGE_GLYPHS; li++) {
+      uint32_t leftCp = fontData->ligaturePairs[li].pair >> 16;
+      uint32_t rightCp = fontData->ligaturePairs[li].pair & 0xFFFF;
+
+      int32_t leftIdx = findGlyphIndex(fontData, leftCp);
+      int32_t rightIdx = findGlyphIndex(fontData, rightCp);
+      if (leftIdx < 0 || rightIdx < 0) continue;
+
+      // Check if both inputs are in neededGlyphs
+      bool hasLeft = false, hasRight = false;
+      for (uint16_t i = 0; i < glyphCount; i++) {
+        if (neededGlyphs[i] == static_cast<uint32_t>(leftIdx)) hasLeft = true;
+        if (neededGlyphs[i] == static_cast<uint32_t>(rightIdx)) hasRight = true;
+        if (hasLeft && hasRight) break;
+      }
+      if (!hasLeft || !hasRight) continue;
+
+      int32_t outIdx = findGlyphIndex(fontData, fontData->ligaturePairs[li].ligatureCp);
+      if (outIdx < 0) continue;
+
+      // Deduplicate
+      bool found = false;
+      for (uint16_t i = 0; i < glyphCount; i++) {
+        if (neededGlyphs[i] == static_cast<uint32_t>(outIdx)) {
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        neededGlyphs[glyphCount++] = static_cast<uint32_t>(outIdx);
+      }
+    }
+  }
+
   if (glyphCount == 0) return 0;
 
   // Step 2: Compute total buffer size and collect unique groups
@@ -305,33 +352,37 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
   stats.uniqueGroupsAccessed = groupCount;
 
   // Step 3: Allocate page buffer and lookup table
-  pageBuffer = static_cast<uint8_t*>(malloc(totalBytes));
-  pageGlyphs = static_cast<PageGlyphEntry*>(malloc(glyphCount * sizeof(PageGlyphEntry)));
-  if (!pageBuffer || !pageGlyphs) {
+  PageSlot& slot = pageSlots[pageSlotCount];
+  slot.buffer = static_cast<uint8_t*>(malloc(totalBytes));
+  slot.glyphs = static_cast<PageGlyphEntry*>(malloc(glyphCount * sizeof(PageGlyphEntry)));
+  if (!slot.buffer || !slot.glyphs) {
     LOG_ERR("FDC", "Failed to allocate page buffer (%u bytes, %u glyphs)", totalBytes, glyphCount);
-    freePageBuffer();
+    free(slot.buffer);
+    free(slot.glyphs);
+    slot = {};
     return glyphCount;
   }
-  stats.pageBufferBytes = totalBytes;
-  stats.pageGlyphsBytes = glyphCount * sizeof(PageGlyphEntry);
+  stats.pageBufferBytes += totalBytes;
+  stats.pageGlyphsBytes += glyphCount * sizeof(PageGlyphEntry);
 
-  pageFont = fontData;
-  pageGlyphCount = glyphCount;
+  slot.fontData = fontData;
+  slot.glyphCount = glyphCount;
+  pageSlotCount++;
 
   // Initialize lookup entries (bufferOffset = UINT32_MAX means not yet extracted)
   for (uint16_t i = 0; i < glyphCount; i++) {
-    pageGlyphs[i] = {neededGlyphs[i], UINT32_MAX, 0};
+    slot.glyphs[i] = {neededGlyphs[i], UINT32_MAX, 0};
   }
 
   // Sort by glyphIndex for binary search in getBitmap()
   for (uint16_t i = 1; i < glyphCount; i++) {
-    PageGlyphEntry key = pageGlyphs[i];
+    PageGlyphEntry key = slot.glyphs[i];
     int j = i - 1;
-    while (j >= 0 && pageGlyphs[j].glyphIndex > key.glyphIndex) {
-      pageGlyphs[j + 1] = pageGlyphs[j];
+    while (j >= 0 && slot.glyphs[j].glyphIndex > key.glyphIndex) {
+      slot.glyphs[j + 1] = slot.glyphs[j];
       j--;
     }
-    pageGlyphs[j + 1] = key;
+    slot.glyphs[j + 1] = key;
   }
 
   // Step 3b: Pre-scan to compute each needed glyph's byte-aligned offset within its group.
@@ -357,15 +408,15 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
 
       const EpdGlyph& glyph = fontData->glyph[i];
 
-      // Binary search in sorted pageGlyphs to find if glyph i is needed
-      int left = 0, right = (int)pageGlyphCount - 1;
+      // Binary search in sorted slot.glyphs to find if glyph i is needed
+      int left = 0, right = (int)slot.glyphCount - 1;
       while (left <= right) {
         const int mid = left + (right - left) / 2;
-        if (pageGlyphs[mid].glyphIndex == i) {
-          pageGlyphs[mid].alignedOffset = groupAlignedTracker[gpPos];
+        if (slot.glyphs[mid].glyphIndex == i) {
+          slot.glyphs[mid].alignedOffset = groupAlignedTracker[gpPos];
           break;
         }
-        if (pageGlyphs[mid].glyphIndex < i)
+        if (slot.glyphs[mid].glyphIndex < i)
           left = mid + 1;
         else
           right = mid - 1;
@@ -384,14 +435,14 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
         const uint32_t glyphI = group.firstGlyphIndex + j;
         const EpdGlyph& glyph = fontData->glyph[glyphI];
 
-        int left = 0, right = (int)pageGlyphCount - 1;
+        int left = 0, right = (int)slot.glyphCount - 1;
         while (left <= right) {
           const int mid = left + (right - left) / 2;
-          if (pageGlyphs[mid].glyphIndex == glyphI) {
-            pageGlyphs[mid].alignedOffset = alignedOff;
+          if (slot.glyphs[mid].glyphIndex == glyphI) {
+            slot.glyphs[mid].alignedOffset = alignedOff;
             break;
           }
-          if (pageGlyphs[mid].glyphIndex < glyphI)
+          if (slot.glyphs[mid].glyphIndex < glyphI)
             left = mid + 1;
           else
             right = mid - 1;
@@ -430,13 +481,13 @@ int FontDecompressor::prewarmCache(const EpdFontData* fontData, const char* utf8
 
     // Extract needed glyphs directly from the byte-aligned temp buffer, compacting on the fly.
     // alignedOffset was pre-computed in step 3b — no full-group compact scan needed.
-    for (uint16_t i = 0; i < pageGlyphCount; i++) {
-      if (pageGlyphs[i].bufferOffset != UINT32_MAX) continue;  // already extracted
-      if (getGroupIndex(fontData, pageGlyphs[i].glyphIndex) != groupIdx) continue;
+    for (uint16_t i = 0; i < slot.glyphCount; i++) {
+      if (slot.glyphs[i].bufferOffset != UINT32_MAX) continue;  // already extracted
+      if (getGroupIndex(fontData, slot.glyphs[i].glyphIndex) != groupIdx) continue;
 
-      const EpdGlyph& glyph = fontData->glyph[pageGlyphs[i].glyphIndex];
-      compactSingleGlyph(&tempBuf[pageGlyphs[i].alignedOffset], &pageBuffer[writeOffset], glyph.width, glyph.height);
-      pageGlyphs[i].bufferOffset = writeOffset;
+      const EpdGlyph& glyph = fontData->glyph[slot.glyphs[i].glyphIndex];
+      compactSingleGlyph(&tempBuf[slot.glyphs[i].alignedOffset], &slot.buffer[writeOffset], glyph.width, glyph.height);
+      slot.glyphs[i].bufferOffset = writeOffset;
       writeOffset += glyph.dataLength;
     }
 
diff --git a/lib/EpdFont/FontDecompressor.h b/lib/EpdFont/FontDecompressor.h
index 7c70cc6e..706bdf74 100644
--- a/lib/EpdFont/FontDecompressor.h
+++ b/lib/EpdFont/FontDecompressor.h
@@ -9,6 +9,7 @@
 class FontDecompressor {
  public:
   static constexpr uint16_t MAX_PAGE_GLYPHS = 512;
+  static constexpr uint8_t MAX_PAGE_SLOTS = 4;
 
   FontDecompressor() = default;
   ~FontDecompressor();
@@ -17,13 +18,13 @@ class FontDecompressor {
   void deinit();
 
   // Returns pointer to decompressed bitmap data for the given glyph.
-  // Checks the page buffer (from prewarm) first, then falls back to the hot group slot.
+  // Checks the page slots (from prewarm) first, then falls back to the hot group slot.
   const uint8_t* getBitmap(const EpdFontData* fontData, const EpdGlyph* glyph, uint32_t glyphIndex);
 
-  // Free all cached data (page buffer + hot group).
+  // Free all cached data (page slots + hot group).
   void clearCache();
 
-  // Pre-scan UTF-8 text and extract needed glyph bitmaps into a flat page buffer.
+  // Pre-scan UTF-8 text and extract needed glyph bitmaps into a flat page slot.
   // Each group is decompressed once into a temp buffer; only needed glyphs are kept.
   // Returns the number of glyphs that couldn't be loaded (0 on full success).
   int prewarmCache(const EpdFontData* fontData, const char* utf8Text);
@@ -33,8 +34,8 @@ class FontDecompressor {
     uint32_t cacheMisses = 0;
     uint32_t decompressTimeMs = 0;
     uint16_t uniqueGroupsAccessed = 0;
-    uint32_t pageBufferBytes = 0;  // pageBuffer allocation
-    uint32_t pageGlyphsBytes = 0;  // pageGlyphs lookup table allocation
+    uint32_t pageBufferBytes = 0;  // page slot buffer allocations
+    uint32_t pageGlyphsBytes = 0;  // page slot lookup table allocations
     uint32_t hotGroupBytes = 0;    // current hot group allocation
     uint32_t peakTempBytes = 0;    // largest temp buffer in prewarm
     uint32_t getBitmapTimeUs = 0;  // cumulative getBitmap time (micros)
@@ -48,16 +49,20 @@ class FontDecompressor {
   Stats stats;
   InflateReader inflateReader;
 
-  // Page buffer: flat array of prewarmed glyph bitmaps with sorted lookup
+  // Page buffers: flat arrays of prewarmed glyph bitmaps with sorted lookup
   struct PageGlyphEntry {
     uint32_t glyphIndex;
     uint32_t bufferOffset;
     uint32_t alignedOffset;  // byte-aligned offset within its decompressed group (set during prewarm pre-scan)
   };
-  uint8_t* pageBuffer = nullptr;
-  const EpdFontData* pageFont = nullptr;
-  PageGlyphEntry* pageGlyphs = nullptr;
-  uint16_t pageGlyphCount = 0;
+  struct PageSlot {
+    uint8_t* buffer;
+    const EpdFontData* fontData;
+    PageGlyphEntry* glyphs;
+    uint16_t glyphCount;
+  };
+  PageSlot pageSlots[MAX_PAGE_SLOTS] = {};
+  uint8_t pageSlotCount = 0;
 
   // Hot group: last decompressed group (byte-aligned) for non-prewarmed fallback path.
   // Kept in byte-aligned format; individual glyphs are compacted on demand into hotGlyphBuf.
diff --git a/lib/EpdFont/SdCardFont.cpp b/lib/EpdFont/SdCardFont.cpp
new file mode 100644
index 00000000..df63a2ff
--- /dev/null
+++ b/lib/EpdFont/SdCardFont.cpp
@@ -0,0 +1,1377 @@
+#include "SdCardFont.h"
+
+#include <HalStorage.h>
+#include <Logging.h>
+#include <Utf8.h>
+
+#include <algorithm>
+#include <climits>
+#include <cstring>
+#include <memory>
+
+#include "EpdFontFamily.h"
+
+static_assert(sizeof(EpdGlyph) == 16, "EpdGlyph must be 16 bytes to match .cpfont file layout");
+static_assert(sizeof(EpdUnicodeInterval) == 12, "EpdUnicodeInterval must be 12 bytes to match .cpfont file layout");
+static_assert(sizeof(EpdKernClassEntry) == 3, "EpdKernClassEntry must be 3 bytes to match .cpfont file layout");
+static_assert(sizeof(EpdLigaturePair) == 8, "EpdLigaturePair must be 8 bytes to match .cpfont file layout");
+
+namespace {
+
+// FNV-1a hash for content-based font ID generation
+constexpr uint32_t FNV_OFFSET = 2166136261u;
+constexpr uint32_t FNV_PRIME = 16777619u;
+
+uint32_t fnv1a(const uint8_t* data, size_t len, uint32_t hash = FNV_OFFSET) {
+  for (size_t i = 0; i < len; i++) {
+    hash ^= data[i];
+    hash *= FNV_PRIME;
+  }
+  return hash;
+}
+
+// .cpfont magic bytes
+constexpr char CPFONT_MAGIC[8] = {'C', 'P', 'F', 'O', 'N', 'T', '\0', '\0'};
+// CPFONT_VERSION is defined as a #define in SdCardFont.h so it can be
+// stringified into FONT_MANIFEST_URL.
+constexpr uint32_t HEADER_SIZE = 32;
+constexpr uint32_t STYLE_TOC_ENTRY_SIZE = 32;
+
+// Helper to read little-endian values from byte buffer
+inline uint16_t readU16(const uint8_t* p) { return p[0] | (p[1] << 8); }
+inline int16_t readI16(const uint8_t* p) { return static_cast<int16_t>(p[0] | (p[1] << 8)); }
+inline uint32_t readU32(const uint8_t* p) { return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); }
+
+// Walks a null-terminated UTF-8 string and appends each unique codepoint to
+// codepoints[0..cpCount-1] via O(n²) dedup.  Returns true if the buffer
+// reached maxCount (cap hit), false if all codepoints fit.
+bool collectUniqueCodepoints(const char* text, uint32_t* codepoints, uint32_t& cpCount, uint32_t maxCount) {
+  const unsigned char* p = reinterpret_cast<const unsigned char*>(text);
+  while (*p) {
+    uint32_t cp = utf8NextCodepoint(&p);
+    if (cp == 0) break;
+    bool found = false;
+    for (uint32_t i = 0; i < cpCount; i++) {
+      if (codepoints[i] == cp) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      if (cpCount >= maxCount) return true;
+      codepoints[cpCount++] = cp;
+    }
+  }
+  return false;
+}
+
+const char* asCStr(const std::string& s) { return s.c_str(); }
+const char* asCStr(const char* s) { return s; }
+
+}  // namespace
+
+SdCardFont::~SdCardFont() { freeAll(); }
+
+// --- Per-style free/cleanup ---
+
+void SdCardFont::freeStyleMiniData(PerStyle& s) {
+  delete[] s.miniIntervals;
+  s.miniIntervals = nullptr;
+  delete[] s.miniGlyphs;
+  s.miniGlyphs = nullptr;
+  delete[] s.miniBitmap;
+  s.miniBitmap = nullptr;
+  s.miniIntervalCount = 0;
+  s.miniGlyphCount = 0;
+  freeStyleMiniKern(s);
+  memset(&s.miniData, 0, sizeof(s.miniData));
+  s.epdFont.data = &s.stubData;
+}
+
+void SdCardFont::freeStyleKernLigatureData(PerStyle& s) {
+  delete[] s.kernLeftClasses;
+  s.kernLeftClasses = nullptr;
+  delete[] s.kernRightClasses;
+  s.kernRightClasses = nullptr;
+  delete[] s.ligaturePairs;
+  s.ligaturePairs = nullptr;
+  s.kernLigLoaded = false;
+
+  s.stubData.ligaturePairs = nullptr;
+  s.stubData.ligaturePairCount = 0;
+  s.miniData.kernLeftClasses = nullptr;
+  s.miniData.kernRightClasses = nullptr;
+  s.miniData.kernMatrix = nullptr;
+  s.miniData.kernLeftEntryCount = 0;
+  s.miniData.kernRightEntryCount = 0;
+  s.miniData.kernLeftClassCount = 0;
+  s.miniData.kernRightClassCount = 0;
+  s.miniData.ligaturePairs = nullptr;
+  s.miniData.ligaturePairCount = 0;
+}
+
+void SdCardFont::freeStyleMiniKern(PerStyle& s) {
+  delete[] s.miniKernLeftClasses;
+  s.miniKernLeftClasses = nullptr;
+  delete[] s.miniKernRightClasses;
+  s.miniKernRightClasses = nullptr;
+  delete[] s.miniKernMatrix;
+  s.miniKernMatrix = nullptr;
+  s.miniKernLeftEntryCount = 0;
+  s.miniKernRightEntryCount = 0;
+  s.miniKernLeftClassCount = 0;
+  s.miniKernRightClassCount = 0;
+}
+
+void SdCardFont::freeStyleAll(PerStyle& s) {
+  freeStyleMiniData(s);
+  delete[] s.fullIntervals;
+  s.fullIntervals = nullptr;
+  freeStyleKernLigatureData(s);
+  s.present = false;
+}
+
+// --- Global free/cleanup ---
+
+void SdCardFont::freeAll() {
+  clearOverflow();
+  clearPersistentCache();
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    freeStyleAll(styles_[i]);
+  }
+  styleCount_ = 0;
+  contentHash_ = 0;
+  loaded_ = false;
+}
+
+void SdCardFont::clearOverflow() {
+  for (uint32_t i = 0; i < overflowCount_; i++) {
+    delete[] overflow_[i].bitmap;
+    overflow_[i].bitmap = nullptr;
+    overflow_[i].codepoint = 0;
+  }
+  overflowCount_ = 0;
+  overflowNext_ = 0;
+}
+
+// --- Per-style kern/ligature ---
+
+void SdCardFont::applyKernLigaturePointers(PerStyle& s, EpdFontData& data) const {
+  // Kern data uses the per-page mini tables (renumbered class IDs). The full
+  // kern matrix is never resident — see PerStyle::miniKernMatrix comment.
+  data.kernLeftClasses = s.miniKernLeftClasses;
+  data.kernRightClasses = s.miniKernRightClasses;
+  data.kernMatrix = s.miniKernMatrix;
+  data.kernLeftEntryCount = s.miniKernLeftEntryCount;
+  data.kernRightEntryCount = s.miniKernRightEntryCount;
+  data.kernLeftClassCount = s.miniKernLeftClassCount;
+  data.kernRightClassCount = s.miniKernRightClassCount;
+  // Ligatures are small (typically < 1KB) so they stay resident.
+  data.ligaturePairs = s.ligaturePairs;
+  data.ligaturePairCount = s.header.ligaturePairCount;
+}
+
+bool SdCardFont::loadStyleKernLigatureData(PerStyle& s) {
+  if (s.kernLigLoaded) return true;
+  bool hasKern = s.header.kernLeftEntryCount > 0;
+  bool hasLig = s.header.ligaturePairCount > 0;
+  if (!hasKern && !hasLig) {
+    s.kernLigLoaded = true;
+    return true;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("SDCF", filePath_, file)) {
+    LOG_ERR("SDCF", "Failed to open .cpfont for kern/lig: %s", filePath_);
+    return false;
+  }
+
+  if (hasKern) {
+    // Load only the small class-lookup tables (~3KB each). The full matrix
+    // (~36KB contiguous for Literata) is built per-page from SD in
+    // buildMiniKernMatrix().
+    s.kernLeftClasses = new (std::nothrow) EpdKernClassEntry[s.header.kernLeftEntryCount];
+    s.kernRightClasses = new (std::nothrow) EpdKernClassEntry[s.header.kernRightEntryCount];
+
+    if (!s.kernLeftClasses || !s.kernRightClasses) {
+      LOG_ERR("SDCF", "Failed to allocate kern classes (%u+%u bytes)", s.header.kernLeftEntryCount * 3u,
+              s.header.kernRightEntryCount * 3u);
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+
+    if (!file.seekSet(s.kernLeftFileOffset)) {
+      LOG_ERR("SDCF", "Failed to seek to kern data");
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+    size_t leftSz = s.header.kernLeftEntryCount * sizeof(EpdKernClassEntry);
+    size_t rightSz = s.header.kernRightEntryCount * sizeof(EpdKernClassEntry);
+    if (file.read(reinterpret_cast<uint8_t*>(s.kernLeftClasses), leftSz) != static_cast<int>(leftSz) ||
+        file.read(reinterpret_cast<uint8_t*>(s.kernRightClasses), rightSz) != static_cast<int>(rightSz)) {
+      LOG_ERR("SDCF", "Failed to read kern classes");
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+  }
+
+  if (hasLig) {
+    s.ligaturePairs = new (std::nothrow) EpdLigaturePair[s.header.ligaturePairCount];
+    if (!s.ligaturePairs) {
+      LOG_ERR("SDCF", "Failed to allocate ligature pairs");
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+    if (!file.seekSet(s.ligatureFileOffset)) {
+      LOG_ERR("SDCF", "Failed to seek to ligature data");
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+    size_t sz = s.header.ligaturePairCount * sizeof(EpdLigaturePair);
+    if (file.read(reinterpret_cast<uint8_t*>(s.ligaturePairs), sz) != static_cast<int>(sz)) {
+      LOG_ERR("SDCF", "Failed to read ligature pairs");
+      freeStyleKernLigatureData(s);
+      return false;
+    }
+  }
+
+  s.kernLigLoaded = true;
+
+  // Make ligatures visible to the stub (used when no mini data built yet).
+  // Kern stays nullptr on the stub — it is only wired in miniData via
+  // applyKernLigaturePointers() after buildMiniKernMatrix() runs.
+  s.stubData.ligaturePairs = s.ligaturePairs;
+  s.stubData.ligaturePairCount = s.header.ligaturePairCount;
+
+  LOG_DBG("SDCF", "Kern classes + lig loaded: kernL=%u, kernR=%u, ligs=%u", s.header.kernLeftEntryCount,
+          s.header.kernRightEntryCount, s.header.ligaturePairCount);
+  return true;
+}
+
+// --- Per-page mini kern matrix ---
+
+// Local copy of EpdFont.cpp's lookupKernClass (that one is file-static there).
+// Returns the 1-based class ID for `cp`, or 0 if the codepoint has no kerning class.
+static uint8_t miniLookupKernClass(const EpdKernClassEntry* entries, uint16_t count, uint32_t cp) {
+  if (!entries || count == 0 || cp > 0xFFFF) return 0;
+  const auto target = static_cast<uint16_t>(cp);
+  const auto* end = entries + count;
+  const auto it =
+      std::lower_bound(entries, end, target, [](const EpdKernClassEntry& e, uint16_t v) { return e.codepoint < v; });
+  return (it != end && it->codepoint == target) ? it->classId : 0;
+}
+
+// Build a small per-page kern matrix containing ONLY the (leftClass, rightClass)
+// pairs reachable from codepoints in the current text. Class IDs are renumbered
+// to a dense 1..N range so the resulting matrix is usedLeft × usedRight (typical
+// Latin page: ~25×25 bytes) instead of the font's full ~180×200 (~36KB).
+//
+// Correctness: EpdFont::getKerning only touches `kernLeftClasses` /
+// `kernRightClasses` / `kernMatrix` / the count fields — we swap all of them to
+// the mini versions together in applyKernLigaturePointers, so a codepoint not
+// on this page simply returns class 0 (no kerning), which was the pre-existing
+// behavior for any codepoint outside the kern classes.
+bool SdCardFont::buildMiniKernMatrix(PerStyle& s, const uint32_t* codepoints, uint32_t cpCount) {
+  freeStyleMiniKern(s);
+  if (!s.kernLeftClasses || !s.kernRightClasses || s.header.kernLeftEntryCount == 0 ||
+      s.header.kernRightEntryCount == 0) {
+    return true;  // font has no kern classes — nothing to build
+  }
+
+  // Step 1: mark used left/right classes via a 256-wide bitmap (class IDs are uint8_t).
+  bool usedLeft[256] = {};
+  bool usedRight[256] = {};
+  for (uint32_t i = 0; i < cpCount; i++) {
+    uint8_t lc = miniLookupKernClass(s.kernLeftClasses, s.header.kernLeftEntryCount, codepoints[i]);
+    if (lc) usedLeft[lc] = true;
+    uint8_t rc = miniLookupKernClass(s.kernRightClasses, s.header.kernRightEntryCount, codepoints[i]);
+    if (rc) usedRight[rc] = true;
+  }
+
+  // Step 2: build renumber maps (oldClassId -> newClassId, 1-based) and
+  // reverse maps (newClassId -> oldClassId) for the SD read step.
+  uint8_t leftRenumber[256] = {};
+  uint8_t rightRenumber[256] = {};
+  uint8_t newToOldLeft[256] = {};
+  uint8_t newToOldRight[256] = {};
+  uint8_t numLeft = 0, numRight = 0;
+  for (int i = 1; i < 256; i++) {
+    if (usedLeft[i]) {
+      numLeft++;
+      leftRenumber[i] = numLeft;
+      newToOldLeft[numLeft] = static_cast<uint8_t>(i);
+    }
+    if (usedRight[i]) {
+      numRight++;
+      rightRenumber[i] = numRight;
+      newToOldRight[numRight] = static_cast<uint8_t>(i);
+    }
+  }
+  if (numLeft == 0 || numRight == 0) {
+    return true;  // no kern pairs applicable on this page
+  }
+
+  // Step 3: count how many codepoint→classId entries the mini class tables need.
+  // Each resident class table has one entry per kerned codepoint in the page.
+  uint16_t miniLeftCount = 0;
+  uint16_t miniRightCount = 0;
+  for (uint32_t i = 0; i < cpCount; i++) {
+    if (miniLookupKernClass(s.kernLeftClasses, s.header.kernLeftEntryCount, codepoints[i]) != 0) miniLeftCount++;
+    if (miniLookupKernClass(s.kernRightClasses, s.header.kernRightEntryCount, codepoints[i]) != 0) miniRightCount++;
+  }
+
+  // Step 4: allocate the three mini buffers. The matrix is <1KB in practice
+  // (<30 × <30 × 1 byte) so fragmentation is a non-issue.
+  const uint32_t matrixBytes = static_cast<uint32_t>(numLeft) * numRight;
+  s.miniKernLeftClasses = new (std::nothrow) EpdKernClassEntry[miniLeftCount];
+  s.miniKernRightClasses = new (std::nothrow) EpdKernClassEntry[miniRightCount];
+  s.miniKernMatrix = new (std::nothrow) int8_t[matrixBytes];
+  if (!s.miniKernLeftClasses || !s.miniKernRightClasses || !s.miniKernMatrix) {
+    LOG_ERR("SDCF", "Failed to allocate mini kern (%u+%u+%u bytes)", miniLeftCount * 3u, miniRightCount * 3u,
+            matrixBytes);
+    freeStyleMiniKern(s);
+    return false;
+  }
+
+  // Step 5: populate mini class tables. `codepoints` is already sorted (see
+  // prewarm()) so the output is sorted by codepoint — required for binary
+  // search in lookupKernClass during render.
+  uint16_t lIdx = 0, rIdx = 0;
+  for (uint32_t i = 0; i < cpCount; i++) {
+    uint32_t cp = codepoints[i];
+    if (cp > 0xFFFF) continue;  // kern class entries are uint16_t
+    uint8_t lc = miniLookupKernClass(s.kernLeftClasses, s.header.kernLeftEntryCount, cp);
+    if (lc) {
+      s.miniKernLeftClasses[lIdx].codepoint = static_cast<uint16_t>(cp);
+      s.miniKernLeftClasses[lIdx].classId = leftRenumber[lc];
+      lIdx++;
+    }
+    uint8_t rc = miniLookupKernClass(s.kernRightClasses, s.header.kernRightEntryCount, cp);
+    if (rc) {
+      s.miniKernRightClasses[rIdx].codepoint = static_cast<uint16_t>(cp);
+      s.miniKernRightClasses[rIdx].classId = rightRenumber[rc];
+      rIdx++;
+    }
+  }
+
+  // Step 6: read the full matrix's rows for each used left class, keep only
+  // columns for used right classes. One SD seek + one read per used left class;
+  // a row is kernRightClassCount bytes (~200 for Literata).
+  FsFile file;
+  if (!Storage.openFileForRead("SDCF", filePath_, file)) {
+    LOG_ERR("SDCF", "Failed to open .cpfont for mini kern: %s", filePath_);
+    freeStyleMiniKern(s);
+    return false;
+  }
+
+  std::unique_ptr<int8_t[]> rowBuf(new (std::nothrow) int8_t[s.header.kernRightClassCount]);
+  if (!rowBuf) {
+    LOG_ERR("SDCF", "Failed to allocate row buffer (%u bytes)", s.header.kernRightClassCount);
+    freeStyleMiniKern(s);
+    return false;
+  }
+
+  for (uint8_t newL = 1; newL <= numLeft; newL++) {
+    const uint8_t oldL = newToOldLeft[newL];
+    const uint32_t rowFileOff = s.kernMatrixFileOffset + (oldL - 1u) * s.header.kernRightClassCount;
+    if (!file.seekSet(rowFileOff)) {
+      LOG_ERR("SDCF", "Failed to seek to kern row %u", oldL);
+      freeStyleMiniKern(s);
+      return false;
+    }
+    if (file.read(reinterpret_cast<uint8_t*>(rowBuf.get()), s.header.kernRightClassCount) !=
+        static_cast<int>(s.header.kernRightClassCount)) {
+      LOG_ERR("SDCF", "Failed to read kern row %u", oldL);
+      freeStyleMiniKern(s);
+      return false;
+    }
+    int8_t* miniRow = s.miniKernMatrix + (newL - 1u) * numRight;
+    for (uint8_t newR = 1; newR <= numRight; newR++) {
+      miniRow[newR - 1] = rowBuf[newToOldRight[newR] - 1u];
+    }
+  }
+
+  s.miniKernLeftEntryCount = lIdx;
+  s.miniKernRightEntryCount = rIdx;
+  s.miniKernLeftClassCount = numLeft;
+  s.miniKernRightClassCount = numRight;
+
+  LOG_DBG("SDCF", "Built mini kern: %u×%u matrix (%u bytes, full was %u×%u = %u bytes)", numLeft, numRight, matrixBytes,
+          s.header.kernLeftClassCount, s.header.kernRightClassCount,
+          static_cast<uint32_t>(s.header.kernLeftClassCount) * s.header.kernRightClassCount);
+  return true;
+}
+
+// --- Glyph miss callback ---
+
+void SdCardFont::applyGlyphMissCallback(uint8_t styleIdx) {
+  overflowCtx_[styleIdx].self = this;
+  overflowCtx_[styleIdx].styleIdx = styleIdx;
+
+  auto& s = styles_[styleIdx];
+  s.stubData.glyphMissHandler = &SdCardFont::onGlyphMiss;
+  s.stubData.glyphMissCtx = &overflowCtx_[styleIdx];
+}
+
+// --- Compute per-style file offsets from a base data offset ---
+
+void SdCardFont::computeStyleFileOffsets(PerStyle& s, uint32_t baseOffset) {
+  s.intervalsFileOffset = baseOffset;
+  s.glyphsFileOffset = s.intervalsFileOffset + s.header.intervalCount * sizeof(EpdUnicodeInterval);
+  s.kernLeftFileOffset = s.glyphsFileOffset + s.header.glyphCount * sizeof(EpdGlyph);
+  s.kernRightFileOffset = s.kernLeftFileOffset + s.header.kernLeftEntryCount * sizeof(EpdKernClassEntry);
+  s.kernMatrixFileOffset = s.kernRightFileOffset + s.header.kernRightEntryCount * sizeof(EpdKernClassEntry);
+  s.ligatureFileOffset =
+      s.kernMatrixFileOffset + static_cast<uint32_t>(s.header.kernLeftClassCount) * s.header.kernRightClassCount;
+  s.bitmapFileOffset = s.ligatureFileOffset + s.header.ligaturePairCount * sizeof(EpdLigaturePair);
+}
+
+// --- Load ---
+
+bool SdCardFont::load(const char* path) {
+  freeAll();
+  if (strlen(path) >= sizeof(filePath_)) {
+    LOG_ERR("SDCF", "Path too long (%zu bytes, max %zu)", strlen(path), sizeof(filePath_) - 1);
+    return false;
+  }
+  strncpy(filePath_, path, sizeof(filePath_) - 1);
+  filePath_[sizeof(filePath_) - 1] = '\0';
+
+  FsFile file;
+  if (!Storage.openFileForRead("SDCF", path, file)) {
+    LOG_ERR("SDCF", "Failed to open .cpfont: %s", path);
+    return false;
+  }
+
+  // Read and validate global header
+  uint8_t headerBuf[HEADER_SIZE];
+  if (file.read(headerBuf, HEADER_SIZE) != HEADER_SIZE) {
+    LOG_ERR("SDCF", "Failed to read header");
+    return false;
+  }
+
+  if (memcmp(headerBuf, CPFONT_MAGIC, 8) != 0) {
+    LOG_ERR("SDCF", "Invalid magic bytes");
+    return false;
+  }
+
+  uint16_t fileVersion = readU16(headerBuf + 8);
+  if (fileVersion != CPFONT_VERSION) {
+    LOG_ERR("SDCF", "Unsupported version: %u (expected %u)", fileVersion, CPFONT_VERSION);
+    return false;
+  }
+
+  // Begin content hash: accumulate global header
+  uint32_t hash = fnv1a(headerBuf, HEADER_SIZE);
+
+  bool is2Bit = (readU16(headerBuf + 10) & 1) != 0;
+
+  uint8_t styleCount = headerBuf[12];
+  if (styleCount == 0 || styleCount > MAX_STYLES) {
+    LOG_ERR("SDCF", "Invalid style count: %u", styleCount);
+    return false;
+  }
+
+  // Read style TOC
+  for (uint8_t i = 0; i < styleCount; i++) {
+    uint8_t tocBuf[STYLE_TOC_ENTRY_SIZE];
+    if (file.read(tocBuf, STYLE_TOC_ENTRY_SIZE) != STYLE_TOC_ENTRY_SIZE) {
+      LOG_ERR("SDCF", "Failed to read style TOC entry %u", i);
+      freeAll();
+      return false;
+    }
+
+    // Accumulate TOC entry into content hash
+    hash = fnv1a(tocBuf, STYLE_TOC_ENTRY_SIZE, hash);
+
+    uint8_t styleId = tocBuf[0];
+    if (styleId >= MAX_STYLES) {
+      LOG_ERR("SDCF", "Invalid styleId %u in TOC", styleId);
+      file.close();
+      freeAll();
+      return false;
+    }
+
+    auto& s = styles_[styleId];
+    s.present = true;
+    s.header.intervalCount = readU32(tocBuf + 4);
+    s.header.glyphCount = readU32(tocBuf + 8);
+    s.header.advanceY = tocBuf[12];
+    s.header.ascender = readI16(tocBuf + 13);
+    s.header.descender = readI16(tocBuf + 15);
+    s.header.kernLeftEntryCount = readU16(tocBuf + 17);
+    s.header.kernRightEntryCount = readU16(tocBuf + 19);
+    s.header.kernLeftClassCount = tocBuf[21];
+    s.header.kernRightClassCount = tocBuf[22];
+    s.header.ligaturePairCount = tocBuf[23];
+    s.header.is2Bit = is2Bit;
+
+    // Sanity-check counts to reject malformed files before allocating.
+    // Kern class counts are uint8 (bounded by type). Entry counts are uint16
+    // but in practice a sane font has far fewer than 4096 per-side kern entries.
+    static constexpr uint32_t MAX_INTERVALS = 4096;
+    static constexpr uint32_t MAX_GLYPHS = 65536;
+    static constexpr uint32_t MAX_KERN_ENTRIES = 4096;
+    if (s.header.intervalCount > MAX_INTERVALS || s.header.glyphCount > MAX_GLYPHS ||
+        s.header.kernLeftEntryCount > MAX_KERN_ENTRIES || s.header.kernRightEntryCount > MAX_KERN_ENTRIES) {
+      LOG_ERR("SDCF", "Style %u: unreasonable counts (iv=%u, gl=%u, kL=%u, kR=%u)", styleId, s.header.intervalCount,
+              s.header.glyphCount, s.header.kernLeftEntryCount, s.header.kernRightEntryCount);
+      file.close();
+      freeAll();
+      return false;
+    }
+
+    uint32_t dataOffset = readU32(tocBuf + 24);
+    computeStyleFileOffsets(s, dataOffset);
+  }
+
+  styleCount_ = styleCount;
+  contentHash_ = hash;
+
+  // Load full intervals into RAM for each present style
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    auto& s = styles_[i];
+    if (!s.present) continue;
+
+    s.fullIntervals = new (std::nothrow) EpdUnicodeInterval[s.header.intervalCount];
+    if (!s.fullIntervals) {
+      LOG_ERR("SDCF", "Failed to allocate %u intervals for style %u", s.header.intervalCount, i);
+      freeAll();
+      return false;
+    }
+
+    if (!file.seekSet(s.intervalsFileOffset)) {
+      LOG_ERR("SDCF", "Failed to seek to intervals for style %u", i);
+      freeAll();
+      return false;
+    }
+    size_t intervalsBytes = s.header.intervalCount * sizeof(EpdUnicodeInterval);
+    if (file.read(reinterpret_cast<uint8_t*>(s.fullIntervals), intervalsBytes) != static_cast<int>(intervalsBytes)) {
+      LOG_ERR("SDCF", "Failed to read intervals for style %u", i);
+      freeAll();
+      return false;
+    }
+
+    // Validate interval contents before any later code (findGlobalGlyphIndex,
+    // glyph reads) trusts them. A malformed file could otherwise drive
+    // out-of-range glyph indices into bogus on-disk reads.
+    {
+      uint32_t expectedOffset = 0;
+      uint32_t prevLast = 0;
+      for (uint32_t j = 0; j < s.header.intervalCount; ++j) {
+        const auto& iv = s.fullIntervals[j];
+        if (iv.first > iv.last) {
+          LOG_ERR("SDCF", "Style %u: invalid interval %u (first 0x%lX > last 0x%lX)", i, j,
+                  static_cast<unsigned long>(iv.first), static_cast<unsigned long>(iv.last));
+          file.close();
+          freeAll();
+          return false;
+        }
+        const uint32_t span = iv.last - iv.first + 1;
+        const bool overlapsPrev = (j > 0 && iv.first <= prevLast);
+        const bool spanTooBig = (span > s.header.glyphCount);
+        const bool offsetMismatch = (iv.offset != expectedOffset);
+        const bool offsetOverruns = (iv.offset > s.header.glyphCount - span);
+        if (overlapsPrev || spanTooBig || offsetMismatch || offsetOverruns) {
+          LOG_ERR("SDCF", "Style %u: invalid interval layout at %u (overlap=%d span=%u offMis=%d offOver=%d)", i, j,
+                  overlapsPrev, span, offsetMismatch, offsetOverruns);
+          file.close();
+          freeAll();
+          return false;
+        }
+        expectedOffset += span;
+        prevLast = iv.last;
+      }
+    }
+
+    // Initialize stub data
+    memset(&s.stubData, 0, sizeof(s.stubData));
+    s.stubData.advanceY = s.header.advanceY;
+    s.stubData.ascender = s.header.ascender;
+    s.stubData.descender = s.header.descender;
+    s.stubData.is2Bit = s.header.is2Bit;
+
+    s.epdFont.data = &s.stubData;
+    applyGlyphMissCallback(i);
+  }
+
+  loaded_ = true;
+
+  LOG_DBG("SDCF", "Loaded: %s (v%u, %u styles)", path, CPFONT_VERSION, styleCount_);
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    if (!styles_[i].present) continue;
+    const auto& h = styles_[i].header;
+    LOG_DBG("SDCF", "  style[%u]: %u intervals, %u glyphs, advY=%u, asc=%d, desc=%d, kernL=%u, kernR=%u, ligs=%u", i,
+            h.intervalCount, h.glyphCount, h.advanceY, h.ascender, h.descender, h.kernLeftEntryCount,
+            h.kernRightEntryCount, h.ligaturePairCount);
+  }
+  return true;
+}
+
+// --- Codepoint lookup ---
+
+int32_t SdCardFont::findGlobalGlyphIndex(const PerStyle& s, uint32_t codepoint) const {
+  int left = 0;
+  int right = static_cast<int>(s.header.intervalCount) - 1;
+  while (left <= right) {
+    int mid = left + (right - left) / 2;
+    const auto& interval = s.fullIntervals[mid];
+    if (codepoint < interval.first) {
+      right = mid - 1;
+    } else if (codepoint > interval.last) {
+      left = mid + 1;
+    } else {
+      return static_cast<int32_t>(interval.offset + (codepoint - interval.first));
+    }
+  }
+  return -1;
+}
+
+// --- Prewarm ---
+
+int SdCardFont::prewarm(const char* utf8Text, uint8_t styleMask, bool metadataOnly) {
+  if (!loaded_) return -1;
+  styleMask = resolveStyleMask(styleMask);
+  if (styleMask == 0) return 0;
+
+  unsigned long startMs = millis();
+
+  // Step 1: Extract unique codepoints from UTF-8 text (shared across all styles).
+  // Dedup uses O(n^2) linear scan — worst case is MAX_PAGE_GLYPHS (512) unique codepoints
+  // = ~131K comparisons, but in practice pages contain far fewer unique codepoints so the
+  // actual cost is much lower. This is dwarfed by SD I/O that follows. Alternatives (hash
+  // set, bitmap) exceed the 256-byte stack limit or add template bloat.
+  // Heap-allocated: MAX_PAGE_GLYPHS * 4 = 2048 bytes, too large for stack (limit < 256 bytes)
+  std::unique_ptr<uint32_t[]> codepoints(new (std::nothrow) uint32_t[MAX_PAGE_GLYPHS]);
+  if (!codepoints) {
+    LOG_ERR("SDCF", "Failed to allocate codepoint buffer (%u bytes)", MAX_PAGE_GLYPHS * 4);
+    return -1;
+  }
+  uint32_t cpCount = 0;
+
+  const unsigned char* p = reinterpret_cast<const unsigned char*>(utf8Text);
+  while (*p && cpCount < MAX_PAGE_GLYPHS) {
+    uint32_t cp = utf8NextCodepoint(&p);
+    if (cp == 0) break;
+
+    bool found = false;
+    for (uint32_t i = 0; i < cpCount; i++) {
+      if (codepoints[i] == cp) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      codepoints[cpCount++] = cp;
+    }
+  }
+
+  // Always include the replacement character
+  {
+    bool hasReplacement = false;
+    for (uint32_t i = 0; i < cpCount; i++) {
+      if (codepoints[i] == REPLACEMENT_GLYPH) {
+        hasReplacement = true;
+        break;
+      }
+    }
+    if (!hasReplacement && cpCount < MAX_PAGE_GLYPHS) {
+      codepoints[cpCount++] = REPLACEMENT_GLYPH;
+    }
+  }
+
+  // Add ligature output codepoints from all styles being prewarmed.
+  // Skip during metadata-only prewarm (layout measurement) to avoid loading
+  // kern/lig data for all styles upfront (~22KB per style). Kern/lig is
+  // loaded per-style in prewarmStyle() during the full render prewarm instead.
+  if (!metadataOnly) {
+    for (uint8_t si = 0; si < MAX_STYLES; si++) {
+      if (!(styleMask & (1 << si)) || !styles_[si].present) continue;
+      auto& s = styles_[si];
+
+      loadStyleKernLigatureData(s);
+      if (s.ligaturePairs && s.header.ligaturePairCount > 0) {
+        for (uint8_t li = 0; li < s.header.ligaturePairCount && cpCount < MAX_PAGE_GLYPHS; li++) {
+          uint32_t leftCp = s.ligaturePairs[li].pair >> 16;
+          uint32_t rightCp = s.ligaturePairs[li].pair & 0xFFFF;
+          uint32_t outCp = s.ligaturePairs[li].ligatureCp;
+
+          bool hasLeft = false, hasRight = false;
+          for (uint32_t i = 0; i < cpCount; i++) {
+            if (codepoints[i] == leftCp) hasLeft = true;
+            if (codepoints[i] == rightCp) hasRight = true;
+            if (hasLeft && hasRight) break;
+          }
+          if (!hasLeft || !hasRight) continue;
+
+          bool hasOut = false;
+          for (uint32_t i = 0; i < cpCount; i++) {
+            if (codepoints[i] == outCp) {
+              hasOut = true;
+              break;
+            }
+          }
+          if (!hasOut) {
+            codepoints[cpCount++] = outCp;
+          }
+        }
+      }
+    }
+  }
+
+  // Sort codepoints for ordered interval building
+  std::sort(codepoints.get(), codepoints.get() + cpCount);
+
+  // Prewarm each requested style
+  int totalMissed = 0;
+  for (uint8_t si = 0; si < MAX_STYLES; si++) {
+    if (!(styleMask & (1 << si)) || !styles_[si].present) continue;
+    totalMissed += prewarmStyle(si, codepoints.get(), cpCount, metadataOnly);
+  }
+
+  stats_.prewarmTotalMs = millis() - startMs;
+  return totalMissed;
+}
+
+int SdCardFont::prewarmStyle(uint8_t styleIdx, const uint32_t* codepoints, uint32_t cpCount, bool metadataOnly) {
+  auto& s = styles_[styleIdx];
+
+  // Map codepoints to global glyph indices for this style
+  struct CpGlyphMapping {
+    uint32_t codepoint;
+    int32_t globalIndex;
+  };
+  CpGlyphMapping* mappings = new (std::nothrow) CpGlyphMapping[cpCount];
+  if (!mappings) {
+    LOG_ERR("SDCF", "Failed to allocate mapping array for style %u", styleIdx);
+    return static_cast<int>(cpCount);
+  }
+
+  uint32_t validCount = 0;
+  for (uint32_t i = 0; i < cpCount; i++) {
+    int32_t idx = findGlobalGlyphIndex(s, codepoints[i]);
+    if (idx >= 0) {
+      mappings[validCount].codepoint = codepoints[i];
+      mappings[validCount].globalIndex = idx;
+      validCount++;
+    }
+  }
+  int missed = static_cast<int>(cpCount - validCount);
+
+  if (validCount == 0) {
+    freeStyleMiniData(s);
+    delete[] mappings;
+    s.epdFont.data = &s.stubData;
+    return missed;
+  }
+
+  // Build mini intervals from sorted codepoints
+  freeStyleMiniData(s);
+
+  uint32_t intervalCapacity = validCount;
+  s.miniIntervals = new (std::nothrow) EpdUnicodeInterval[intervalCapacity];
+  if (!s.miniIntervals) {
+    LOG_ERR("SDCF", "Failed to allocate mini intervals for style %u", styleIdx);
+    delete[] mappings;
+    return static_cast<int>(cpCount);
+  }
+
+  s.miniIntervalCount = 0;
+  uint32_t rangeStart = 0;
+  for (uint32_t i = 1; i <= validCount; i++) {
+    if (i == validCount || mappings[i].codepoint != mappings[i - 1].codepoint + 1) {
+      s.miniIntervals[s.miniIntervalCount].first = mappings[rangeStart].codepoint;
+      s.miniIntervals[s.miniIntervalCount].last = mappings[i - 1].codepoint;
+      s.miniIntervals[s.miniIntervalCount].offset = rangeStart;
+      s.miniIntervalCount++;
+      rangeStart = i;
+    }
+  }
+
+  // Allocate mini glyph array
+  s.miniGlyphCount = validCount;
+  s.miniGlyphs = new (std::nothrow) EpdGlyph[s.miniGlyphCount];
+  if (!s.miniGlyphs) {
+    LOG_ERR("SDCF", "Failed to allocate mini glyphs for style %u", styleIdx);
+    delete[] mappings;
+    freeStyleMiniData(s);
+    return static_cast<int>(cpCount);
+  }
+
+  // Build sorted read order for sequential I/O
+  uint32_t* readOrder = new (std::nothrow) uint32_t[validCount];
+  if (!readOrder) {
+    LOG_ERR("SDCF", "Failed to allocate read order for style %u", styleIdx);
+    delete[] mappings;
+    freeStyleMiniData(s);
+    return static_cast<int>(cpCount);
+  }
+  for (uint32_t i = 0; i < validCount; i++) readOrder[i] = i;
+  std::sort(readOrder, readOrder + validCount,
+            [&](uint32_t a, uint32_t b) { return mappings[a].globalIndex < mappings[b].globalIndex; });
+
+  FsFile file;
+  if (!Storage.openFileForRead("SDCF", filePath_, file)) {
+    LOG_ERR("SDCF", "Failed to reopen .cpfont for prewarm (style %u)", styleIdx);
+    delete[] readOrder;
+    delete[] mappings;
+    freeStyleMiniData(s);
+    return static_cast<int>(cpCount);
+  }
+
+  unsigned long sdStart = millis();
+  uint32_t seekCount = 0;
+
+  // Read glyph metadata. lastReadIndex tracks sequential reads to skip redundant
+  // seeks; INT32_MIN guarantees the first iteration always seeks to the correct
+  // offset (otherwise when gIdx == 0, the "gIdx != lastReadIndex + 1" check would
+  // be false and we'd read from the file's current position — the header — which
+  // decodes to a garbage EpdGlyph with a massive advanceX, inflating any word
+  // containing that codepoint beyond page width).
+  int32_t lastReadIndex = INT32_MIN;
+  for (uint32_t i = 0; i < validCount; i++) {
+    uint32_t mapIdx = readOrder[i];
+    int32_t gIdx = mappings[mapIdx].globalIndex;
+
+    uint32_t fileOff = s.glyphsFileOffset + static_cast<uint32_t>(gIdx) * sizeof(EpdGlyph);
+    if (gIdx != lastReadIndex + 1) {
+      if (!file.seekSet(fileOff)) {
+        LOG_ERR("SDCF", "Prewarm: failed to seek to glyph %d (style %u)", gIdx, styleIdx);
+        file.close();
+        delete[] readOrder;
+        delete[] mappings;
+        freeStyleMiniData(s);
+        return static_cast<int>(cpCount);
+      }
+      seekCount++;
+    }
+    if (file.read(reinterpret_cast<uint8_t*>(&s.miniGlyphs[mapIdx]), sizeof(EpdGlyph)) != sizeof(EpdGlyph)) {
+      LOG_ERR("SDCF", "Prewarm: short glyph read (style %u, glyph %d)", styleIdx, gIdx);
+      delete[] readOrder;
+      delete[] mappings;
+      freeStyleMiniData(s);
+      return static_cast<int>(cpCount);
+    }
+    lastReadIndex = gIdx;
+  }
+
+  uint32_t totalBitmapSize = 0;
+
+  if (!metadataOnly) {
+    // Compute total bitmap size
+    for (uint32_t i = 0; i < validCount; i++) {
+      totalBitmapSize += s.miniGlyphs[i].dataLength;
+    }
+
+    s.miniBitmap = new (std::nothrow) uint8_t[totalBitmapSize > 0 ? totalBitmapSize : 1];
+    if (!s.miniBitmap) {
+      LOG_ERR("SDCF", "Failed to allocate mini bitmap (%u bytes) for style %u", totalBitmapSize, styleIdx);
+      delete[] readOrder;
+      delete[] mappings;
+      freeStyleMiniData(s);
+      return static_cast<int>(cpCount);
+    }
+
+    // Read bitmap data sorted by file offset
+    std::sort(readOrder, readOrder + validCount,
+              [&](uint32_t a, uint32_t b) { return s.miniGlyphs[a].dataOffset < s.miniGlyphs[b].dataOffset; });
+
+    uint32_t miniBitmapOffset = 0;
+    uint32_t lastBitmapEnd = UINT32_MAX;
+    for (uint32_t i = 0; i < validCount; i++) {
+      uint32_t mapIdx = readOrder[i];
+      EpdGlyph& glyph = s.miniGlyphs[mapIdx];
+
+      if (glyph.dataLength == 0) {
+        glyph.dataOffset = miniBitmapOffset;
+        continue;
+      }
+
+      uint32_t fileOff = s.bitmapFileOffset + glyph.dataOffset;
+      if (fileOff != lastBitmapEnd) {
+        if (!file.seekSet(fileOff)) {
+          LOG_ERR("SDCF", "Prewarm: failed to seek to bitmap (style %u)", styleIdx);
+          file.close();
+          delete[] readOrder;
+          delete[] mappings;
+          freeStyleMiniData(s);
+          return static_cast<int>(cpCount);
+        }
+        seekCount++;
+      }
+      if (file.read(s.miniBitmap + miniBitmapOffset, glyph.dataLength) != static_cast<int>(glyph.dataLength)) {
+        LOG_ERR("SDCF", "Prewarm: short bitmap read (style %u)", styleIdx);
+        delete[] readOrder;
+        delete[] mappings;
+        freeStyleMiniData(s);
+        return static_cast<int>(cpCount);
+      }
+      lastBitmapEnd = fileOff + glyph.dataLength;
+
+      glyph.dataOffset = miniBitmapOffset;
+      miniBitmapOffset += glyph.dataLength;
+    }
+  }
+
+  uint32_t sdTime = millis() - sdStart;
+  delete[] readOrder;
+  delete[] mappings;
+
+  // Full render prewarm: load the persistent kern classes + ligatures (one-time
+  // per style, small — the big matrix is NOT loaded here) and then build the
+  // per-page mini kern matrix restricted to class pairs reachable from this
+  // page's codepoints. Skip during metadata-only prewarm — layout only needs
+  // advanceX and the mini kern would be thrown away before rendering.
+  bool kernLigOk = false;
+  if (!metadataOnly) {
+    if (loadStyleKernLigatureData(s)) {
+      kernLigOk = buildMiniKernMatrix(s, codepoints, cpCount);
+    }
+  }
+
+  // Populate miniData and swap
+  memset(&s.miniData, 0, sizeof(s.miniData));
+  s.miniData.bitmap = s.miniBitmap;
+  s.miniData.glyph = s.miniGlyphs;
+  s.miniData.intervals = s.miniIntervals;
+  s.miniData.intervalCount = s.miniIntervalCount;
+  s.miniData.advanceY = s.header.advanceY;
+  s.miniData.ascender = s.header.ascender;
+  s.miniData.descender = s.header.descender;
+  s.miniData.is2Bit = s.header.is2Bit;
+  if (kernLigOk) {
+    applyKernLigaturePointers(s, s.miniData);
+  }
+  s.miniData.glyphMissHandler = &SdCardFont::onGlyphMiss;
+  s.miniData.glyphMissCtx = &overflowCtx_[styleIdx];
+
+  s.epdFont.data = &s.miniData;
+
+  // Accumulate stats
+  stats_.sdReadTimeMs += sdTime;
+  stats_.seekCount += seekCount;
+  stats_.uniqueGlyphs += validCount;
+  stats_.bitmapBytes += totalBitmapSize;
+
+  return missed;
+}
+
+// --- Cache management ---
+
+void SdCardFont::clearCache() {
+  clearOverflow();
+  // Note: advance table is intentionally preserved here. It persists across
+  // layout passes so repeated section indexing amortizes SD reads. Use
+  // clearPersistentCache() to wipe it.
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    if (!styles_[i].present) continue;
+    freeStyleMiniData(styles_[i]);
+    applyGlyphMissCallback(i);
+  }
+}
+
+void SdCardFont::releaseForLowMemory() {
+  clearOverflow();
+  clearPersistentCache();
+
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    if (!styles_[i].present) continue;
+    freeStyleMiniData(styles_[i]);
+    freeStyleKernLigatureData(styles_[i]);
+    applyGlyphMissCallback(i);
+  }
+}
+
+// --- Advance table ---
+
+void SdCardFont::clearPersistentCache() {
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    delete[] advanceTable_[i];
+    advanceTable_[i] = nullptr;
+    advanceTableSize_[i] = 0;
+  }
+}
+
+bool SdCardFont::advanceTableLookup(uint8_t styleIdx, uint32_t codepoint, uint16_t* outAdvance) const {
+  const AdvanceEntry* table = advanceTable_[styleIdx];
+  const uint32_t size = advanceTableSize_[styleIdx];
+  if (!table || size == 0) return false;
+  uint32_t lo = 0, hi = size;
+  while (lo < hi) {
+    uint32_t mid = lo + (hi - lo) / 2;
+    if (table[mid].codepoint < codepoint) {
+      lo = mid + 1;
+    } else {
+      hi = mid;
+    }
+  }
+  if (lo < size && table[lo].codepoint == codepoint) {
+    if (outAdvance) *outAdvance = table[lo].advanceX;
+    return true;
+  }
+  return false;
+}
+
+void SdCardFont::mergeIntoAdvanceTable(uint8_t styleIdx, const AdvanceEntry* sortedNew, uint32_t newCount) {
+  if (newCount == 0) return;
+  const uint32_t oldSize = advanceTableSize_[styleIdx];
+  if (oldSize >= ADVANCE_CACHE_LIMIT) return;  // already full
+
+  // Cap the merged size at ADVANCE_CACHE_LIMIT. Anything past the cap is
+  // dropped from the tail of the sorted merge — a deterministic, bounded loss
+  // that doesn't bias which codepoints get cached on subsequent passes.
+  uint32_t mergedCap = oldSize + newCount;
+  if (mergedCap > ADVANCE_CACHE_LIMIT) mergedCap = ADVANCE_CACHE_LIMIT;
+
+  AdvanceEntry* merged = new (std::nothrow) AdvanceEntry[mergedCap];
+  if (!merged) {
+    LOG_ERR("SDCF", "mergeIntoAdvanceTable: alloc failed (%u entries) style %u", mergedCap, styleIdx);
+    return;
+  }
+
+  const AdvanceEntry* a = advanceTable_[styleIdx];
+  const AdvanceEntry* b = sortedNew;
+  uint32_t i = 0, j = 0, k = 0;
+  while (k < mergedCap && (i < oldSize || j < newCount)) {
+    if (i < oldSize && (j >= newCount || a[i].codepoint <= b[j].codepoint)) {
+      merged[k++] = a[i++];
+    } else {
+      merged[k++] = b[j++];
+    }
+  }
+
+  delete[] advanceTable_[styleIdx];
+  advanceTable_[styleIdx] = merged;
+  advanceTableSize_[styleIdx] = k;
+}
+
+bool SdCardFont::hasAdvanceTable() const {
+  for (uint8_t i = 0; i < MAX_STYLES; i++) {
+    if (advanceTable_[i]) return true;
+  }
+  return false;
+}
+
+uint16_t SdCardFont::getAdvance(uint32_t codepoint, uint8_t style) const {
+  style &= (MAX_STYLES - 1);
+  if (!advanceTable_[style]) return 0;
+  const AdvanceEntry* table = advanceTable_[style];
+  const uint32_t size = advanceTableSize_[style];
+  // Binary search sorted by codepoint
+  uint32_t lo = 0, hi = size;
+  while (lo < hi) {
+    uint32_t mid = lo + (hi - lo) / 2;
+    if (table[mid].codepoint < codepoint) {
+      lo = mid + 1;
+    } else {
+      hi = mid;
+    }
+  }
+  if (lo < size && table[lo].codepoint == codepoint) {
+    return table[lo].advanceX;
+  }
+  return 0;
+}
+
+// Given a sorted array of unique codepoints, resolve glyph indices per style,
+// batch-read advanceX from SD, and merge into the persistent advance table.
+// Caller owns the codepoints buffer.
+int SdCardFont::fetchAdvancesForCodepoints(uint32_t* codepoints, uint32_t cpCount, uint8_t styleMask) {
+  int totalMissed = 0;
+  for (uint8_t si = 0; si < MAX_STYLES; si++) {
+    if (!(styleMask & (1 << si)) || !styles_[si].present) continue;
+    const auto& s = styles_[si];
+
+    // Stop fetching once the cache is full — further inserts would be dropped
+    // by the merge anyway. The renderer fast path tolerates missing entries
+    // (returns 0); the slow path is still correct for those codepoints.
+    if (advanceTableSize_[si] >= ADVANCE_CACHE_LIMIT) continue;
+
+    // For each codepoint in `codepoints`, skip those already cached, then
+    // resolve to a glyph index. Build a parallel array sorted by glyph index
+    // for sequential SD reads.
+    struct CpIdx {
+      uint32_t codepoint;
+      int32_t glyphIndex;
+    };
+    std::unique_ptr<CpIdx[]> mappings(new (std::nothrow) CpIdx[cpCount]);
+    if (!mappings) {
+      LOG_ERR("SDCF", "buildAdvanceTable: failed to allocate mappings for style %u", si);
+      totalMissed += cpCount;
+      continue;
+    }
+
+    uint32_t needCount = 0;
+    uint32_t missedThisStyle = 0;
+    const int32_t replacementIdx = findGlobalGlyphIndex(s, REPLACEMENT_GLYPH);
+    for (uint32_t i = 0; i < cpCount; i++) {
+      const uint32_t cp = codepoints[i];
+      if (advanceTableLookup(si, cp, nullptr)) continue;  // already cached
+      int32_t idx = findGlobalGlyphIndex(s, cp);
+      if (idx < 0) {
+        if (replacementIdx < 0) {
+          missedThisStyle++;
+          continue;
+        }
+        idx = replacementIdx;
+      }
+      mappings[needCount].codepoint = cp;
+      mappings[needCount].glyphIndex = idx;
+      needCount++;
+    }
+    totalMissed += static_cast<int>(missedThisStyle);
+
+    if (needCount == 0) continue;
+
+    // Sort by glyph index so SD reads are mostly sequential.
+    std::sort(mappings.get(), mappings.get() + needCount,
+              [](const CpIdx& a, const CpIdx& b) { return a.glyphIndex < b.glyphIndex; });
+
+    // Open file once and read advanceX for each needed glyph.
+    FsFile file;
+    if (!Storage.openFileForRead("SDCF", filePath_, file)) {
+      LOG_ERR("SDCF", "buildAdvanceTable: failed to open .cpfont for style %u", si);
+      continue;
+    }
+
+    std::unique_ptr<AdvanceEntry[]> staged(new (std::nothrow) AdvanceEntry[needCount]);
+    if (!staged) {
+      LOG_ERR("SDCF", "buildAdvanceTable: failed to allocate staging for style %u", si);
+      file.close();
+      continue;
+    }
+
+    uint32_t fetched = 0;
+    EpdGlyph tempGlyph;
+    int32_t lastReadIndex = INT32_MIN;
+    for (uint32_t i = 0; i < needCount; i++) {
+      int32_t gIdx = mappings[i].glyphIndex;
+      uint32_t fileOff = s.glyphsFileOffset + static_cast<uint32_t>(gIdx) * sizeof(EpdGlyph);
+      if (gIdx != lastReadIndex + 1) {
+        if (!file.seekSet(fileOff)) {
+          LOG_ERR("SDCF", "buildAdvanceTable: failed to seek to glyph %d (style %u)", gIdx, si);
+          break;
+        }
+      }
+      if (file.read(reinterpret_cast<uint8_t*>(&tempGlyph), sizeof(EpdGlyph)) != sizeof(EpdGlyph)) {
+        LOG_ERR("SDCF", "buildAdvanceTable: short glyph read (style %u, glyph %d)", si, gIdx);
+        break;
+      }
+      lastReadIndex = gIdx;
+      staged[fetched].codepoint = mappings[i].codepoint;
+      staged[fetched].advanceX = tempGlyph.advanceX;
+      fetched++;
+    }
+    file.close();
+
+    if (fetched > 0) {
+      // Sort staged by codepoint, then merge into the persistent table.
+      std::sort(staged.get(), staged.get() + fetched,
+                [](const AdvanceEntry& a, const AdvanceEntry& b) { return a.codepoint < b.codepoint; });
+      mergeIntoAdvanceTable(si, staged.get(), fetched);
+    }
+
+    LOG_DBG("SDCF", "Advance table style %u: +%u from SD, total=%u/%u", si, fetched, advanceTableSize_[si],
+            ADVANCE_CACHE_LIMIT);
+  }
+
+  return totalMissed;
+}
+
+template <typename Iter>
+int SdCardFont::buildAdvanceTableRange(Iter begin, Iter end, bool includeSpace, bool includeHyphen, uint8_t styleMask) {
+  if (!loaded_) return -1;
+  styleMask = resolveStyleMask(styleMask);
+  if (styleMask == 0) return 0;
+
+  unsigned long startMs = millis();
+
+  // +2 reserved slots for space and hyphen injected after the main scan.
+  static constexpr uint32_t MAX_UNIQUE_CODEPOINTS = 4096;
+  uint32_t* codepoints = new (std::nothrow) uint32_t[MAX_UNIQUE_CODEPOINTS + 2];
+  if (!codepoints) {
+    LOG_ERR("SDCF", "buildAdvanceTable: failed to allocate codepoint buffer (%u bytes)", MAX_UNIQUE_CODEPOINTS * 4);
+    return -1;
+  }
+  uint32_t cpCount = 0;
+  bool hitCap = false;
+
+  for (auto it = begin; it != end && !hitCap; ++it) {
+    hitCap = collectUniqueCodepoints(asCStr(*it), codepoints, cpCount, MAX_UNIQUE_CODEPOINTS);
+  }
+
+  if (includeSpace && std::none_of(codepoints, codepoints + cpCount, [](uint32_t c) { return c == ' '; }))
+    codepoints[cpCount++] = ' ';
+  if (includeHyphen && std::none_of(codepoints, codepoints + cpCount, [](uint32_t c) { return c == '-'; }))
+    codepoints[cpCount++] = '-';
+
+  if (hitCap) {
+    LOG_ERR("SDCF", "buildAdvanceTable: unique codepoint cap (%u) hit, layout may be approximate",
+            MAX_UNIQUE_CODEPOINTS);
+  }
+  std::sort(codepoints, codepoints + cpCount);
+  int totalMissed = fetchAdvancesForCodepoints(codepoints, cpCount, styleMask);
+  delete[] codepoints;
+  stats_.prewarmTotalMs = millis() - startMs;
+  return totalMissed;
+}
+
+int SdCardFont::buildAdvanceTable(const char* utf8Text, uint8_t styleMask) {
+  return buildAdvanceTableRange(&utf8Text, &utf8Text + 1, false, false, styleMask);
+}
+
+int SdCardFont::buildAdvanceTable(const std::vector<std::string>& words, bool includeHyphen, uint8_t styleMask) {
+  return buildAdvanceTableRange(words.begin(), words.end(), words.size() > 1, includeHyphen, styleMask);
+}
+
+// --- Stats ---
+
+void SdCardFont::logStats(const char* label) {
+  LOG_DBG("SDCF", "[%s] total=%ums sd_read=%ums seeks=%u glyphs=%u bitmap=%u bytes", label, stats_.prewarmTotalMs,
+          stats_.sdReadTimeMs, stats_.seekCount, stats_.uniqueGlyphs, stats_.bitmapBytes);
+}
+
+void SdCardFont::resetStats() { stats_ = Stats{}; }
+
+// --- Public accessors ---
+
+EpdFont* SdCardFont::getEpdFont(uint8_t style) {
+  style &= (MAX_STYLES - 1);
+  if (!styles_[style].present) return nullptr;
+  return &styles_[style].epdFont;
+}
+
+bool SdCardFont::hasStyle(uint8_t style) const { return styles_[style & (MAX_STYLES - 1)].present; }
+
+uint8_t SdCardFont::resolveStyle(uint8_t style) const {
+  static const uint8_t kFallbacks[MAX_STYLES][MAX_STYLES] = {
+      // REGULAR: REGULAR -> BOLD -> ITALIC -> BOLD_ITALIC
+      {EpdFontFamily::REGULAR, EpdFontFamily::BOLD, EpdFontFamily::ITALIC, EpdFontFamily::BOLD_ITALIC},
+      // BOLD: BOLD -> REGULAR -> BOLD_ITALIC -> ITALIC
+      {EpdFontFamily::BOLD, EpdFontFamily::REGULAR, EpdFontFamily::BOLD_ITALIC, EpdFontFamily::ITALIC},
+      // ITALIC: ITALIC -> REGULAR -> BOLD_ITALIC -> BOLD
+      {EpdFontFamily::ITALIC, EpdFontFamily::REGULAR, EpdFontFamily::BOLD_ITALIC, EpdFontFamily::BOLD},
+      // BOLD_ITALIC: BOLD_ITALIC -> BOLD -> ITALIC -> REGULAR
+      {EpdFontFamily::BOLD_ITALIC, EpdFontFamily::BOLD, EpdFontFamily::ITALIC, EpdFontFamily::REGULAR},
+  };
+
+  const uint8_t styleBits = style & (MAX_STYLES - 1);
+  for (uint8_t candidate : kFallbacks[styleBits]) {
+    if (styles_[candidate].present) return candidate;
+  }
+  return EpdFontFamily::REGULAR;
+}
+
+uint8_t SdCardFont::resolveStyleMask(uint8_t styleMask) const {
+  uint8_t resolvedMask = 0;
+  for (uint8_t si = 0; si < MAX_STYLES; si++) {
+    if (styleMask & (1 << si)) {
+      resolvedMask |= static_cast<uint8_t>(1u << resolveStyle(si));
+    }
+  }
+  return resolvedMask;
+}
+
+// --- On-demand glyph loading (overflow buffer) ---
+
+const EpdGlyph* SdCardFont::onGlyphMiss(void* ctx, uint32_t codepoint) {
+  auto* oc = static_cast<OverflowContext*>(ctx);
+  auto* self = oc->self;
+  uint8_t styleIdx = oc->styleIdx;
+
+  if (!self->loaded_ || styleIdx >= MAX_STYLES || !self->styles_[styleIdx].present) return nullptr;
+  const auto& s = self->styles_[styleIdx];
+  if (!s.fullIntervals) return nullptr;
+
+  // Check overflow cache first (matching both codepoint and style)
+  for (uint32_t i = 0; i < self->overflowCount_; i++) {
+    if (self->overflow_[i].codepoint == codepoint && self->overflow_[i].styleIdx == styleIdx) {
+      return &self->overflow_[i].glyph;
+    }
+  }
+
+  // Look up global glyph index via full intervals
+  int32_t globalIdx = self->findGlobalGlyphIndex(s, codepoint);
+  if (globalIdx < 0) return nullptr;
+
+  // Pick overflow slot (ring buffer). Read into temporaries first so the
+  // existing slot stays valid if SD I/O fails. Bookkeeping (count/next)
+  // is deferred until after all I/O succeeds to avoid inconsistent state.
+  uint32_t slot = self->overflowNext_;
+  bool wasAtCapacity = (self->overflowCount_ == OVERFLOW_CAPACITY);
+
+  // Read glyph metadata into temporary
+  FsFile file;
+  if (!Storage.openFileForRead("SDCF", self->filePath_, file)) {
+    LOG_ERR("SDCF", "Overflow: failed to open .cpfont");
+    return nullptr;
+  }
+
+  EpdGlyph tempGlyph = {};
+  uint32_t glyphFileOff = s.glyphsFileOffset + static_cast<uint32_t>(globalIdx) * sizeof(EpdGlyph);
+  if (!file.seekSet(glyphFileOff)) {
+    LOG_ERR("SDCF", "Overflow: failed to seek to glyph for U+%04X style %u", codepoint, styleIdx);
+    file.close();
+    return nullptr;
+  }
+  if (file.read(reinterpret_cast<uint8_t*>(&tempGlyph), sizeof(EpdGlyph)) != sizeof(EpdGlyph)) {
+    LOG_ERR("SDCF", "Overflow: failed to read glyph metadata for U+%04X style %u", codepoint, styleIdx);
+    return nullptr;
+  }
+
+  // Read bitmap data into temporary (if any)
+  uint8_t* tempBitmap = nullptr;
+  if (tempGlyph.dataLength > 0) {
+    tempBitmap = new (std::nothrow) uint8_t[tempGlyph.dataLength];
+    if (!tempBitmap) {
+      LOG_ERR("SDCF", "Overflow: failed to allocate %u bytes for U+%04X bitmap", tempGlyph.dataLength, codepoint);
+      return nullptr;
+    }
+    if (!file.seekSet(s.bitmapFileOffset + tempGlyph.dataOffset)) {
+      LOG_ERR("SDCF", "Overflow: failed to seek to bitmap for U+%04X", codepoint);
+      delete[] tempBitmap;
+      file.close();
+      return nullptr;
+    }
+    if (file.read(tempBitmap, tempGlyph.dataLength) != static_cast<int>(tempGlyph.dataLength)) {
+      LOG_ERR("SDCF", "Overflow: failed to read bitmap for U+%04X", codepoint);
+      delete[] tempBitmap;
+      return nullptr;
+    }
+  }
+
+  // All reads succeeded — commit to slot and advance ring buffer
+  if (wasAtCapacity) {
+    delete[] self->overflow_[slot].bitmap;
+  } else {
+    self->overflowCount_++;
+  }
+  self->overflowNext_ = (slot + 1) % OVERFLOW_CAPACITY;
+  self->overflow_[slot].glyph = tempGlyph;
+  self->overflow_[slot].bitmap = tempBitmap;
+  self->overflow_[slot].codepoint = codepoint;
+  self->overflow_[slot].styleIdx = styleIdx;
+
+  LOG_DBG("SDCF", "Overflow: loaded U+%04X style %u on demand (slot %u/%u)", codepoint, styleIdx, slot,
+          OVERFLOW_CAPACITY);
+
+  return &self->overflow_[slot].glyph;
+}
+
+bool SdCardFont::isOverflowGlyph(const EpdGlyph* glyph) const {
+  for (uint32_t i = 0; i < overflowCount_; i++) {
+    if (&overflow_[i].glyph == glyph) return true;
+  }
+  return false;
+}
+
+const uint8_t* SdCardFont::getOverflowBitmap(const EpdGlyph* glyph) const {
+  for (uint32_t i = 0; i < overflowCount_; i++) {
+    if (&overflow_[i].glyph == glyph) {
+      return overflow_[i].bitmap;
+    }
+  }
+  return nullptr;
+}
+
+SdCardFont* SdCardFont::fromMissCtx(void* ctx) { return static_cast<OverflowContext*>(ctx)->self; }
diff --git a/lib/EpdFont/SdCardFont.h b/lib/EpdFont/SdCardFont.h
new file mode 100644
index 00000000..378bbfa8
--- /dev/null
+++ b/lib/EpdFont/SdCardFont.h
@@ -0,0 +1,261 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "EpdFont.h"
+#include "EpdFontData.h"
+
+// On-disk binary format version for .cpfont files. Defined as a preprocessor
+// macro (rather than a constexpr) so it can be stringified into the SD-fonts
+// release URL — see FONT_MANIFEST_URL in FontDownloadActivity.h. No integer
+// suffix because stringification would include it (e.g. `4U` → `"4U"`).
+//
+// The canonical version for the build tooling lives in
+// lib/EpdFont/scripts/cpfont_version.py. This firmware-side copy must be
+// bumped manually when the firmware is updated to support a new format.
+// Reader enforcement: SdCardFont::load().
+#define CPFONT_VERSION 4
+
+class SdCardFont {
+ public:
+  static constexpr uint16_t MAX_PAGE_GLYPHS = 512;
+  static constexpr uint8_t MAX_STYLES = 4;
+
+  SdCardFont() = default;
+  ~SdCardFont();
+  // Owns raw buffers freed in dtor — no shallow-copy semantics. Make any
+  // accidental pass-by-value or move a compile-time error.
+  SdCardFont(const SdCardFont&) = delete;
+  SdCardFont& operator=(const SdCardFont&) = delete;
+  SdCardFont(SdCardFont&&) = delete;
+  SdCardFont& operator=(SdCardFont&&) = delete;
+
+  // Load .cpfont file: reads header + intervals into RAM, records file layout offsets.
+  // Supports v4 (multi-style) format.
+  // Returns true on success.
+  bool load(const char* path);
+
+  // Pre-read glyphs needed for the given UTF-8 text from SD card.
+  // styleMask: bitmask of styles to prewarm (bit 0=regular, 1=bold, 2=italic, 3=bolditalic).
+  // Default 0x0F = all present styles.
+  // When metadataOnly=true, only glyph metrics are loaded (no bitmap data).
+  // Returns number of glyphs that couldn't be loaded (0 on full success).
+  int prewarm(const char* utf8Text, uint8_t styleMask = 0x0F, bool metadataOnly = false);
+
+  // Build a compact advance-only table for layout measurement.
+  // Extracts ALL unique codepoints from words (no MAX_PAGE_GLYPHS cap),
+  // batch-reads advanceX from SD, stores in a sorted per-style table.
+  // Returns number of codepoints not found in font coverage.
+  int buildAdvanceTable(const char* utf8Text, uint8_t styleMask = 0x0F);
+  int buildAdvanceTable(const std::vector<std::string>& words, bool includeHyphen, uint8_t styleMask = 0x0F);
+
+  // Look up advanceX for a codepoint from the advance table.
+  // Returns the 12.4 fixed-point advance, or 0 if not found.
+  uint16_t getAdvance(uint32_t codepoint, uint8_t style) const;
+
+  // Returns true if advance table is populated for at least one style.
+  bool hasAdvanceTable() const;
+
+  // Free mini data for all styles, restore stub EpdFontData.
+  // Also clears the temporary advance table (built per layout pass) but
+  // preserves the persistent advance cache (reused across passes).
+  void clearCache();
+
+  // Release optional resident caches before memory-heavy work such as EPUB
+  // image extraction. Keeps the font loaded and usable, but future layout or
+  // rendering may need to re-read font metadata from SD.
+  void releaseForLowMemory();
+
+  // Drop the persistent advance cache. Call when unloading the SD font or
+  // when font/size/family/glyph-table state changes.
+  void clearPersistentCache();
+
+  // Returns pointer to the managed EpdFont for a given style.
+  // Returns nullptr if the style is not present.
+  EpdFont* getEpdFont(uint8_t style = 0);
+
+  // Returns true if the given style is present in this font file.
+  bool hasStyle(uint8_t style) const;
+
+  // Resolve requested style bits to the closest present style.
+  uint8_t resolveStyle(uint8_t style) const;
+
+  // Resolve every requested style bit through fallback and return the actual
+  // styles that need cache/advance preparation.
+  uint8_t resolveStyleMask(uint8_t styleMask) const;
+
+  // Number of styles present in this font file.
+  uint8_t styleCount() const { return styleCount_; }
+
+  // Returns true if the glyph pointer points into the overflow buffer.
+  bool isOverflowGlyph(const EpdGlyph* glyph) const;
+
+  // Returns the bitmap for an on-demand-loaded (overflow) glyph.
+  const uint8_t* getOverflowBitmap(const EpdGlyph* glyph) const;
+
+  // Extract SdCardFont* from an opaque glyphMissCtx pointer.
+  // Used by GfxRenderer::getGlyphBitmap() to recover the SdCardFont from EpdFontData::glyphMissCtx.
+  static SdCardFont* fromMissCtx(void* ctx);
+
+  struct Stats {
+    uint32_t prewarmTotalMs = 0;
+    uint32_t sdReadTimeMs = 0;
+    uint32_t seekCount = 0;
+    uint32_t uniqueGlyphs = 0;
+    uint32_t bitmapBytes = 0;
+  };
+  void logStats(const char* label = "SDCF");
+  void resetStats();
+  const Stats& getStats() const { return stats_; }
+
+  // Content hash of the file header + style TOC entries (computed during load).
+  // Used to generate deterministic font IDs for section cache invalidation.
+  uint32_t contentHash() const { return contentHash_; }
+
+ private:
+  // Per-style metadata (parsed from file header/TOC)
+  struct CpFontHeader {
+    uint32_t intervalCount = 0;
+    uint32_t glyphCount = 0;
+    uint8_t advanceY = 0;
+    int16_t ascender = 0;
+    int16_t descender = 0;
+    bool is2Bit = false;
+    uint16_t kernLeftEntryCount = 0;
+    uint16_t kernRightEntryCount = 0;
+    uint8_t kernLeftClassCount = 0;
+    uint8_t kernRightClassCount = 0;
+    uint8_t ligaturePairCount = 0;
+  };
+
+  // All per-style data: file offsets, intervals, kern/lig, prewarm cache, EpdFont
+  struct PerStyle {
+    CpFontHeader header{};
+
+    // File layout offsets for this style's data sections
+    uint32_t intervalsFileOffset = 0;
+    uint32_t glyphsFileOffset = 0;
+    uint32_t kernLeftFileOffset = 0;
+    uint32_t kernRightFileOffset = 0;
+    uint32_t kernMatrixFileOffset = 0;
+    uint32_t ligatureFileOffset = 0;
+    uint32_t bitmapFileOffset = 0;
+
+    // Full intervals loaded from file (kept in RAM for codepoint lookup)
+    EpdUnicodeInterval* fullIntervals = nullptr;
+
+    // Persistent kern-class + ligature tables (lazy-loaded on first prewarm).
+    // The full kern MATRIX is NOT resident — on Literata-class fonts a single
+    // style's matrix is ~36-42KB contiguous, and 4 styles' worth won't fit
+    // alongside bitmaps + framebuffer on a 380KB device. Only kernLeftClasses
+    // and kernRightClasses (small codepoint→classId tables, ~3KB each) stay
+    // resident; the matrix is reconstructed per-page as miniKernMatrix.
+    EpdKernClassEntry* kernLeftClasses = nullptr;
+    EpdKernClassEntry* kernRightClasses = nullptr;
+    EpdLigaturePair* ligaturePairs = nullptr;
+    bool kernLigLoaded = false;
+
+    // Stub EpdFontData returned when not prewarmed
+    EpdFontData stubData{};
+
+    // Mini EpdFontData built during prewarm
+    EpdFontData miniData{};
+    EpdUnicodeInterval* miniIntervals = nullptr;
+    EpdGlyph* miniGlyphs = nullptr;
+    uint8_t* miniBitmap = nullptr;
+    uint32_t miniIntervalCount = 0;
+    uint32_t miniGlyphCount = 0;
+
+    // Per-page mini kern matrix (built by buildMiniKernMatrix on each full
+    // prewarm). miniKernLeftClasses/miniKernRightClasses map ONLY the codepoints
+    // used on the current page to renumbered class IDs (1..miniKern*ClassCount).
+    // miniKernMatrix is a small miniKernLeftClassCount × miniKernRightClassCount
+    // flat matrix. Typical Latin page: ~25×25 matrix = ~625 bytes per style vs
+    // ~36KB for the full Literata matrix — ~50× reduction.
+    EpdKernClassEntry* miniKernLeftClasses = nullptr;
+    EpdKernClassEntry* miniKernRightClasses = nullptr;
+    uint16_t miniKernLeftEntryCount = 0;
+    uint16_t miniKernRightEntryCount = 0;
+    uint8_t miniKernLeftClassCount = 0;
+    uint8_t miniKernRightClassCount = 0;
+    int8_t* miniKernMatrix = nullptr;
+
+    // The EpdFont whose data pointer we manage
+    EpdFont epdFont{&stubData};
+
+    bool present = false;
+  };
+
+  PerStyle styles_[MAX_STYLES] = {};
+  uint8_t styleCount_ = 0;
+
+  char filePath_[128] = {};
+
+  // Overflow context: glyphMissHandler needs to know which style it's serving
+  struct OverflowContext {
+    SdCardFont* self;
+    uint8_t styleIdx;
+  };
+  OverflowContext overflowCtx_[MAX_STYLES] = {};
+
+  // Shared on-demand overflow buffer (ring buffer of glyphs loaded via glyphMissHandler)
+  static constexpr uint32_t OVERFLOW_CAPACITY = 8;
+  struct OverflowEntry {
+    EpdGlyph glyph;
+    uint8_t* bitmap = nullptr;
+    uint32_t codepoint = 0;
+    uint8_t styleIdx = 0;
+  };
+  OverflowEntry overflow_[OVERFLOW_CAPACITY] = {};
+  uint32_t overflowCount_ = 0;
+  uint32_t overflowNext_ = 0;
+
+  // Compact advance-only table for layout measurement (per-style).
+  // Built by buildAdvanceTable(), queried by getAdvance().
+  struct AdvanceEntry {
+    uint32_t codepoint;
+    uint16_t advanceX;  // 12.4 fixed-point
+  };
+  // Per-style advance table. Sorted by codepoint for binary lookup.
+  // Bounded to ADVANCE_CACHE_LIMIT entries; persists across layout passes
+  // (across calls to clearCache()) so repeated indexing of the same font
+  // amortizes SD reads. Cleared only on font unload or clearPersistentCache().
+  // Keep this conservative: the cache is resident per style, so large caps
+  // quickly eat heap on the ESP32-C3.
+  static constexpr uint32_t ADVANCE_CACHE_LIMIT = 256;
+  AdvanceEntry* advanceTable_[MAX_STYLES] = {};
+  uint32_t advanceTableSize_[MAX_STYLES] = {};
+  bool advanceTableLookup(uint8_t styleIdx, uint32_t codepoint, uint16_t* outAdvance) const;
+  // Merge sortedNew (sorted by codepoint, no overlap with existing) into the
+  // advance table for styleIdx, preserving sort order; cap-truncates the tail.
+  void mergeIntoAdvanceTable(uint8_t styleIdx, const AdvanceEntry* sortedNew, uint32_t newCount);
+
+  Stats stats_;
+  uint32_t contentHash_ = 0;
+  bool loaded_ = false;
+
+  // Per-style helpers
+  void freeStyleMiniData(PerStyle& s);
+  void freeStyleAll(PerStyle& s);
+  void freeStyleKernLigatureData(PerStyle& s);
+  void freeStyleMiniKern(PerStyle& s);
+  bool loadStyleKernLigatureData(PerStyle& s);
+  bool buildMiniKernMatrix(PerStyle& s, const uint32_t* codepoints, uint32_t cpCount);
+  void applyKernLigaturePointers(PerStyle& s, EpdFontData& data) const;
+  void applyGlyphMissCallback(uint8_t styleIdx);
+  int32_t findGlobalGlyphIndex(const PerStyle& s, uint32_t codepoint) const;
+  int fetchAdvancesForCodepoints(uint32_t* codepoints, uint32_t cpCount, uint8_t styleMask);
+  template <typename Iter>
+  int buildAdvanceTableRange(Iter begin, Iter end, bool includeSpace, bool includeHyphen, uint8_t styleMask);
+  int prewarmStyle(uint8_t styleIdx, const uint32_t* codepoints, uint32_t cpCount, bool metadataOnly);
+
+  // Global helpers
+  void freeAll();
+  void clearOverflow();
+  static void computeStyleFileOffsets(PerStyle& s, uint32_t baseOffset);
+
+  // Static callback for EpdFontData::glyphMissHandler (per-style via OverflowContext)
+  static const EpdGlyph* onGlyphMiss(void* ctx, uint32_t codepoint);
+};
diff --git a/lib/EpdFont/SdCardFontManager.cpp b/lib/EpdFont/SdCardFontManager.cpp
new file mode 100644
index 00000000..a6032336
--- /dev/null
+++ b/lib/EpdFont/SdCardFontManager.cpp
@@ -0,0 +1,98 @@
+#include "SdCardFontManager.h"
+
+#include <EpdFontFamily.h>
+#include <GfxRenderer.h>
+#include <Logging.h>
+#include <SdCardFont.h>
+#include <SdCardFontRegistry.h>
+
+SdCardFontManager::~SdCardFontManager() {
+  for (auto& lf : loaded_) {
+    delete lf.font;
+  }
+}
+
+// FNV-1a continuation: seeds with contentHash, then hashes family name + point size.
+// Produces a deterministic ID that is stable across load/unload cycles and reboots,
+// and changes when font content changes (different header/TOC = different contentHash).
+int SdCardFontManager::computeFontId(uint32_t contentHash, const char* familyName, uint8_t pointSize) {
+  static constexpr uint32_t FNV_PRIME = 16777619u;
+  uint32_t hash = contentHash;
+  while (*familyName) {
+    hash ^= static_cast<uint8_t>(*familyName++);
+    hash *= FNV_PRIME;
+  }
+  hash ^= pointSize;
+  hash *= FNV_PRIME;
+  int id = static_cast<int>(hash);
+  return id != 0 ? id : 1;  // 0 is reserved as "not found" sentinel
+}
+
+bool SdCardFontManager::loadFamily(const SdCardFontFamilyInfo& family, GfxRenderer& renderer, uint8_t fontSizeEnum) {
+  // Unload any previously loaded family first
+  if (!loadedFamilyName_.empty()) {
+    unloadAll(renderer);
+  }
+
+  // Select by ordinal position: sort available sizes, then map the font size
+  // enum (SMALL=0 .. EXTRA_LARGE=3) to the corresponding slot. When the
+  // family has fewer sizes than 4, clamp to the last available size.
+  auto sizes = family.availableSizes();
+  if (sizes.empty()) {
+    LOG_ERR("SDMGR", "Family %s has no files to load", family.name.c_str());
+    return false;
+  }
+
+  uint8_t idx = fontSizeEnum;
+  if (idx >= sizes.size()) idx = sizes.size() - 1;
+  const SdCardFontFileInfo* selected = family.findFile(sizes[idx]);
+
+  auto* font = new (std::nothrow) SdCardFont();
+  if (!font) {
+    LOG_ERR("SDMGR", "Failed to allocate SdCardFont for %s", selected->path.c_str());
+    return false;
+  }
+
+  if (!font->load(selected->path.c_str())) {
+    LOG_ERR("SDMGR", "Failed to load %s", selected->path.c_str());
+    delete font;
+    return false;
+  }
+
+  int fontId = computeFontId(font->contentHash(), family.name.c_str(), selected->pointSize);
+  // Guard against collision with built-in font IDs (astronomically unlikely
+  // with FNV-1a hashes, but provides a safety net)
+  if (renderer.getFontMap().count(fontId) != 0) {
+    LOG_ERR("SDMGR", "Font ID %d collides with existing font, skipping %s", fontId, selected->path.c_str());
+    delete font;
+    return false;
+  }
+  renderer.registerSdCardFont(fontId, font);
+  loaded_.push_back({font, fontId, selected->pointSize});
+
+  LOG_DBG("SDMGR", "Loaded %s size=%u id=%d styles=%u (sizeEnum=%u)", selected->path.c_str(), selected->pointSize,
+          fontId, font->styleCount(), fontSizeEnum);
+
+  EpdFontFamily fontFamily(font->getEpdFont(0), font->getEpdFont(1), font->getEpdFont(2), font->getEpdFont(3));
+  renderer.insertFont(fontId, fontFamily);
+
+  loadedFamilyName_ = family.name;
+  loadedPointSize_ = selected->pointSize;
+  return true;
+}
+
+void SdCardFontManager::unloadAll(GfxRenderer& renderer) {
+  renderer.clearSdCardFonts();
+  for (auto& lf : loaded_) {
+    renderer.removeFont(lf.fontId);
+    delete lf.font;
+  }
+  loaded_.clear();
+  loadedFamilyName_.clear();
+  loadedPointSize_ = 0;
+}
+
+int SdCardFontManager::getFontId(const std::string& familyName) const {
+  if (familyName != loadedFamilyName_ || loaded_.empty()) return 0;
+  return loaded_.front().fontId;
+}
diff --git a/lib/EpdFont/SdCardFontManager.h b/lib/EpdFont/SdCardFontManager.h
new file mode 100644
index 00000000..aec07472
--- /dev/null
+++ b/lib/EpdFont/SdCardFontManager.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+class GfxRenderer;
+class SdCardFont;
+struct SdCardFontFamilyInfo;
+
+class SdCardFontManager {
+ public:
+  SdCardFontManager() = default;
+  ~SdCardFontManager();
+  SdCardFontManager(const SdCardFontManager&) = delete;
+  SdCardFontManager& operator=(const SdCardFontManager&) = delete;
+
+  // Load the font file matching fontSizeEnum (SMALL=0 .. EXTRA_LARGE=3) by
+  // ordinal position in the family's sorted size list. Only one .cpfont file
+  // is loaded; other sizes remain on disk. This keeps resident interval +
+  // kern/ligature tables to one size's worth of memory.
+  // Returns true on success.
+  bool loadFamily(const SdCardFontFamilyInfo& family, GfxRenderer& renderer, uint8_t fontSizeEnum);
+
+  // Unload everything, unregister from renderer.
+  void unloadAll(GfxRenderer& renderer);
+
+  // Look up the font ID for the loaded family. Returns 0 if nothing loaded
+  // or familyName doesn't match.
+  int getFontId(const std::string& familyName) const;
+
+  // Get name of currently loaded family (empty if none).
+  const std::string& currentFamilyName() const { return loadedFamilyName_; };
+
+  // Point size that was actually loaded (closest match to targetPtSize).
+  // 0 if nothing loaded.
+  uint8_t currentPointSize() const { return loadedPointSize_; };
+
+ private:
+  struct LoadedFont {
+    SdCardFont* font;  // heap-allocated, owned
+    int fontId;
+    uint8_t size;
+  };
+  static int computeFontId(uint32_t contentHash, const char* familyName, uint8_t pointSize);
+
+  std::string loadedFamilyName_;
+  uint8_t loadedPointSize_ = 0;
+  std::vector<LoadedFont> loaded_;
+};
diff --git a/lib/EpdFont/SdCardFontRegistry.cpp b/lib/EpdFont/SdCardFontRegistry.cpp
new file mode 100644
index 00000000..2e0f145c
--- /dev/null
+++ b/lib/EpdFont/SdCardFontRegistry.cpp
@@ -0,0 +1,230 @@
+#include "SdCardFontRegistry.h"
+
+#include <HalStorage.h>
+#include <Logging.h>
+
+#include <algorithm>
+#include <cstring>
+
+// --- SdCardFontFamilyInfo helpers ---
+
+const SdCardFontFileInfo* SdCardFontFamilyInfo::findFile(uint8_t size, uint8_t style) const {
+  for (const auto& f : files) {
+    if (f.pointSize == size && f.style == style) return &f;
+  }
+  return nullptr;
+}
+
+bool SdCardFontFamilyInfo::hasSize(uint8_t size) const {
+  for (const auto& f : files) {
+    if (f.pointSize == size) return true;
+  }
+  return false;
+}
+
+std::vector<uint8_t> SdCardFontFamilyInfo::availableSizes() const {
+  std::vector<uint8_t> sizes;
+  for (const auto& f : files) {
+    bool found = false;
+    for (uint8_t s : sizes) {
+      if (s == f.pointSize) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) sizes.push_back(f.pointSize);
+  }
+  std::sort(sizes.begin(), sizes.end());
+  return sizes;
+}
+
+// --- SdCardFontRegistry ---
+
+bool SdCardFontRegistry::parseFilename(const char* filename, uint8_t& size, uint8_t& style) {
+  // V4 naming: <name>_<size>.cpfont (e.g. Bookerly-SD_14.cpfont)
+  // Use an ends-with check rather than strstr() so that in-progress downloads
+  // like "Foo_14.cpfont.tmp" or backups like "Foo_14.cpfont~" aren't accepted.
+  static constexpr char kExt[] = ".cpfont";
+  static constexpr size_t kExtLen = sizeof(kExt) - 1;
+  const size_t nameLen = strlen(filename);
+  if (nameLen <= kExtLen) return false;
+  if (strcmp(filename + nameLen - kExtLen, kExt) != 0) return false;
+  const char* ext = filename + nameLen - kExtLen;
+
+  size_t baseLen = ext - filename;
+  if (baseLen == 0 || baseLen > 127) return false;
+
+  char base[128];
+  memcpy(base, filename, baseLen);
+  base[baseLen] = '\0';
+
+  char* lastUnderscore = strrchr(base, '_');
+  if (!lastUnderscore || lastUnderscore == base) return false;
+
+  const char* sizeStr = lastUnderscore + 1;
+  char* endPtr;
+  long sizeVal = strtol(sizeStr, &endPtr, 10);
+  if (endPtr == sizeStr || *endPtr != '\0' || sizeVal < 1 || sizeVal > 255) return false;
+  size = static_cast<uint8_t>(sizeVal);
+  // V4 .cpfont files bundle every style (regular/bold/italic/bold-italic) into
+  // one file, so style is always 0 at the registry level. The per-style
+  // bitstream is selected later by SdCardFont::getEpdFont(style). The `style`
+  // field in SdCardFontFileInfo is reserved for future formats that split
+  // styles across files; scanDirectory() defends against accidental
+  // (pointSize, style) collisions in that scenario.
+  style = 0;
+  return true;
+}
+
+void SdCardFontRegistry::scanDirectory(const char* dirPath, SdCardFontFamilyInfo& family) {
+  FsFile dir = Storage.open(dirPath);
+  if (!dir || !dir.isDirectory()) return;
+
+  char nameBuffer[128];
+  while (true) {
+    FsFile entry = dir.openNextFile();
+    if (!entry) break;
+    if (entry.isDirectory()) {
+      entry.close();
+      continue;
+    }
+
+    entry.getName(nameBuffer, sizeof(nameBuffer));
+    entry.close();
+
+    // Skip macOS resource fork files (._*) and other hidden files
+    if (nameBuffer[0] == '.' || nameBuffer[0] == '_') continue;
+
+    uint8_t size, style;
+    if (!parseFilename(nameBuffer, size, style)) continue;
+
+    // Reject duplicate (pointSize, style) entries in the same family. With
+    // v4's bundle-everything design parseFilename always returns style=0, so
+    // two files at the same size in the same family would silently shadow
+    // each other in findFile(). Skip the duplicate and warn.
+    bool duplicate = false;
+    for (const auto& existing : family.files) {
+      if (existing.pointSize == size && existing.style == style) {
+        duplicate = true;
+        break;
+      }
+    }
+    if (duplicate) {
+      LOG_ERR("SDREG", "Duplicate font %s in %s — skipping", nameBuffer, dirPath);
+      continue;
+    }
+
+    SdCardFontFileInfo info;
+    info.path = std::string(dirPath) + "/" + nameBuffer;
+    info.pointSize = size;
+    info.style = style;
+    family.files.push_back(std::move(info));
+  }
+}
+
+// Scan a single root (e.g. "/.fonts") and append its families to `out`.
+// Skips families whose names already exist in `out` (de-duplicates between
+// the hidden and visible roots — first scan wins).
+void SdCardFontRegistry::scanRoot(const char* rootPath, std::vector<SdCardFontFamilyInfo>& out) {
+  FsFile root = Storage.open(rootPath);
+  if (!root) {
+    LOG_DBG("SDREG", "Fonts directory not found: %s", rootPath);
+    return;
+  }
+  if (!root.isDirectory()) {
+    LOG_ERR("SDREG", "Fonts path is not a directory: %s", rootPath);
+    return;
+  }
+
+  char nameBuffer[128];
+  while (true) {
+    FsFile entry = root.openNextFile();
+    if (!entry) break;
+    if (entry.isDirectory()) {
+      entry.getName(nameBuffer, sizeof(nameBuffer));
+      entry.close();
+
+      // Skip hidden/system directories inside the root (macOS ._*, .Trashes, etc.)
+      if (nameBuffer[0] == '.' || nameBuffer[0] == '_') continue;
+
+      // De-dup by family name across roots.
+      bool exists = false;
+      for (const auto& fam : out) {
+        if (fam.name == nameBuffer) {
+          exists = true;
+          break;
+        }
+      }
+      if (exists) continue;
+
+      SdCardFontFamilyInfo family;
+      family.name = nameBuffer;
+      std::string subDirPath = std::string(rootPath) + "/" + nameBuffer;
+      SdCardFontRegistry::scanDirectory(subDirPath.c_str(), family);
+
+      if (!family.files.empty()) {
+        out.push_back(std::move(family));
+        LOG_DBG("SDREG", "Found family: %s (%d files) in %s", out.back().name.c_str(),
+                static_cast<int>(out.back().files.size()), rootPath);
+      }
+    } else {
+      entry.close();
+    }
+  }
+}
+
+bool SdCardFontRegistry::discover() {
+  families_.clear();
+  families_.reserve(MAX_SD_FAMILIES);
+
+  // Hidden root is scanned first so it wins on name collisions, matching the
+  // sleep-folder pattern (/.sleep preferred over /sleep).
+  scanRoot(FONTS_DIR_HIDDEN, families_);
+  scanRoot(FONTS_DIR_VISIBLE, families_);
+
+  // Sort families alphabetically
+  std::sort(families_.begin(), families_.end(),
+            [](const SdCardFontFamilyInfo& a, const SdCardFontFamilyInfo& b) { return a.name < b.name; });
+
+  // Cap at MAX_SD_FAMILIES
+  if (static_cast<int>(families_.size()) > MAX_SD_FAMILIES) {
+    families_.resize(MAX_SD_FAMILIES);
+  }
+
+  LOG_DBG("SDREG", "Discovery complete: %d families", static_cast<int>(families_.size()));
+  return !families_.empty();
+}
+
+const char* SdCardFontRegistry::findFamilyRoot(const char* familyName) {
+  if (!familyName || !*familyName) return nullptr;
+  char path[160];
+  snprintf(path, sizeof(path), "%s/%s", FONTS_DIR_HIDDEN, familyName);
+  if (Storage.exists(path)) return FONTS_DIR_HIDDEN;
+  snprintf(path, sizeof(path), "%s/%s", FONTS_DIR_VISIBLE, familyName);
+  if (Storage.exists(path)) return FONTS_DIR_VISIBLE;
+  return nullptr;
+}
+
+const char* SdCardFontRegistry::defaultWriteRoot() {
+  // If exactly one of the roots already exists, keep using it. Otherwise
+  // (neither exists, or both exist) prefer the hidden root for new installs.
+  bool hiddenExists = Storage.exists(FONTS_DIR_HIDDEN);
+  bool visibleExists = Storage.exists(FONTS_DIR_VISIBLE);
+  if (hiddenExists) return FONTS_DIR_HIDDEN;
+  if (visibleExists) return FONTS_DIR_VISIBLE;
+  return FONTS_DIR_HIDDEN;
+}
+
+const SdCardFontFamilyInfo* SdCardFontRegistry::findFamily(const std::string& name) const {
+  for (const auto& f : families_) {
+    if (f.name == name) return &f;
+  }
+  return nullptr;
+}
+
+int SdCardFontRegistry::getFamilyIndex(const std::string& name) const {
+  for (int i = 0; i < static_cast<int>(families_.size()); i++) {
+    if (families_[i].name == name) return i;
+  }
+  return -1;
+}
diff --git a/lib/EpdFont/SdCardFontRegistry.h b/lib/EpdFont/SdCardFontRegistry.h
new file mode 100644
index 00000000..f96035ed
--- /dev/null
+++ b/lib/EpdFont/SdCardFontRegistry.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+struct SdCardFontFileInfo {
+  std::string path;   // v4 on-disk naming: "/<root>/<Family>/<Family>_<size>.cpfont"
+                      // where <root> is "/.fonts" (preferred, hidden) or "/fonts" (visible).
+                      // e.g. "/.fonts/NotoSansCJK/NotoSansCJK_14.cpfont"
+  uint8_t pointSize;  // parsed from filename: 14
+  uint8_t style;      // always 0 in v4 (all 4 styles bundled in one file);
+                      // kept for potential future formats
+};
+
+struct SdCardFontFamilyInfo {
+  std::string name;  // directory name, e.g. "NotoSansCJK"
+  std::vector<SdCardFontFileInfo> files;
+
+  const SdCardFontFileInfo* findFile(uint8_t size, uint8_t style = 0) const;
+  bool hasSize(uint8_t size) const;
+  std::vector<uint8_t> availableSizes() const;
+};
+
+class SdCardFontRegistry {
+ public:
+  static constexpr int MAX_SD_FAMILIES = 128;
+  // Two top-level roots are scanned at discovery time. Hidden is preferred
+  // when creating new installs; both are read from if present.
+  static constexpr const char* FONTS_DIR_HIDDEN = "/.fonts";
+  static constexpr const char* FONTS_DIR_VISIBLE = "/fonts";
+
+  // Returns the existing root for `familyName` (the one that contains
+  // /<root>/<familyName>/), or nullptr if the family is not installed in
+  // either root. Used by writers to keep re-installs in their existing dir.
+  static const char* findFamilyRoot(const char* familyName);
+
+  // Returns the root path that should be used when creating a brand-new
+  // family on disk (no prior install): the existing root if exactly one of
+  // the two roots exists, otherwise the hidden root.
+  static const char* defaultWriteRoot();
+
+  // Scan SD card, populate families_. Returns true if any families found.
+  bool discover();
+
+  const std::vector<SdCardFontFamilyInfo>& getFamilies() const { return families_; }
+  const SdCardFontFamilyInfo* findFamily(const std::string& name) const;
+  int getFamilyIndex(const std::string& name) const;
+  int getFamilyCount() const { return static_cast<int>(families_.size()); }
+
+ private:
+  std::vector<SdCardFontFamilyInfo> families_;  // sorted alphabetically
+
+  static bool parseFilename(const char* filename, uint8_t& size, uint8_t& style);
+  static void scanDirectory(const char* dirPath, SdCardFontFamilyInfo& family);
+  // Scan one root (e.g. "/.fonts"), append families to `out`, dedup by name.
+  static void scanRoot(const char* rootPath, std::vector<SdCardFontFamilyInfo>& out);
+};
diff --git a/lib/EpdFont/builtinFonts/all.h b/lib/EpdFont/builtinFonts/all.h
index b4b67790..2c421165 100644
--- a/lib/EpdFont/builtinFonts/all.h
+++ b/lib/EpdFont/builtinFonts/all.h
@@ -11,6 +11,7 @@
 //   OMIT_TEENSY_FONT - excludes 8px (Teensy) reading fonts; used by env:xlarge
 //   OMIT_TINY_FONT   - excludes 10px (Tiny) reading fonts; used by env:xlarge
 //   OMIT_SMALL_FONT  - excludes 12px (Small) reading fonts
+//   OMIT_MEDIUM_FONT - excludes 14px (Medium) reading fonts
 //   OMIT_XLARGE_FONT - excludes 18px (Extra Large) reading fonts; used by env:tiny
 //   OMIT_HUGE_FONT   - excludes 20px (Huge) reading fonts; used by all firmware envs except env:xlarge
 #ifdef OMIT_EMOJI_FONTS
@@ -39,10 +40,12 @@
 #include BUILTIN_READING_FONT_HEADER(bitter_12_italic)
 #include BUILTIN_READING_FONT_HEADER(bitter_12_regular)
 #endif
+#ifndef OMIT_MEDIUM_FONT
 #include BUILTIN_READING_FONT_HEADER(bitter_14_bold)
 #include BUILTIN_READING_FONT_HEADER(bitter_14_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(bitter_14_italic)
 #include BUILTIN_READING_FONT_HEADER(bitter_14_regular)
+#endif
 #include BUILTIN_READING_FONT_HEADER(bitter_16_bold)
 #include BUILTIN_READING_FONT_HEADER(bitter_16_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(bitter_16_italic)
@@ -78,10 +81,12 @@
 #include BUILTIN_READING_FONT_HEADER(charein_12_italic)
 #include BUILTIN_READING_FONT_HEADER(charein_12_regular)
 #endif
+#ifndef OMIT_MEDIUM_FONT
 #include BUILTIN_READING_FONT_HEADER(charein_14_bold)
 #include BUILTIN_READING_FONT_HEADER(charein_14_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(charein_14_italic)
 #include BUILTIN_READING_FONT_HEADER(charein_14_regular)
+#endif
 #include BUILTIN_READING_FONT_HEADER(charein_16_bold)
 #include BUILTIN_READING_FONT_HEADER(charein_16_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(charein_16_italic)
@@ -117,10 +122,12 @@
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_12_italic)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_12_regular)
 #endif
+#ifndef OMIT_MEDIUM_FONT
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_14_bold)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_14_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_14_italic)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_14_regular)
+#endif
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_16_bold)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_16_bolditalic)
 #include BUILTIN_READING_FONT_HEADER(lexenddeca_16_italic)
diff --git a/lib/EpdFont/builtinFonts/source/.gitignore b/lib/EpdFont/builtinFonts/source/.gitignore
new file mode 100644
index 00000000..1c3f6a00
--- /dev/null
+++ b/lib/EpdFont/builtinFonts/source/.gitignore
@@ -0,0 +1,12 @@
+# Ignore all font directories except those committed to the repo.
+# Fonts like NotoSansCJK are downloaded on demand by build-sd-fonts.py.
+*
+!.gitignore
+!NotoSerif/
+!NotoSerif/**
+!NotoSans/
+!NotoSans/**
+!OpenDyslexic/
+!OpenDyslexic/**
+!Ubuntu/
+!Ubuntu/**
diff --git a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Bold.ttf b/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Bold.ttf
deleted file mode 100644
index 80da7d0a..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Bold.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-BoldItalic.ttf b/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-BoldItalic.ttf
deleted file mode 100644
index d39bfaa6..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-BoldItalic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Italic.ttf b/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Italic.ttf
deleted file mode 100644
index 35f4fb75..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Italic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Regular.ttf b/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Regular.ttf
deleted file mode 100644
index f0edd190..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Atkinson_Hyperlegible/AtkinsonHyperlegible-Regular.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Bold.ttf b/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Bold.ttf
deleted file mode 100644
index 0b487c83..00000000
Binary files a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Bold.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-BoldItalic.ttf b/lib/EpdFont/builtinFonts/source/DMSans/DMSans-BoldItalic.ttf
deleted file mode 100644
index fb662710..00000000
Binary files a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-BoldItalic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Italic.ttf b/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Italic.ttf
deleted file mode 100644
index a1634134..00000000
Binary files a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Italic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Regular.ttf b/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Regular.ttf
deleted file mode 100644
index e6af3717..00000000
Binary files a/lib/EpdFont/builtinFonts/source/DMSans/DMSans-Regular.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Bold.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Bold.otf
deleted file mode 100644
index 4c12e87c..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Bold.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-BoldItalic.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-BoldItalic.otf
deleted file mode 100644
index 12a2dc33..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-BoldItalic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Italic.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Italic.otf
deleted file mode 100644
index f6d8080b..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Italic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Medium.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Medium.otf
deleted file mode 100644
index 5b1febaa..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Medium.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-MediumItalic.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-MediumItalic.otf
deleted file mode 100644
index 96468b60..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-MediumItalic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Regular.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Regular.otf
deleted file mode 100644
index 6c9ea4a6..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Regular.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Semibold.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Semibold.otf
deleted file mode 100644
index f8adff11..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-Semibold.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-SemiboldItalic.otf b/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-SemiboldItalic.otf
deleted file mode 100644
index 301b0225..00000000
Binary files a/lib/EpdFont/builtinFonts/source/LiterataBook/LiterataBook-SemiboldItalic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/LiterataBook/SIL Open Font License.txt b/lib/EpdFont/builtinFonts/source/LiterataBook/SIL Open Font License.txt
deleted file mode 100644
index cb8783ee..00000000
--- a/lib/EpdFont/builtinFonts/source/LiterataBook/SIL Open Font License.txt	
+++ /dev/null
@@ -1,43 +0,0 @@
-Copyright 2017 The Literata Project Authors (https://github.com/googlefonts/literata)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
-
-5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Bold.ttf b/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Bold.ttf
deleted file mode 100644
index 519d3135..00000000
Binary files a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Bold.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-BoldItalic.ttf b/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-BoldItalic.ttf
deleted file mode 100644
index 23ea70aa..00000000
Binary files a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-BoldItalic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Italic.ttf b/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Italic.ttf
deleted file mode 100644
index c3ccb5fe..00000000
Binary files a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Italic.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Regular.ttf b/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Regular.ttf
deleted file mode 100644
index 1b13cd72..00000000
Binary files a/lib/EpdFont/builtinFonts/source/NotoSerif/NotoSerif-Regular.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/NotoSerif/OFL.txt b/lib/EpdFont/builtinFonts/source/NotoSerif/OFL.txt
deleted file mode 100644
index 09f020bb..00000000
--- a/lib/EpdFont/builtinFonts/source/NotoSerif/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OFL.txt b/lib/EpdFont/builtinFonts/source/OpenDyslexic/OFL.txt
deleted file mode 100644
index 0a1d034b..00000000
--- a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OFL.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Copyright (c) 2019-07-29, Abbie Gonzalez (https://abbiecod.es|support@abbiecod.es),
-with Reserved Font Name OpenDyslexic.
-Copyright (c) 12/2012 - 2019
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf b/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf
deleted file mode 100644
index fc14a5ac..00000000
Binary files a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Bold.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf b/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf
deleted file mode 100644
index 99b4b1d1..00000000
Binary files a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-BoldItalic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf b/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf
deleted file mode 100644
index 8f53b290..00000000
Binary files a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Italic.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf b/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf
deleted file mode 100644
index 039cedaf..00000000
Binary files a/lib/EpdFont/builtinFonts/source/OpenDyslexic/OpenDyslexic-Regular.otf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/Ubuntu/UFL.txt b/lib/EpdFont/builtinFonts/source/Ubuntu/UFL.txt
deleted file mode 100644
index 6e722c88..00000000
--- a/lib/EpdFont/builtinFonts/source/Ubuntu/UFL.txt
+++ /dev/null
@@ -1,96 +0,0 @@
--------------------------------
-UBUNTU FONT LICENCE Version 1.0
--------------------------------
-
-PREAMBLE
-This licence allows the licensed fonts to be used, studied, modified and
-redistributed freely. The fonts, including any derivative works, can be
-bundled, embedded, and redistributed provided the terms of this licence
-are met. The fonts and derivatives, however, cannot be released under
-any other licence. The requirement for fonts to remain under this
-licence does not require any document created using the fonts or their
-derivatives to be published under this licence, as long as the primary
-purpose of the document is not to be a vehicle for the distribution of
-the fonts.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this licence and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Original Version" refers to the collection of Font Software components
-as received under this licence.
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to
-a new environment.
-
-"Copyright Holder(s)" refers to all individuals and companies who have a
-copyright ownership of the Font Software.
-
-"Substantially Changed" refers to Modified Versions which can be easily
-identified as dissimilar to the Font Software by users of the Font
-Software comparing the Original Version with the Modified Version.
-
-To "Propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification and with or without charging
-a redistribution fee), making available to the public, and in some
-countries other activities as well.
-
-PERMISSION & CONDITIONS
-This licence does not grant any rights under trademark law and all such
-rights are reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of the Font Software, to propagate the Font Software, subject to
-the below conditions:
-
-1) Each copy of the Font Software must contain the above copyright
-notice and this licence. These can be included either as stand-alone
-text files, human-readable headers or in the appropriate machine-
-readable metadata fields within text or binary files as long as those
-fields can be easily viewed by the user.
-
-2) The font name complies with the following:
-(a) The Original Version must retain its name, unmodified.
-(b) Modified Versions which are Substantially Changed must be renamed to
-avoid use of the name of the Original Version or similar names entirely.
-(c) Modified Versions which are not Substantially Changed must be
-renamed to both (i) retain the name of the Original Version and (ii) add
-additional naming elements to distinguish the Modified Version from the
-Original Version. The name of such Modified Versions must be the name of
-the Original Version, with "derivative X" where X represents the name of
-the new work, appended to that name.
-
-3) The name(s) of the Copyright Holder(s) and any contributor to the
-Font Software shall not be used to promote, endorse or advertise any
-Modified Version, except (i) as required by this licence, (ii) to
-acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
-their explicit written permission.
-
-4) The Font Software, modified or unmodified, in part or in whole, must
-be distributed entirely under this licence, and must not be distributed
-under any other licence. The requirement for fonts to remain under this
-licence does not affect any document created using the Font Software,
-except any version of the Font Software extracted from a document
-created using the Font Software may only be distributed under this
-licence.
-
-TERMINATION
-This licence becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
-DEALINGS IN THE FONT SOFTWARE.
diff --git a/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Bold.ttf b/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Bold.ttf
deleted file mode 100644
index c2293d5c..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Bold.ttf and /dev/null differ
diff --git a/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Regular.ttf b/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Regular.ttf
deleted file mode 100644
index b5505e67..00000000
Binary files a/lib/EpdFont/builtinFonts/source/Ubuntu/Ubuntu-Regular.ttf and /dev/null differ
diff --git a/lib/EpdFont/scripts/build-font-ids.sh b/lib/EpdFont/scripts/build-font-ids.sh
index 78995cca..291ae1b9 100755
--- a/lib/EpdFont/scripts/build-font-ids.sh
+++ b/lib/EpdFont/scripts/build-font-ids.sh
@@ -97,6 +97,22 @@ reading_font_id BITTER_20_FONT_ID \
   ./bitter_20_regular.h ./bitter_20_bold.h ./bitter_20_bolditalic.h ./bitter_20_italic.h
 
 # UI fonts — no emoji variant
-echo "#define UI_10_FONT_ID ($(hash_files ./ubuntu_10_regular.h ./ubuntu_10_bold.h))"
-echo "#define UI_12_FONT_ID ($(hash_files ./ubuntu_12_regular.h ./ubuntu_12_bold.h))"
+echo "#define UI_10_FONT_ID ($(hash_files ./inter_10_regular.h ./inter_10_bold.h))"
+echo "#define UI_12_FONT_ID ($(hash_files ./inter_12_regular.h ./inter_12_bold.h))"
 echo "#define SMALL_FONT_ID ($(hash_files ./inter_8_regular.h))"
+
+echo ""
+echo "// Font ID 0 is reserved as the \"not found\" sentinel."
+echo "// Guard against any hash accidentally producing 0."
+for id in \
+  NOTOEMOJI_10_FONT_ID NOTOEMOJI_12_FONT_ID NOTOEMOJI_14_FONT_ID NOTOEMOJI_16_FONT_ID \
+  NOTOSYMBOLS_10_FONT_ID NOTOSYMBOLS_12_FONT_ID NOTOSYMBOLS_14_FONT_ID NOTOSYMBOLS_16_FONT_ID \
+  LEXENDDECA_8_FONT_ID LEXENDDECA_10_FONT_ID LEXENDDECA_12_FONT_ID LEXENDDECA_14_FONT_ID \
+  LEXENDDECA_16_FONT_ID LEXENDDECA_18_FONT_ID LEXENDDECA_20_FONT_ID \
+  CHAREINK_8_FONT_ID CHAREINK_10_FONT_ID CHAREINK_12_FONT_ID CHAREINK_14_FONT_ID \
+  CHAREINK_16_FONT_ID CHAREINK_18_FONT_ID CHAREINK_20_FONT_ID \
+  BITTER_8_FONT_ID BITTER_10_FONT_ID BITTER_12_FONT_ID BITTER_14_FONT_ID \
+  BITTER_16_FONT_ID BITTER_18_FONT_ID BITTER_20_FONT_ID \
+  UI_10_FONT_ID UI_12_FONT_ID SMALL_FONT_ID; do
+  echo "static_assert(${id} != 0, \"Font ID collision with sentinel\");"
+done
diff --git a/lib/EpdFont/scripts/build-sd-fonts.py b/lib/EpdFont/scripts/build-sd-fonts.py
new file mode 100755
index 00000000..8f981fbe
--- /dev/null
+++ b/lib/EpdFont/scripts/build-sd-fonts.py
@@ -0,0 +1,406 @@
+#!/usr/bin/env python3
+"""Build SD card fonts from a declarative YAML config.
+
+Reads sd-fonts.yaml, downloads any missing source fonts, runs
+fontconvert_sdcard.py in parallel for each family, and optionally
+generates the fonts.json manifest.
+
+Usage:
+    # Generate fonts (output in ./output/)
+    python3 build-sd-fonts.py
+
+    # Generate fonts + manifest
+    python3 build-sd-fonts.py --manifest --base-url "http://localhost:8000/"
+
+    # Custom config / output paths
+    python3 build-sd-fonts.py --config my-fonts.yaml --output-dir dist/
+
+    # Generate only specific families
+    python3 build-sd-fonts.py --only Literata,IBMPlexMono
+
+    # Stream child process output for debugging
+    python3 build-sd-fonts.py --verbose
+
+    # Override the per-family timeout (default: 600s)
+    python3 build-sd-fonts.py --timeout 1200
+"""
+
+import argparse
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+import threading
+import time
+import urllib.request
+from concurrent.futures import ProcessPoolExecutor, as_completed
+from pathlib import Path
+
+import yaml
+
+SCRIPT_DIR = Path(__file__).parent
+FONTCONVERT = SCRIPT_DIR / "fontconvert_sdcard.py"
+EPDFONTS_DIR = SCRIPT_DIR.parent  # lib/EpdFont
+DEFAULT_CONFIG = SCRIPT_DIR / "sd-fonts.yaml"
+DEFAULT_OUTPUT = SCRIPT_DIR / "output"
+DOWNLOAD_DIR = SCRIPT_DIR / "downloaded_fonts"
+INSTANCE_DIR = SCRIPT_DIR / "instanced_fonts"
+
+
+def download_font(url: str, dest: Path) -> Path:
+    """Download a font file if not already cached. Returns the local path."""
+    if dest.exists():
+        return dest
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    print(f"  Downloading {dest.name}...")
+    try:
+        urllib.request.urlretrieve(url, dest)
+    except Exception as e:
+        dest.unlink(missing_ok=True)
+        raise RuntimeError(f"Failed to download {url}: {e}") from e
+    size_kb = dest.stat().st_size / 1024
+    print(f"  Downloaded {dest.name} ({size_kb:.0f} KB)")
+    return dest
+
+
+def extract_static_instance(source_path: Path, axes: dict, family_name: str, style_name: str) -> Path:
+    """Use fonttools instancer to pin variable font axes, producing a static TTF.
+
+    Caches the result in INSTANCE_DIR/<family>/<style>_<axes>_<mtime>.ttf.
+    Returns the path to the static font file.
+    """
+    from fontTools.varLib.instancer import instantiateVariableFont
+    from fontTools.ttLib import TTFont
+
+    mtime = int(source_path.stat().st_mtime)
+    axis_key = "_".join(f"{k}{v}" for k, v in sorted(axes.items()))
+    cache_name = f"{style_name}_{axis_key}_{mtime}.ttf"
+    cached = INSTANCE_DIR / family_name / cache_name
+
+    if cached.exists():
+        return cached
+
+    # Clean old cached instances for this style
+    cached.parent.mkdir(parents=True, exist_ok=True)
+    for old in cached.parent.glob(f"{style_name}_*.ttf"):
+        old.unlink()
+
+    print(f"  Extracting static instance: {family_name}/{style_name} ({axis_key})")
+    # Atomic write: save to a temp file first, then rename. A crash or save()
+    # exception would otherwise leave a corrupt `cached` file that future runs
+    # would happily reuse via the `cached.exists()` check above.
+    tmp_fd, tmp_name = tempfile.mkstemp(suffix=".ttf", dir=cached.parent)
+    os.close(tmp_fd)
+    tmp_path = Path(tmp_name)
+    # Keep separate handles for the source variable font and the static
+    # instance: instantiateVariableFont with default inplace=False returns a
+    # *new* TTFont, so rebinding `font` would otherwise strand the source's
+    # file handle open until GC runs.
+    #
+    # updateFontNames=True   — rewrite the name table so the saved font
+    #                          reports its weight/style accurately rather
+    #                          than retaining the variable-font names.
+    # optimize=False         — skip the gvar interpolation optimisation;
+    #                          fully pinning every axis drops gvar anyway,
+    #                          so the work would be wasted.
+    source_font = TTFont(str(source_path))
+    try:
+        font = instantiateVariableFont(source_font, axes, updateFontNames=True, optimize=False)
+        try:
+            font.save(str(tmp_path))
+        finally:
+            font.close()
+    except Exception:
+        tmp_path.unlink(missing_ok=True)
+        raise
+    finally:
+        source_font.close()
+    tmp_path.replace(cached)
+
+    return cached
+
+
+def resolve_font_path(style_spec: dict, family_name: str, style_name: str) -> Path:
+    """Resolve a style spec (path or url) to a local font file path.
+
+    If 'variable' key is present, extracts a static instance via fonttools
+    instancer after resolving the source file.
+    """
+    if "path" in style_spec:
+        resolved = EPDFONTS_DIR / style_spec["path"]
+        if not resolved.exists():
+            raise FileNotFoundError(f"{family_name}/{style_name}: {resolved} not found")
+    elif "url" in style_spec:
+        url = style_spec["url"]
+        # Derive a stable filename from the URL
+        filename = url.rsplit("/", 1)[-1]
+        dest = DOWNLOAD_DIR / family_name / filename
+        resolved = download_font(url, dest)
+    else:
+        raise ValueError(f"{family_name}/{style_name}: must have 'path' or 'url'")
+
+    # If variable font axes are specified, extract a static instance
+    if "variable" in style_spec:
+        resolved = extract_static_instance(
+            resolved, style_spec["variable"], family_name, style_name
+        )
+
+    return resolved
+
+
+def _stream_pipe(pipe, prefix: str, dest: list[str]):
+    """Read lines from a pipe, print with prefix, and accumulate into dest."""
+    for line in pipe:
+        dest.append(line)
+        print(f"  [{prefix}] {line}", end="", flush=True)
+
+
+def build_family(
+    family: dict, output_base: Path, verbose: bool = False, timeout: int = 600
+) -> tuple[str, bool, str]:
+    """Build a single font family. Returns (name, success, message)."""
+    name = family["name"]
+    output_dir = output_base / name
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    styles = family.get("styles", {})
+    intervals = family["intervals"]
+    sizes = ",".join(str(s) for s in family["sizes"])
+
+    # Resolve all font file paths (downloads as needed)
+    try:
+        resolved_styles = {}
+        for style_name, style_spec in styles.items():
+            resolved_styles[style_name] = resolve_font_path(style_spec, name, style_name)
+    except (FileNotFoundError, RuntimeError) as e:
+        return name, False, str(e)
+
+    # Build the fontconvert_sdcard.py command
+    cmd = [sys.executable, str(FONTCONVERT)]
+
+    multi_style = len(resolved_styles) > 1 or "regular" not in resolved_styles
+    has_any_multi = any(k in resolved_styles for k in ("regular", "bold", "italic", "bolditalic"))
+
+    if has_any_multi and len(resolved_styles) > 1:
+        # Multi-style mode
+        for style_name, font_path in resolved_styles.items():
+            cmd.extend([f"--{style_name}", str(font_path)])
+    else:
+        # Single-style mode
+        style_name = next(iter(resolved_styles))
+        font_path = resolved_styles[style_name]
+        cmd.append(str(font_path))
+        cmd.extend(["--style", style_name])
+
+    cmd.extend(["--intervals", intervals])
+    cmd.extend(["--sizes", sizes])
+    cmd.extend(["--name", name])
+    cmd.extend(["--output-dir", str(output_dir) + "/"])
+
+    if family.get("force_autohint", False):
+        cmd.append("--force-autohint")
+
+    # Run fontconvert_sdcard.py
+    start = time.monotonic()
+    try:
+        if verbose:
+            proc = subprocess.Popen(
+                cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+            )
+            stdout_lines: list[str] = []
+            stderr_lines: list[str] = []
+            t_out = threading.Thread(
+                target=_stream_pipe, args=(proc.stdout, name, stdout_lines)
+            )
+            t_err = threading.Thread(
+                target=_stream_pipe, args=(proc.stderr, f"{name}/err", stderr_lines)
+            )
+            t_out.start()
+            t_err.start()
+            try:
+                proc.wait(timeout=timeout)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+                proc.wait()
+                elapsed = time.monotonic() - start
+                return name, False, f"Timed out after {elapsed:.0f}s"
+            finally:
+                t_out.join()
+                t_err.join()
+
+            if proc.returncode != 0:
+                err = "".join(stderr_lines).strip()
+                return name, False, err or f"Exit code {proc.returncode}"
+            return name, True, ""
+        else:
+            result = subprocess.run(
+                cmd, capture_output=True, text=True, timeout=timeout,
+            )
+            if result.returncode != 0:
+                return name, False, result.stderr.strip() or f"Exit code {result.returncode}"
+            return name, True, ""
+    except subprocess.TimeoutExpired as e:
+        elapsed = time.monotonic() - start
+        tail = ""
+        captured = getattr(e, "stderr", None) or getattr(e, "stdout", None)
+        if captured:
+            lines = captured.strip().splitlines()
+            tail = "\n    Last output:\n" + "\n".join(f"    | {l}" for l in lines[-20:])
+        return name, False, f"Timed out after {elapsed:.0f}s{tail}"
+    except Exception as e:
+        return name, False, str(e)
+
+
+def generate_manifest(
+    config_path: Path, output_base: Path, base_url: str, manifest_path: Path
+):
+    """Generate fonts.json manifest from config + built output.
+
+    Uses the standalone generate-font-manifest.py as a subprocess so
+    descriptions come from the YAML config via --descriptions-from.
+    """
+    manifest_script = SCRIPT_DIR.parent.parent.parent / "scripts" / "generate-font-manifest.py"
+
+    if not base_url.endswith("/"):
+        base_url += "/"
+
+    cmd = [
+        sys.executable, str(manifest_script),
+        "--input", str(output_base),
+        "--base-url", base_url,
+        "--output", str(manifest_path),
+    ]
+
+    if config_path.exists():
+        cmd.extend(["--descriptions-from", str(config_path)])
+
+    manifest_path.parent.mkdir(parents=True, exist_ok=True)
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode != 0:
+        print(f"ERROR: Manifest generation failed:\n{result.stderr}", file=sys.stderr)
+        return
+    print(result.stdout, end="")
+    print(f"Manifest written: {manifest_path}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Build SD card fonts from YAML config")
+    parser.add_argument(
+        "--config", default=str(DEFAULT_CONFIG), help="Path to font families YAML config"
+    )
+    parser.add_argument(
+        "--output-dir", default=str(DEFAULT_OUTPUT), help="Output directory for .cpfont files"
+    )
+    parser.add_argument("--only", help="Comma-separated family names to build (default: all)")
+    parser.add_argument("--manifest", action="store_true", help="Also generate fonts.json manifest")
+    parser.add_argument("--base-url", default="", help="Base URL for manifest (required with --manifest)")
+    parser.add_argument(
+        "--manifest-output", default=None, help="Manifest output path (default: <output-dir>/fonts.json)"
+    )
+    parser.add_argument(
+        "--jobs", "-j", type=int, default=None,
+        help="Max parallel jobs (default: number of families)"
+    )
+    parser.add_argument("--clean", action="store_true", help="Clean output directory before building")
+    parser.add_argument(
+        "--verbose", "-v", action="store_true",
+        help="Stream child process output in real time (useful for debugging timeouts)"
+    )
+    parser.add_argument(
+        "--timeout", type=int, default=600,
+        help="Per-family timeout in seconds (default: 600)"
+    )
+    args = parser.parse_args()
+
+    if args.manifest and not args.base_url:
+        parser.error("--base-url is required when using --manifest")
+
+    # Load config
+    config_path = Path(args.config)
+    if not config_path.exists():
+        print(f"ERROR: Config not found: {config_path}", file=sys.stderr)
+        sys.exit(1)
+
+    with open(config_path) as f:
+        config = yaml.safe_load(f)
+
+    families = config.get("families", [])
+    if not families:
+        print("ERROR: No families defined in config", file=sys.stderr)
+        sys.exit(1)
+
+    # Filter if --only specified
+    if args.only:
+        only_names = set(args.only.split(","))
+        families = [f for f in families if f["name"] in only_names]
+        missing = only_names - {f["name"] for f in families}
+        if missing:
+            print(f"WARNING: families not found in config: {', '.join(missing)}", file=sys.stderr)
+        if not families:
+            print("ERROR: no matching families after --only filter", file=sys.stderr)
+            sys.exit(1)
+
+    output_base = Path(args.output_dir)
+
+    if args.clean and output_base.exists():
+        print(f"Cleaning {output_base}...")
+        shutil.rmtree(output_base)
+
+    output_base.mkdir(parents=True, exist_ok=True)
+
+    # Download phase (sequential — avoids hammering servers)
+    print(f"\n=== Resolving {len(families)} font families ===\n")
+    for family in families:
+        for style_name, style_spec in family.get("styles", {}).items():
+            if "url" in style_spec:
+                try:
+                    resolve_font_path(style_spec, family["name"], style_name)
+                except Exception as e:
+                    print(f"ERROR: {e}", file=sys.stderr)
+                    sys.exit(1)
+
+    # Build phase (parallel)
+    max_workers = args.jobs or len(families)
+    verbose = args.verbose
+    timeout = args.timeout
+    print(f"\n=== Building {len(families)} families ({max_workers} parallel jobs, timeout {timeout}s) ===\n")
+
+    failed = []
+    with ProcessPoolExecutor(max_workers=max_workers) as executor:
+        futures = {
+            executor.submit(build_family, family, output_base, verbose, timeout): family["name"]
+            for family in families
+        }
+        for future in as_completed(futures):
+            name, success, message = future.result()
+            if success:
+                # Count output files
+                family_dir = output_base / name
+                count = len(list(family_dir.glob("*.cpfont")))
+                size = sum(f.stat().st_size for f in family_dir.glob("*.cpfont"))
+                print(f"  OK: {name} ({count} files, {size / 1024 / 1024:.1f} MB)")
+            else:
+                print(f"  FAILED: {name}: {message}", file=sys.stderr)
+                failed.append(name)
+
+    # Summary
+    print("\n=== Summary ===\n")
+    total_files = len(list(output_base.rglob("*.cpfont")))
+    total_size = sum(f.stat().st_size for f in output_base.rglob("*.cpfont"))
+    print(f"Total: {total_files} .cpfont files ({total_size / 1024 / 1024:.1f} MB)")
+
+    if failed:
+        print(f"\nFailed families: {', '.join(failed)}", file=sys.stderr)
+
+    # Manifest
+    if args.manifest:
+        manifest_path = Path(args.manifest_output) if args.manifest_output else output_base / "fonts.json"
+        generate_manifest(config_path, output_base, args.base_url, manifest_path)
+
+    if failed:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/lib/EpdFont/scripts/cpfont_version.py b/lib/EpdFont/scripts/cpfont_version.py
new file mode 100644
index 00000000..b4027f56
--- /dev/null
+++ b/lib/EpdFont/scripts/cpfont_version.py
@@ -0,0 +1,15 @@
+# Canonical version constants for the .cpfont binary format and font manifest.
+#
+# These are the single source of truth for the build tooling. The CI workflow
+# (release-fonts.yml) and both Python scripts (fontconvert_sdcard.py,
+# generate-font-manifest.py) read from here.
+#
+# The firmware C++ headers (SdCardFont.h, FontDownloadActivity.h) carry their
+# own copies — those must be bumped manually when the firmware is updated to
+# support a new version.
+
+# .cpfont binary format version. Bump when the on-disk struct layout changes.
+CPFONT_VERSION = 4
+
+# JSON manifest schema version. Bump when the manifest shape changes.
+FONTS_MANIFEST_VERSION = 1
diff --git a/lib/EpdFont/scripts/fontconvert.py b/lib/EpdFont/scripts/fontconvert.py
index 766a0cae..37d4c524 100755
--- a/lib/EpdFont/scripts/fontconvert.py
+++ b/lib/EpdFont/scripts/fontconvert.py
@@ -1,12 +1,16 @@
 #!python3
-import freetype
 import zlib
 import sys
 import re
 import math
 import argparse
 from collections import namedtuple
-from fontTools.ttLib import TTFont
+
+# Force UTF-8 stdout so that `python fontconvert.py … > foo.h` on Windows
+# (default cp1252) doesn't emit UTF-16 LE / replacement chars in the generated
+# header. Wrapped in a hasattr guard so it's a no-op on older Pythons.
+if hasattr(sys.stdout, 'reconfigure'):
+    sys.stdout.reconfigure(encoding='utf-8')
 
 # Originally from https://github.com/vroland/epdiy
 
@@ -23,6 +27,9 @@
 parser.add_argument("--darken-aa", dest="darken_aa", action="store_true", help="Use darker 2-bit anti-aliasing thresholds for reader fonts.")
 args = parser.parse_args()
 
+import freetype
+from fontTools.ttLib import TTFont
+
 GlyphProps = namedtuple("GlyphProps", ["width", "height", "advance_x", "left", "top", "data_length", "data_offset", "code_point"])
 
 font_stack = [freetype.Face(f) for f in args.fontstack]
@@ -816,6 +823,15 @@ def to_byte_aligned(packed, width, height):
     # are grouped together for efficient LRU caching on the embedded target.
     # Since glyphs are in codepoint order, glyphs in the same Unicode block
     # are contiguous in the array and form natural groups.
+    #
+    # On top of script boundaries, a hard size cap (GROUP_MAX_UNCOMPRESSED_BYTES)
+    # is applied: if adding the next glyph would push the uncompressed group
+    # size over the cap, the group is closed and a new one started with the
+    # same script ID. This bounds the embedded decompressor's transient
+    # malloc regardless of font density (CJK, Vietnamese, user-supplied
+    # fonts with large Unicode blocks). Without it, a single dense script
+    # group can balloon past what fits in a transient page-decompress
+    # allocation on the device.
     SCRIPT_GROUP_RANGES = [
         (0x0000, 0x007F),   # ASCII
         (0x0080, 0x00FF),   # Latin-1 Supplement
@@ -833,6 +849,11 @@ def to_byte_aligned(packed, width, height):
         (0xFFFD, 0xFFFD),   # Replacement Character
     ]
 
+    # 64 KB cap: large enough to hold any single built-in script group with
+    # headroom, small enough to be a comfortable transient malloc on the
+    # ESP32-C3.
+    GROUP_MAX_UNCOMPRESSED_BYTES = 65536
+
     def get_script_group(code_point):
         for i, (start, end) in enumerate(SCRIPT_GROUP_RANGES):
             if start <= code_point <= end:
@@ -843,17 +864,34 @@ def get_script_group(code_point):
     current_group_id = None
     group_start = 0
     group_count = 0
+    group_uncompressed = 0
 
-    for i, (props, packed) in enumerate(all_glyphs):
+    for i, (props, _) in enumerate(all_glyphs):
         sg = get_script_group(props.code_point)
-        if sg != current_group_id:
+        # Use the byte-aligned size (4-pixel-aligned row stride) rather than
+        # the packed length, since the decompressor consumes byte-aligned
+        # buffers. Empty glyphs contribute zero.
+        glyph_aligned_size = (((props.width + 3) // 4) * props.height
+                              if props.width > 0 and props.height > 0 else 0)
+        if glyph_aligned_size > GROUP_MAX_UNCOMPRESSED_BYTES:
+            raise ValueError(
+                f"Glyph {i} (code point U+{props.code_point:04X}) byte-aligned size "
+                f"{glyph_aligned_size} exceeds GROUP_MAX_UNCOMPRESSED_BYTES="
+                f"{GROUP_MAX_UNCOMPRESSED_BYTES}. Consider: (1) increasing GROUP_MAX_UNCOMPRESSED_BYTES, "
+                f"(2) reducing font size, or (3) excluding this codepoint."
+            )
+        size_overflow = group_uncompressed + glyph_aligned_size > GROUP_MAX_UNCOMPRESSED_BYTES
+
+        if sg != current_group_id or size_overflow:
             if group_count > 0:
                 groups.append((group_start, group_count))
             current_group_id = sg
             group_start = i
             group_count = 1
+            group_uncompressed = glyph_aligned_size
         else:
             group_count += 1
+            group_uncompressed += glyph_aligned_size
 
     if group_count > 0:
         groups.append((group_start, group_count))
diff --git a/lib/EpdFont/scripts/fontconvert_sdcard.py b/lib/EpdFont/scripts/fontconvert_sdcard.py
new file mode 100755
index 00000000..f0f83c8e
--- /dev/null
+++ b/lib/EpdFont/scripts/fontconvert_sdcard.py
@@ -0,0 +1,985 @@
+#!/usr/bin/env python3
+"""Generate .cpfont binary files for SD card font loading.
+
+Outputs binary .cpfont files containing glyph metadata and uncompressed
+2-bit bitmaps, matching the EpdFontData/EpdGlyph/EpdUnicodeInterval struct
+layout on the ESP32-C3 (little-endian, RISC-V).
+
+Usage:
+    # Single file with specific presets
+    python fontconvert_sdcard.py \\
+      --intervals latin-ext,greek,cyrillic \\
+      --size 14 --style regular \\
+      NotoSans-Regular.ttf \\
+      -o NotoSansExt_14.cpfont
+
+    # All 4 sizes at once
+    python fontconvert_sdcard.py \\
+      --intervals cjk \\
+      --sizes 12,14,16,18 --style regular \\
+      NotoSansCJKsc-Regular.otf \\
+      --output-dir NotoSansCJK/
+
+"""
+
+from __future__ import annotations
+
+import struct
+import sys
+import os
+import re
+import math
+import argparse
+from collections import namedtuple
+
+from cpfont_version import CPFONT_VERSION
+
+# --- Unicode interval presets ---
+
+INTERVAL_PRESETS = {
+    "ascii":       [(0x0020, 0x007E)],
+    "latin1":      [(0x0080, 0x00FF)],
+    "latin-ext":   [(0x0020, 0x007E), (0x0080, 0x00FF), (0x0100, 0x024F),
+                    (0x1E00, 0x1EFF), (0x2000, 0x206F), (0xFB00, 0xFB06)],
+    "greek":       [(0x0370, 0x03FF), (0x1F00, 0x1FFF)],
+    "cyrillic":    [(0x0400, 0x04FF), (0x0500, 0x052F)],
+    "georgian":    [(0x10A0, 0x10FF), (0x2D00, 0x2D2F)],
+    "armenian":    [(0x0530, 0x058F)],
+    "ethiopic":    [(0x1200, 0x137F), (0x1380, 0x139F), (0x2D80, 0x2DDF)],
+    "vietnamese":  [(0x01A0, 0x01B0), (0x1EA0, 0x1EF9)],
+    "punctuation": [(0x2000, 0x206F)],
+    "cjk":         [(0x3000, 0x303F), (0x3040, 0x309F), (0x30A0, 0x30FF),
+                    (0x4E00, 0x9FFF), (0xF900, 0xFAFF), (0xFF00, 0xFFEF)],
+    "hangul":      [(0xAC00, 0xD7AF), (0x1100, 0x11FF), (0x3130, 0x318F)],
+    "cherokee":    [(0x13A0, 0x13FF), (0xAB70, 0xABBF)],
+    "tifinagh":    [(0x2D30, 0x2D7F)],
+    # Symbol blocks commonly seen in scifi/popsci/literary fiction.
+
+    "symbols":     [(0x2070, 0x209F), (0x20A0, 0x20CF), (0x2150, 0x218F),
+                    (0x2190, 0x21FF), (0x2200, 0x22FF), (0x2500, 0x257F),
+                    (0x25A0, 0x25FF), (0x2600, 0x26FF), (0x2700, 0x27BF)],
+    # Composite preset for English-language literary fiction including scifi/popsci.
+    # Greek for physics terms, math operators, miscellaneous symbols (♪♫♬), dingbats.
+    "reading":     [(0x0020, 0x024F), (0x0300, 0x036F), (0x0370, 0x03FF),
+                    (0x0400, 0x04FF), (0x1E00, 0x1EFF), (0x2000, 0x206F),
+                    (0x2070, 0x209F), (0x20A0, 0x20CF), (0x2150, 0x218F),
+                    (0x2190, 0x21FF), (0x2200, 0x22FF), (0x2500, 0x257F),
+                    (0x25A0, 0x25FF), (0x2600, 0x26FF), (0x2700, 0x27BF),
+                    (0xFB00, 0xFB06)],
+    # Matches the built-in font intervals from fontconvert.py exactly
+    "builtin":     [(0x0000, 0x007F), (0x0080, 0x00FF), (0x0100, 0x017F),
+                    (0x01A0, 0x01A1), (0x01AF, 0x01B0), (0x01C4, 0x021F),
+                    (0x0300, 0x036F), (0x0400, 0x04FF),
+                    (0x1EA0, 0x1EF9), (0x2000, 0x206F), (0x20A0, 0x20CF),
+                    (0x2070, 0x209F), (0x2190, 0x21FF), (0x2200, 0x22FF),
+                    (0xFB00, 0xFB06)],
+}
+
+# Regex for parsing unnamed hex range intervals: (0xSTART-0xEND)
+_HEX_RANGE_PATTERN = re.compile(r'^\(0x([0-9a-fA-F]+)-0x([0-9a-fA-F]+)\)$')
+
+def parse_hex_range(s: str) -> tuple[int, int] | None:
+    match = _HEX_RANGE_PATTERN.fullmatch(s)
+    if not match:
+        return None
+
+    start_hex, end_hex = match.groups()
+    start, end = int(start_hex, 16), int(end_hex, 16)
+
+    # Validating Unicode range bounds.
+    if start > end or end > 0x10FFFF:
+        return None
+    return start, end
+
+
+def resolve_intervals(preset_str):
+    """Resolve comma-separated preset names into a merged, sorted, deduplicated interval list."""
+    all_intervals = []
+    for name in preset_str.split(","):
+        name = name.strip().lower()
+        unnamed_interval = parse_hex_range(name)
+        if name not in INTERVAL_PRESETS and unnamed_interval is None:
+            print(f"Error: unknown interval preset '{name}'", file=sys.stderr)
+            print(f"Available presets: {', '.join(sorted(INTERVAL_PRESETS.keys()))}", file=sys.stderr)
+            print("You can also specify unnamed hex ranges like (0x2100-0x214F)", file=sys.stderr)
+            sys.exit(1)
+
+        if unnamed_interval is not None:
+            all_intervals.append(unnamed_interval)
+        else:
+            all_intervals.extend(INTERVAL_PRESETS[name])
+
+    # Always add replacement character
+    all_intervals.append((0xFFFD, 0xFFFD))
+
+    # Sort and merge overlapping/adjacent intervals
+    all_intervals.sort()
+    merged = []
+    for start, end in all_intervals:
+        if merged and start <= merged[-1][1] + 1:
+            merged[-1] = (merged[-1][0], max(merged[-1][1], end))
+        else:
+            merged.append((start, end))
+    return merged
+
+
+GlyphProps = namedtuple("GlyphProps", [
+    "width", "height", "advance_x", "left", "top", "data_length", "data_offset", "code_point"
+])
+
+# Intermediate data from rasterizing one font style
+StyleRasterData = namedtuple("StyleRasterData", [
+    "style_id",                # 0=regular, 1=bold, 2=italic, 3=bolditalic
+    "intervals",               # validated intervals [(start, end), ...]
+    "all_glyphs",              # [(GlyphProps, packed_bytes), ...]
+    "total_bitmap_size",       # int
+    "advanceY", "ascender", "descender",
+    "kern_left_classes", "kern_right_classes", "kern_matrix",
+    "kern_left_class_count", "kern_right_class_count",
+    "ligature_pairs",
+])
+
+
+def norm_floor(val):
+    return int(math.floor(val / (1 << 6)))
+
+
+def norm_ceil(val):
+    return int(math.ceil(val / (1 << 6)))
+
+
+# Fixed-point (fp4) output conventions (must match EpdFontData.h / fp4 namespace):
+#
+#   advanceX    12.4 unsigned fixed-point (uint16_t).
+#               12 integer bits, 4 fractional bits = 1/16-pixel resolution.
+#               Encoded from FreeType's 16.16 linearHoriAdvance.
+#
+#   kernMatrix  4.4 signed fixed-point (int8_t).
+#               4 integer bits, 4 fractional bits = 1/16-pixel resolution.
+#               Range: -8.0 to +7.9375 pixels.
+#               Encoded from font design-unit kerning values.
+#
+# Both share 4 fractional bits so the renderer can add them directly into a
+# single int32_t accumulator and defer rounding until pixel placement.
+
+def fp4_from_ft16_16(val):
+    """Convert FreeType 16.16 fixed-point to 12.4 fixed-point with rounding."""
+    return (val + (1 << 11)) >> 12
+
+def fp4_from_design_units(du, scale):
+    """Convert a font design-unit value to 4.4 fixed-point, clamped to int8_t.
+
+    Multiplies by scale (ppem / units_per_em) and shifts into 4 fractional
+    bits.  The result is rounded to nearest and clamped to [-128, 127].
+    """
+    raw = round(du * scale * 16)
+    return max(-128, min(127, raw))
+
+
+# Standard Unicode ligature codepoints for known input sequences.
+# Used as a fallback when the GSUB substitute glyph has no cmap entry.
+STANDARD_LIGATURE_MAP = {
+    (0x66, 0x66):       0xFB00,  # ff
+    (0x66, 0x69):       0xFB01,  # fi
+    (0x66, 0x6C):       0xFB02,  # fl
+    (0x66, 0x66, 0x69): 0xFB03,  # ffi
+    (0x66, 0x66, 0x6C): 0xFB04,  # ffl
+    (0x17F, 0x74):      0xFB05,  # long-s + t
+    (0x73, 0x74):       0xFB06,  # st
+}
+
+
+def _extract_pairpos_subtable(subtable, glyph_to_cp, raw_kern):
+    """Extract kerning from a PairPos subtable (Format 1 or 2)."""
+    if subtable.Format == 1:
+        # Individual pairs
+        for i, coverage_glyph in enumerate(subtable.Coverage.glyphs):
+            if coverage_glyph not in glyph_to_cp:
+                continue
+            pair_set = subtable.PairSet[i]
+            for pvr in pair_set.PairValueRecord:
+                if pvr.SecondGlyph not in glyph_to_cp:
+                    continue
+                xa = 0
+                if hasattr(pvr, 'Value1') and pvr.Value1:
+                    xa = getattr(pvr.Value1, 'XAdvance', 0) or 0
+                if xa != 0:
+                    key = (coverage_glyph, pvr.SecondGlyph)
+                    raw_kern[key] = raw_kern.get(key, 0) + xa
+    elif subtable.Format == 2:
+        # Class-based pairs — iterate by class, not by glyph, to avoid
+        # O(glyphs²) explosion for CJK fonts with many requested glyphs.
+        class_def1 = subtable.ClassDef1.classDefs if subtable.ClassDef1 else {}
+        class_def2 = subtable.ClassDef2.classDefs if subtable.ClassDef2 else {}
+        coverage_set = set(subtable.Coverage.glyphs)
+
+        # Build reverse mappings: class_id -> list of glyph names
+        left_by_class = {}   # only glyphs in coverage AND glyph_to_cp
+        for glyph in glyph_to_cp:
+            if glyph not in coverage_set:
+                continue
+            c1 = class_def1.get(glyph, 0)
+            left_by_class.setdefault(c1, []).append(glyph)
+
+        right_by_class = {}  # all glyphs in glyph_to_cp
+        for glyph in glyph_to_cp:
+            c2 = class_def2.get(glyph, 0)
+            right_by_class.setdefault(c2, []).append(glyph)
+
+        # Iterate class pairs (typically << glyph pairs)
+        for c1, class1_rec in enumerate(subtable.Class1Record):
+            if c1 not in left_by_class:
+                continue
+            for c2, c2_rec in enumerate(class1_rec.Class2Record):
+                xa = 0
+                if hasattr(c2_rec, 'Value1') and c2_rec.Value1:
+                    xa = getattr(c2_rec.Value1, 'XAdvance', 0) or 0
+                if xa == 0:
+                    continue
+                if c2 not in right_by_class:
+                    continue
+                for lg in left_by_class[c1]:
+                    for rg in right_by_class[c2]:
+                        key = (lg, rg)
+                        raw_kern[key] = raw_kern.get(key, 0) + xa
+
+
+def extract_kerning_fonttools(font_path, codepoints, ppem):
+    """Extract kerning pairs from a font file using fonttools.
+
+    Returns dict of {(leftCp, rightCp): pixel_adjust} for the given
+    codepoints.  Values are scaled from font design units to integer
+    pixels at ppem.
+    """
+    from fontTools.ttLib import TTFont
+
+    font = TTFont(font_path)
+    units_per_em = font['head'].unitsPerEm
+    cmap = font.getBestCmap() or {}
+
+    # Build glyph_name -> [codepoints] map (preserves aliases where multiple
+    # codepoints share a glyph, e.g. space/nbsp)
+    glyph_to_cps = {}
+    for cp in codepoints:
+        gname = cmap.get(cp)
+        if gname:
+            glyph_to_cps.setdefault(gname, []).append(cp)
+    # Flat dict for membership checks and subtable extraction (uses keys only)
+    glyph_to_cp = glyph_to_cps
+
+    # Collect raw kerning values in font design units
+    raw_kern = {}  # (left_glyph_name, right_glyph_name) -> design_units
+
+    # 1. Legacy kern table
+    if 'kern' in font:
+        for subtable in font['kern'].kernTables:
+            if hasattr(subtable, 'kernTable'):
+                for (lg, rg), val in subtable.kernTable.items():
+                    if lg in glyph_to_cp and rg in glyph_to_cp:
+                        raw_kern[(lg, rg)] = raw_kern.get((lg, rg), 0) + val
+
+    # 2. GPOS 'kern' feature
+    if 'GPOS' in font:
+        gpos = font['GPOS'].table
+        kern_lookup_indices = set()
+        if gpos.FeatureList:
+            for fr in gpos.FeatureList.FeatureRecord:
+                if fr.FeatureTag == 'kern':
+                    kern_lookup_indices.update(fr.Feature.LookupListIndex)
+        for li in kern_lookup_indices:
+            lookup = gpos.LookupList.Lookup[li]
+            for st in lookup.SubTable:
+                actual = st
+                # Unwrap Extension (lookup type 9) wrappers. After unwrapping,
+                # `lookup.LookupType` is still 9, so we must look at the
+                # *effective* type carried on the extension subtable to know
+                # whether `actual` is a PairPos table.
+                if lookup.LookupType == 9 and hasattr(st, 'ExtSubTable'):
+                    actual = st.ExtSubTable
+                effective_type = getattr(st, 'ExtensionLookupType', lookup.LookupType)
+                if hasattr(actual, 'Format'):
+                    # _extract_pairpos_subtable assumes a Type-2 (PairPos)
+                    # subtable. Other lookup types reachable through the kern
+                    # feature (cursive attachment, mark-to-mark, contextual,
+                    # etc.) have a different shape and crash inside the
+                    # extractor. Skip them with a debug note rather than
+                    # aborting the whole build. Modern fonts often ship kern
+                    # via Extension-wrapped PairPos, so checking the effective
+                    # type instead of the outer type is what makes those
+                    # lookups actually reach the extractor.
+                    if effective_type == 2:
+                        _extract_pairpos_subtable(actual, glyph_to_cp, raw_kern)
+                    else:
+                        print(f"  Debug: skipping unsupported GPOS kern lookupType="
+                              f"{effective_type} (outer={lookup.LookupType}, Format={actual.Format})",
+                              file=sys.stderr)
+
+    font.close()
+
+    # Scale design-unit kerning values to 4.4 fixed-point pixels.
+    # Expand glyph aliases: if multiple codepoints share a glyph, emit kern
+    # pairs for all codepoint combinations.
+    scale = ppem / units_per_em
+    result = {}  # (leftCp, rightCp) -> 4.4 fixed-point adjust
+    for (lg, rg), du in raw_kern.items():
+        adjust = fp4_from_design_units(du, scale)
+        if adjust != 0:
+            for lcp in glyph_to_cps[lg]:
+                for rcp in glyph_to_cps[rg]:
+                    result[(lcp, rcp)] = adjust
+    return result
+
+
+def derive_kern_classes(kern_map):
+    """Derive class-based kerning from a pair map.
+
+    Returns (kern_left_classes, kern_right_classes, kern_matrix,
+             kern_left_class_count, kern_right_class_count) where:
+    - kern_left_classes: sorted list of (codepoint, classId) tuples
+    - kern_right_classes: sorted list of (codepoint, classId) tuples
+    - kern_matrix: flat list of int8 values (left_class_count * right_class_count)
+    - kern_left_class_count: number of distinct left classes
+    - kern_right_class_count: number of distinct right classes
+    """
+    if not kern_map:
+        return [], [], [], 0, 0
+
+    all_left_cps = {lcp for lcp, _ in kern_map}
+    all_right_cps = {rcp for _, rcp in kern_map}
+
+    sorted_right_cps = sorted(all_right_cps)
+    sorted_left_cps = sorted(all_left_cps)
+
+    # Group left codepoints by identical adjustment row
+    left_profile_to_class = {}
+    left_class_map = {}
+    left_class_id = 1
+    for lcp in sorted(all_left_cps):
+        row = tuple(kern_map.get((lcp, rcp), 0) for rcp in sorted_right_cps)
+        if row not in left_profile_to_class:
+            left_profile_to_class[row] = left_class_id
+            left_class_id += 1
+        left_class_map[lcp] = left_profile_to_class[row]
+
+    # Group right codepoints by identical adjustment column
+    right_profile_to_class = {}
+    right_class_map = {}
+    right_class_id = 1
+    for rcp in sorted(all_right_cps):
+        col = tuple(kern_map.get((lcp, rcp), 0) for lcp in sorted_left_cps)
+        if col not in right_profile_to_class:
+            right_profile_to_class[col] = right_class_id
+            right_class_id += 1
+        right_class_map[rcp] = right_profile_to_class[col]
+
+    kern_left_class_count = left_class_id - 1
+    kern_right_class_count = right_class_id - 1
+
+    if kern_left_class_count > 255 or kern_right_class_count > 255:
+        print(f"WARNING: kerning class count exceeds uint8_t range "
+              f"(left={kern_left_class_count}, right={kern_right_class_count}), "
+              f"dropping kerning for this style",
+              file=sys.stderr)
+        return ([], [], [], 0, 0)
+
+    # Build the class x class matrix
+    kern_matrix = [0] * (kern_left_class_count * kern_right_class_count)
+    for (lcp, rcp), adjust in kern_map.items():
+        lc = left_class_map[lcp] - 1
+        rc = right_class_map[rcp] - 1
+        kern_matrix[lc * kern_right_class_count + rc] = adjust
+
+    # Build sorted class entry lists
+    kern_left_classes = sorted(left_class_map.items())
+    kern_right_classes = sorted(right_class_map.items())
+
+    return (kern_left_classes, kern_right_classes, kern_matrix,
+            kern_left_class_count, kern_right_class_count)
+
+
+def extract_ligatures_fonttools(font_path, codepoints):
+    """Extract ligature substitution pairs from a font file using fonttools.
+
+    Returns list of (packed_pair, ligature_codepoint) for the given codepoints.
+    Multi-character ligatures are decomposed into chained pairs.
+    """
+    from fontTools.ttLib import TTFont
+
+    font = TTFont(font_path)
+    cmap = font.getBestCmap() or {}
+
+    # Build glyph_name -> codepoint and codepoint -> glyph_name maps
+    glyph_to_cp = {}
+    cp_to_glyph = {}
+    for cp, gname in cmap.items():
+        glyph_to_cp[gname] = cp
+        cp_to_glyph[cp] = gname
+
+    # Collect raw ligature rules: (sequence_of_codepoints) -> ligature_codepoint
+    raw_ligatures = {}  # tuple of codepoints -> ligature codepoint
+
+    if 'GSUB' in font:
+        gsub = font['GSUB'].table
+
+        LIGATURE_FEATURES = ('liga', 'rlig')
+        liga_lookup_indices = set()
+        if gsub.FeatureList:
+            for fr in gsub.FeatureList.FeatureRecord:
+                if fr.FeatureTag in LIGATURE_FEATURES:
+                    liga_lookup_indices.update(fr.Feature.LookupListIndex)
+
+        for li in liga_lookup_indices:
+            lookup = gsub.LookupList.Lookup[li]
+            for st in lookup.SubTable:
+                actual = st
+                # Unwrap Extension (lookup type 7) wrappers
+                if lookup.LookupType == 7 and hasattr(st, 'ExtSubTable'):
+                    actual = st.ExtSubTable
+                # LigatureSubst is lookup type 4
+                if not hasattr(actual, 'ligatures'):
+                    continue
+                for first_glyph, ligature_list in actual.ligatures.items():
+                    if first_glyph not in glyph_to_cp:
+                        continue
+                    first_cp = glyph_to_cp[first_glyph]
+                    for lig in ligature_list:
+                        component_cps = []
+                        valid = True
+                        for comp_glyph in lig.Component:
+                            if comp_glyph not in glyph_to_cp:
+                                valid = False
+                                break
+                            component_cps.append(glyph_to_cp[comp_glyph])
+                        if not valid:
+                            continue
+                        seq = tuple([first_cp] + component_cps)
+                        if lig.LigGlyph in glyph_to_cp:
+                            lig_cp = glyph_to_cp[lig.LigGlyph]
+                        elif seq in STANDARD_LIGATURE_MAP:
+                            lig_cp = STANDARD_LIGATURE_MAP[seq]
+                        else:
+                            seq_str = ', '.join(f'U+{cp:04X}' for cp in seq)
+                            print(f"ligatures: WARNING: dropping ligature ({seq_str}) -> "
+                                  f"glyph '{lig.LigGlyph}': output glyph has no cmap entry "
+                                  f"and input sequence is not in STANDARD_LIGATURE_MAP",
+                                  file=sys.stderr)
+                            continue
+                        raw_ligatures[seq] = lig_cp
+
+    font.close()
+
+    # Filter: only keep ligatures where all input and output codepoints are
+    # in our generated glyph set, and all codepoints fit in 16 bits.
+    #
+    # The on-disk format packs each component as a uint16 (the 3+ chained
+    # path packs `intermediate_cp << 16 | last_cp`, where `intermediate_cp`
+    # is the lig_cp of the prefix). Dropping any seq with an SMP cp here —
+    # plus any lig_cp > 0xFFFF — means every cp that reaches `packed = … <<
+    # 16 | …` below is already 16-bit safe, including the chained path
+    # (intermediate_cp = filtered[prefix] is filtered too).
+    codepoints_set = set(codepoints)
+    filtered = {}
+    for seq, lig_cp in raw_ligatures.items():
+        if lig_cp not in codepoints_set or lig_cp > 0xFFFF:
+            continue
+        if any(cp > 0xFFFF for cp in seq):
+            continue
+        if all(cp in codepoints_set for cp in seq):
+            filtered[seq] = lig_cp
+
+    # Decompose into chained pairs
+    pairs = []
+    # First pass: collect all 2-codepoint ligatures
+    two_char = {seq: lig_cp for seq, lig_cp in filtered.items() if len(seq) == 2}
+    for seq, lig_cp in two_char.items():
+        packed = (seq[0] << 16) | seq[1]
+        pairs.append((packed, lig_cp))
+
+    # Second pass: decompose 3+ codepoint ligatures into chained pairs
+    for seq, lig_cp in filtered.items():
+        if len(seq) < 3:
+            continue
+        prefix = seq[:-1]
+        last_cp = seq[-1]
+        if prefix in filtered:
+            intermediate_cp = filtered[prefix]
+            packed = (intermediate_cp << 16) | last_cp
+            pairs.append((packed, lig_cp))
+        else:
+            print(f"ligatures: skipping {len(seq)}-char ligature "
+                  f"({', '.join(f'U+{cp:04X}' for cp in seq)}) -> U+{lig_cp:04X}: "
+                  f"no intermediate ligature for prefix", file=sys.stderr)
+
+    # Sort by packed pair key — on-device lookup uses binary search
+    pairs.sort(key=lambda p: p[0])
+    return pairs
+
+
+def rasterize_font_style(fontfile, size, intervals, style_id=0, force_autohint=False):
+    """Rasterize all glyphs for one font style. Returns StyleRasterData."""
+    import freetype
+
+    style_names = {0: "regular", 1: "bold", 2: "italic", 3: "bolditalic"}
+    style_label = style_names.get(style_id, str(style_id))
+
+    face = freetype.Face(fontfile)
+    # Set font size at 150 DPI (matching fontconvert.py) BEFORE any glyph load.
+    # load_glyph() with FT_LOAD_RENDER renders at the active size, so calling
+    # it before set_char_size() would waste work at the default size and risk
+    # Invalid_Size_Handle on some fonts.
+    face.set_char_size(size << 6, size << 6, 150, 150)
+
+    load_flags = freetype.FT_LOAD_RENDER
+    if force_autohint:
+        load_flags |= freetype.FT_LOAD_FORCE_AUTOHINT
+
+    def load_glyph(code_point):
+        glyph_index = face.get_char_index(code_point)
+        if glyph_index > 0:
+            face.load_glyph(glyph_index, load_flags)
+            return face
+        return None
+
+    # Validate intervals: remove codepoints not present in the font.
+    # Only check glyph existence via get_char_index — do NOT call
+    # load_glyph here, as that triggers FT_LOAD_RENDER at the target
+    # DPI and doubles total rasterization time for no benefit.
+    print(f"  [{style_label}] Validating intervals against font...", file=sys.stderr)
+    validated_intervals = []
+    for i_start, i_end in intervals:
+        start = i_start
+        for code_point in range(i_start, i_end + 1):
+            if face.get_char_index(code_point) == 0:
+                if start < code_point:
+                    validated_intervals.append((start, code_point - 1))
+                start = code_point + 1
+        if start <= i_end:
+            validated_intervals.append((start, i_end))
+
+    intervals = validated_intervals
+    total_glyphs = sum(end - start + 1 for start, end in intervals)
+    print(f"  [{style_label}] Validated: {len(intervals)} intervals, {total_glyphs} glyphs", file=sys.stderr)
+
+    # Rasterize all glyphs
+    total_bitmap_size = 0
+    all_glyphs = []
+
+    for i_start, i_end in intervals:
+        for code_point in range(i_start, i_end + 1):
+            f = load_glyph(code_point)
+            if f is None:
+                glyph = GlyphProps(0, 0, 0, 0, 0, 0, total_bitmap_size, code_point)
+                all_glyphs.append((glyph, b''))
+                continue
+
+            bitmap = f.glyph.bitmap
+
+            # Build 4-bit greyscale bitmap (same logic as fontconvert.py).
+            #
+            # FreeType returns the buffer with bitmap.pitch as the row stride
+            # in bytes, which can be negative when the bitmap is stored
+            # bottom-up. Iterating bitmap.buffer linearly assumes
+            # pitch == width and a top-down layout — that holds in the common
+            # case but breaks on padded or flipped bitmaps and corrupts the
+            # output. Walk by (row, col) using the real pitch instead.
+            #
+            # Cache bitmap.buffer in a local — ctypes struct field access
+            # creates a new Python wrapper object each time, so re-evaluating
+            # it per pixel is catastrophically slow.
+            pixels4g = []
+            px = 0
+            buf = bitmap.buffer
+            abs_pitch = abs(bitmap.pitch)
+            for y in range(bitmap.rows):
+                row_offset = y * abs_pitch if bitmap.pitch >= 0 else (bitmap.rows - 1 - y) * abs_pitch
+                for x in range(bitmap.width):
+                    v = buf[row_offset + x]
+                    if x % 2 == 0:
+                        px = (v >> 4)
+                    else:
+                        px = px | (v & 0xF0)
+                        pixels4g.append(px)
+                        px = 0
+                if bitmap.width % 2 > 0:
+                    pixels4g.append(px)
+                    px = 0
+
+            # Downsample to 2-bit bitmap
+            pixels2b = []
+            px = 0
+            pitch = (bitmap.width // 2) + (bitmap.width % 2)
+            for y in range(bitmap.rows):
+                for x in range(bitmap.width):
+                    px = px << 2
+                    bm = pixels4g[y * pitch + (x // 2)]
+                    bm = (bm >> ((x % 2) * 4)) & 0xF
+
+                    if bm >= 12:
+                        px += 3
+                    elif bm >= 8:
+                        px += 2
+                    elif bm >= 4:
+                        px += 1
+
+                    if (y * bitmap.width + x) % 4 == 3:
+                        pixels2b.append(px)
+                        px = 0
+            if (bitmap.width * bitmap.rows) % 4 != 0:
+                # Outer parens are for clarity: in Python `*` binds tighter
+                # than `<<`, so the original `px << (4 - … % 4) * 2` already
+                # evaluates as `px << ((4 - … % 4) * 2)`. Match the explicit
+                # bracketing here so the shift width is obvious at a glance,
+                # mirroring the inner-loop style in fontconvert.py.
+                px = px << ((4 - (bitmap.width * bitmap.rows) % 4) * 2)
+                pixels2b.append(px)
+
+            packed = bytes(pixels2b)
+            glyph = GlyphProps(
+                width=bitmap.width,
+                height=bitmap.rows,
+                advance_x=fp4_from_ft16_16(f.glyph.linearHoriAdvance),
+                left=f.glyph.bitmap_left,
+                top=f.glyph.bitmap_top,
+                data_length=len(packed),
+                data_offset=total_bitmap_size,
+                code_point=code_point,
+            )
+            total_bitmap_size += len(packed)
+            all_glyphs.append((glyph, packed))
+
+    # Get font metrics from pipe character (same heuristic as fontconvert.py)
+    load_glyph(ord('|'))
+
+    advanceY = norm_ceil(face.size.height)
+    ascender = norm_ceil(face.size.ascender)
+    descender = norm_floor(face.size.descender)
+
+    print(f"  [{style_label}] Metrics: advanceY={advanceY}, ascender={ascender}, descender={descender}", file=sys.stderr)
+    print(f"  [{style_label}] Bitmap: {total_bitmap_size} bytes ({total_bitmap_size / 1024:.1f} KB)", file=sys.stderr)
+
+    # --- Extract kerning and ligatures ---
+    ppem = size * 150.0 / 72.0
+    all_cps = set(g.code_point for g, _ in all_glyphs)
+
+    kern_map = extract_kerning_fonttools(fontfile, all_cps, ppem)
+    # SMP codepoints (> U+FFFF) cannot be stored in the uint16 kern codepoint
+    # field; drop them before class derivation to avoid a downstream
+    # struct.error when packing the binary kern tables.
+    kern_map = {(lcp, rcp): v for (lcp, rcp), v in kern_map.items() if lcp <= 0xFFFF and rcp <= 0xFFFF}
+    print(f"  [{style_label}] Kerning: {len(kern_map)} pairs extracted", file=sys.stderr)
+
+    (kern_left_classes, kern_right_classes, kern_matrix,
+     kern_left_class_count, kern_right_class_count) = derive_kern_classes(kern_map)
+
+    if kern_map:
+        matrix_size = kern_left_class_count * kern_right_class_count
+        entries_size = (len(kern_left_classes) + len(kern_right_classes)) * 3
+        print(f"  [{style_label}] Kerning classes: {kern_left_class_count} left, {kern_right_class_count} right, "
+              f"{matrix_size + entries_size} bytes", file=sys.stderr)
+
+    # SMP codepoints in ligature inputs / outputs are filtered inside
+    # extract_ligatures_fonttools (see the codepoints_set filter), so every
+    # entry returned here is already 16-bit safe.
+    ligature_pairs = extract_ligatures_fonttools(fontfile, all_cps)
+    if len(ligature_pairs) > 255:
+        print(f"  [{style_label}] WARNING: {len(ligature_pairs)} ligature pairs exceeds uint8_t max (255), truncating",
+              file=sys.stderr)
+        ligature_pairs = ligature_pairs[:255]
+    print(f"  [{style_label}] Ligatures: {len(ligature_pairs)} pairs", file=sys.stderr)
+
+    return StyleRasterData(
+        style_id=style_id,
+        intervals=intervals,
+        all_glyphs=all_glyphs,
+        total_bitmap_size=total_bitmap_size,
+        advanceY=advanceY,
+        ascender=ascender,
+        descender=descender,
+        kern_left_classes=kern_left_classes,
+        kern_right_classes=kern_right_classes,
+        kern_matrix=kern_matrix,
+        kern_left_class_count=kern_left_class_count,
+        kern_right_class_count=kern_right_class_count,
+        ligature_pairs=ligature_pairs,
+    )
+
+
+# --- Binary packing helpers ---
+
+# EpdGlyph struct: 16 bytes, little-endian
+GLYPH_STRUCT_FORMAT = "<BBHhhH2xI"
+assert struct.calcsize(GLYPH_STRUCT_FORMAT) == 16
+
+
+def pack_style_sections(sd):
+    """Pack one StyleRasterData into binary section bytearrays.
+    Returns (intervals_data, glyphs_data, kern_left, kern_right, kern_matrix, ligatures, bitmaps)."""
+    intervals_data = bytearray()
+    offset = 0
+    for i_start, i_end in sd.intervals:
+        intervals_data += struct.pack("<III", i_start, i_end, offset)
+        offset += i_end - i_start + 1
+
+    glyphs_data = bytearray()
+    for glyph, packed in sd.all_glyphs:
+        glyphs_data += struct.pack(GLYPH_STRUCT_FORMAT,
+                                   glyph.width, glyph.height, glyph.advance_x,
+                                   glyph.left, glyph.top,
+                                   glyph.data_length, glyph.data_offset)
+
+    kern_left_data = bytearray()
+    for cp, cls in sd.kern_left_classes:
+        kern_left_data += struct.pack("<HB", cp, cls)
+
+    kern_right_data = bytearray()
+    for cp, cls in sd.kern_right_classes:
+        kern_right_data += struct.pack("<HB", cp, cls)
+
+    kern_matrix_data = bytearray()
+    if sd.kern_matrix:
+        kern_matrix_data = bytearray(struct.pack(f"<{len(sd.kern_matrix)}b", *sd.kern_matrix))
+
+    ligature_data = bytearray()
+    for packed_pair, lig_cp in sd.ligature_pairs:
+        ligature_data += struct.pack("<II", packed_pair, lig_cp)
+
+    bitmap_data = bytearray()
+    for glyph, packed in sd.all_glyphs:
+        bitmap_data += packed
+    assert len(bitmap_data) == sd.total_bitmap_size
+
+    return (intervals_data, glyphs_data, kern_left_data, kern_right_data,
+            kern_matrix_data, ligature_data, bitmap_data)
+
+
+def style_sections_total_size(sections):
+    """Total byte size of all sections returned by pack_style_sections()."""
+    return sum(len(s) for s in sections)
+
+
+# --- File writers ---
+
+def generate_cpfont_multistyle(style_fonts, size, intervals, output_path,
+                               force_autohint=False):
+    """Generate a multi-style v4 .cpfont file.
+
+    style_fonts: dict of {style_id: fontfile_path} e.g. {0: "Regular.ttf", 2: "Italic.ttf"}
+    """
+    MAGIC = b"CPFONT\x00\x00"
+    HEADER_SIZE = 32
+    STYLE_TOC_ENTRY_SIZE = 32
+    flags = 1  # always 2-bit greyscale
+    style_count = len(style_fonts)
+
+    # Rasterize each style
+    raster_data = {}  # style_id -> StyleRasterData
+    for style_id in sorted(style_fonts.keys()):
+        fontfile = style_fonts[style_id]
+        print(f"  Rasterizing style {style_id}...", file=sys.stderr)
+        raster_data[style_id] = rasterize_font_style(
+            fontfile, size, intervals, style_id=style_id,
+            force_autohint=force_autohint)
+
+    # Pack binary sections for each style
+    packed_sections = {}  # style_id -> tuple of section bytearrays
+    for style_id, sd in raster_data.items():
+        packed_sections[style_id] = pack_style_sections(sd)
+
+    # Calculate data offsets (after header + TOC)
+    data_start = HEADER_SIZE + style_count * STYLE_TOC_ENTRY_SIZE
+    current_offset = data_start
+
+    style_offsets = {}  # style_id -> absolute file offset
+    for style_id in sorted(packed_sections.keys()):
+        style_offsets[style_id] = current_offset
+        current_offset += style_sections_total_size(packed_sections[style_id])
+
+    # Build global header
+    # V4 header: magic(8) + version(2) + flags(2) + styleCount(1) + reserved(19) = 32
+    header = struct.pack("<8sHHB19s", MAGIC, CPFONT_VERSION, flags, style_count, bytes(19))
+    assert len(header) == HEADER_SIZE
+
+    # Build style TOC entries
+    # Each entry: styleId(1) + pad(3) + intervalCount(4) + glyphCount(4) +
+    #   advanceY(1) + ascender(2) + descender(2) + kernL(2) + kernR(2) +
+    #   kernLCls(1) + kernRCls(1) + ligCount(1) + dataOffset(4) + reserved(4) = 32
+    STYLE_TOC_FORMAT = "<B3xIIBhhHHBBBI4x"
+    assert struct.calcsize(STYLE_TOC_FORMAT) == STYLE_TOC_ENTRY_SIZE
+
+    toc_data = bytearray()
+    for style_id in sorted(raster_data.keys()):
+        sd = raster_data[style_id]
+        if sd.advanceY > 255:
+            print(f"ERROR: advanceY ({sd.advanceY}) exceeds uint8 range for "
+                  f"style {style_id} size {size}. This likely means the font "
+                  f"size is too large for this format.",
+                  file=sys.stderr)
+            sys.exit(1)
+        toc_data += struct.pack(STYLE_TOC_FORMAT,
+                                style_id,
+                                len(sd.intervals), len(sd.all_glyphs),
+                                sd.advanceY, sd.ascender, sd.descender,
+                                len(sd.kern_left_classes), len(sd.kern_right_classes),
+                                sd.kern_left_class_count, sd.kern_right_class_count,
+                                len(sd.ligature_pairs),
+                                style_offsets[style_id])
+
+    # Write output
+    os.makedirs(os.path.dirname(output_path) if os.path.dirname(output_path) else ".", exist_ok=True)
+    total_file_size = 0
+    with open(output_path, "wb") as f:
+        f.write(header)
+        f.write(toc_data)
+        for style_id in sorted(packed_sections.keys()):
+            for section in packed_sections[style_id]:
+                f.write(section)
+        total_file_size = f.tell()
+
+    # Print summary
+    print(f"  Output: {output_path} (v4, {style_count} styles)", file=sys.stderr)
+    print(f"    Header+TOC: {HEADER_SIZE + len(toc_data)} bytes", file=sys.stderr)
+    for style_id in sorted(raster_data.keys()):
+        sd = raster_data[style_id]
+        secs = packed_sections[style_id]
+        style_names = {0: "regular", 1: "bold", 2: "italic", 3: "bolditalic"}
+        sname = style_names.get(style_id, str(style_id))
+        ssize = style_sections_total_size(secs)
+        print(f"    {sname}: {len(sd.all_glyphs)} glyphs, {len(sd.intervals)} intervals, "
+              f"{ssize} bytes", file=sys.stderr)
+    print(f"    Total: {total_file_size} bytes ({total_file_size / 1024 / 1024:.2f} MB)", file=sys.stderr)
+    return total_file_size
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Generate .cpfont files for SD card font loading.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=f"Available interval presets: {', '.join(sorted(INTERVAL_PRESETS.keys()))}"
+    )
+
+    # Font file (positional, optional for multi-style mode)
+    parser.add_argument("fontfile", nargs="?", default=None,
+                        help="Path to the font file (single-style mode).")
+    parser.add_argument("--intervals", dest="intervals",
+                        help="Comma-separated interval presets (e.g., 'latin-ext,greek,cyrillic').")
+    parser.add_argument("--size", type=int, dest="size",
+                        help="Single font size to generate.")
+    parser.add_argument("--sizes", dest="sizes",
+                        help="Comma-separated sizes (e.g., '12,14,16,18').")
+    parser.add_argument("--style", dest="style", default="regular",
+                        choices=["regular", "bold", "italic", "bolditalic"],
+                        help="Font style for single-style mode (default: regular).")
+    parser.add_argument("--name", dest="name",
+                        help="Font family name for output filenames (default: derived from font filename).")
+    parser.add_argument("--force-autohint", dest="force_autohint", action="store_true",
+                        help="Force FreeType auto-hinter instead of native font hinting.")
+    parser.add_argument("-o", "--output", dest="output",
+                        help="Output file path (for single-size mode).")
+    parser.add_argument("--output-dir", dest="output_dir",
+                        help="Output directory for multi-size mode.")
+    parser.add_argument("--list-presets", action="store_true",
+                        help="List available interval presets and exit.")
+
+    # Multi-style mode: per-style font file arguments (generates v4 .cpfont)
+    parser.add_argument("--regular", dest="font_regular",
+                        help="Font file for regular style (enables multi-style v4 mode).")
+    parser.add_argument("--bold", dest="font_bold",
+                        help="Font file for bold style.")
+    parser.add_argument("--italic", dest="font_italic",
+                        help="Font file for italic style.")
+    parser.add_argument("--bolditalic", dest="font_bolditalic",
+                        help="Font file for bold-italic style.")
+
+    args = parser.parse_args()
+
+    if args.list_presets:
+        print("Available interval presets:")
+        for name, ranges in sorted(INTERVAL_PRESETS.items()):
+            total = sum(e - s + 1 for s, e in ranges)
+            print(f"  {name:15s}  {len(ranges)} range(s), ~{total} codepoints")
+        sys.exit(0)
+
+    # Detect multi-style mode
+    style_fonts = {}
+    if args.font_regular:
+        style_fonts[0] = args.font_regular
+    if args.font_bold:
+        style_fonts[1] = args.font_bold
+    if args.font_italic:
+        style_fonts[2] = args.font_italic
+    if args.font_bolditalic:
+        style_fonts[3] = args.font_bolditalic
+
+    is_multistyle = len(style_fonts) > 0
+    fontfile = args.fontfile
+
+    # Require --intervals
+    if not args.intervals:
+        print("Error: --intervals is required (e.g., --intervals latin-ext,greek,cyrillic)", file=sys.stderr)
+        print(f"Available presets: {', '.join(sorted(INTERVAL_PRESETS.keys()))}", file=sys.stderr)
+        sys.exit(1)
+
+    intervals = resolve_intervals(args.intervals)
+
+    # Determine sizes
+    if args.sizes:
+        sizes = [int(s.strip()) for s in args.sizes.split(",")]
+    elif args.size:
+        sizes = [args.size]
+    else:
+        print("Error: --size or --sizes is required", file=sys.stderr)
+        sys.exit(1)
+
+    # Validate early: single-style mode requires a font file
+    if not is_multistyle and not fontfile:
+        print("Error: fontfile is required in single-style mode", file=sys.stderr)
+        sys.exit(1)
+
+    # Determine font name
+    if args.name:
+        font_name = args.name
+    elif is_multistyle:
+        # Derive from the regular font file
+        ref_file = style_fonts[min(style_fonts.keys())]
+        base = os.path.splitext(os.path.basename(ref_file))[0]
+        for suffix in ["-Regular", "-Bold", "-Italic", "-BoldItalic",
+                       "-regular", "-bold", "-italic", "-bolditalic"]:
+            if base.endswith(suffix):
+                base = base[:-len(suffix)]
+                break
+        font_name = base
+    else:
+        base = os.path.splitext(os.path.basename(fontfile))[0]
+        for suffix in ["-Regular", "-Bold", "-Italic", "-BoldItalic",
+                       "-regular", "-bold", "-italic", "-bolditalic"]:
+            if base.endswith(suffix):
+                base = base[:-len(suffix)]
+                break
+        font_name = base
+
+    if not is_multistyle:
+        # Single font file provided: wrap as a single-style v4 font
+        style_map = {"regular": 0, "bold": 1, "italic": 2, "bolditalic": 3}
+        style_fonts[style_map[args.style]] = fontfile
+
+    # Always generate v4 format
+    if args.output and len(sizes) != 1:
+        print("Error: --output can only be used with a single size", file=sys.stderr)
+        sys.exit(1)
+    output_dir = args.output_dir if args.output_dir else f"{font_name}/"
+    total_size = 0
+    for sz in sizes:
+        if args.output and len(sizes) == 1:
+            output_path = args.output
+        else:
+            filename = f"{font_name}_{sz}.cpfont"
+            output_path = os.path.join(output_dir, filename)
+        print(f"Generating {output_path} (size {sz}, {len(style_fonts)} style(s), v4)...", file=sys.stderr)
+        total_size += generate_cpfont_multistyle(
+            style_fonts, sz, intervals, output_path,
+            force_autohint=args.force_autohint)
+    print(f"\nTotal: {len(sizes)} files, {total_size / 1024 / 1024:.2f} MB", file=sys.stderr)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/lib/EpdFont/scripts/requirements.txt b/lib/EpdFont/scripts/requirements.txt
index 4b81c657..ef4f3271 100644
--- a/lib/EpdFont/scripts/requirements.txt
+++ b/lib/EpdFont/scripts/requirements.txt
@@ -1,2 +1,3 @@
 fonttools>=4.62.1
 freetype-py>=2.5.1
+pyyaml>=6.0.3
diff --git a/lib/EpdFont/scripts/sd-fonts.yaml b/lib/EpdFont/scripts/sd-fonts.yaml
new file mode 100644
index 00000000..46bda136
--- /dev/null
+++ b/lib/EpdFont/scripts/sd-fonts.yaml
@@ -0,0 +1,210 @@
+# SD Card Font Families for CrossPoint Reader
+#
+# This file is the single source of truth for which fonts are generated,
+# how they're sourced, and how they're described in the download manifest.
+#
+# Adding a new font family = adding a block here. No code changes needed.
+#
+# Fields:
+#   name:        Output family name (used in filenames and on-device UI)
+#   description: Human-readable description (shown in download UI and manifest)
+#   intervals:   Comma-separated Unicode interval presets for fontconvert_sdcard.py
+#   sizes:       Point sizes to generate
+#   force_autohint: (optional) Force FreeType auto-hinter instead of native hinting
+#   styles:      Map of style name -> font source
+#                  path: relative to lib/EpdFont (for committed fonts)
+#                  url:  download URL (for fonts not in the repo)
+#
+# Variable fonts:
+#   Some fonts (Bitter, Inter, Alegreya) are distributed as variable fonts.
+#   freetype-py can't set variable font axis values, so the build script
+#   uses fonttools.instancer to extract static instances automatically.
+#
+#   To use a variable font, add a 'variable' key to the style spec with
+#   axis values to pin:
+#
+#     styles:
+#       regular: {url: "https://...Font[wght].ttf", variable: {wght: 400}}
+#       bold:    {url: "https://...Font[wght].ttf", variable: {wght: 700}}
+#
+#   Extracted static fonts are cached in instanced_fonts/ (gitignored).
+#   Requires fonttools: pip install -r requirements.txt
+
+families:
+  # ── Serif ──────────────────────────────────────────────────────────────
+
+  - name: Literata
+    description: "Screen-optimized serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/googlefonts/literata/main/fonts/ttf/Literata-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/googlefonts/literata/main/fonts/ttf/Literata-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/googlefonts/literata/main/fonts/ttf/Literata-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/googlefonts/literata/main/fonts/ttf/Literata-BoldItalic.ttf"}
+
+  - name: SourceSerif4
+    description: "Adobe transitional serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/adobe-fonts/source-serif/release/TTF/SourceSerif4-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/adobe-fonts/source-serif/release/TTF/SourceSerif4-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/adobe-fonts/source-serif/release/TTF/SourceSerif4-It.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/adobe-fonts/source-serif/release/TTF/SourceSerif4-BoldIt.ttf"}
+
+  - name: NotoSerifExtended
+    description: "Serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/notofonts/NotoSerif/main/fonts/ttf/unhinted/instance_ttf/NotoSerif-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/notofonts/NotoSerif/main/fonts/ttf/unhinted/instance_ttf/NotoSerif-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/notofonts/NotoSerif-Italic/main/fonts/ttf/unhinted/instance_ttf/NotoSerif-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/notofonts/NotoSerif-Italic/main/fonts/ttf/unhinted/instance_ttf/NotoSerif-BoldItalic.ttf"}
+
+  - name: Merriweather
+    description: "Warm serif for long-form reading (Latin, Cyrillic)"
+    intervals: latin-ext,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/SorkinType/Merriweather/master/fonts/ttf/Merriweather-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/SorkinType/Merriweather/master/fonts/ttf/Merriweather-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/SorkinType/Merriweather/master/fonts/ttf/Merriweather-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/SorkinType/Merriweather/master/fonts/ttf/Merriweather-BoldItalic.ttf"}
+
+  - name: Lora
+    description: "Calligraphic serif for literary reading (Latin, Cyrillic)"
+    intervals: latin-ext,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/cyrealtype/Lora-Cyrillic/main/fonts/ttf/Lora-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/cyrealtype/Lora-Cyrillic/main/fonts/ttf/Lora-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/cyrealtype/Lora-Cyrillic/main/fonts/ttf/Lora-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/cyrealtype/Lora-Cyrillic/main/fonts/ttf/Lora-BoldItalic.ttf"}
+
+  - name: GentiumBookPlus
+    description: "Scholarly serif with wide Unicode coverage (Latin, Greek, Cyrillic, IPA)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/gentiumbookplus/GentiumBookPlus-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/gentiumbookplus/GentiumBookPlus-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/gentiumbookplus/GentiumBookPlus-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/gentiumbookplus/GentiumBookPlus-BoldItalic.ttf"}
+
+  - name: IBMPlexSerif
+    description: "Professional serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexserif/IBMPlexSerif-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexserif/IBMPlexSerif-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexserif/IBMPlexSerif-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexserif/IBMPlexSerif-BoldItalic.ttf"}
+
+  - name: Bitter
+    description: "Slab serif designed for e-ink (Latin, Cyrillic)"
+    intervals: latin-ext,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/bitter/Bitter%5Bwght%5D.ttf", variable: {wght: 500}}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/bitter/Bitter%5Bwght%5D.ttf", variable: {wght: 700}}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/bitter/Bitter-Italic%5Bwght%5D.ttf", variable: {wght: 500}}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/bitter/Bitter-Italic%5Bwght%5D.ttf", variable: {wght: 700}}
+
+  # ── Sans-serif ─────────────────────────────────────────────────────────
+
+  - name: NotoSansExtended
+    description: "Sans-serif (Latin, Greek, Cyrillic, Georgian, Armenian, Ethiopic)"
+    intervals: latin-ext,greek,cyrillic,georgian,armenian,ethiopic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {path: "builtinFonts/source/NotoSans/NotoSans-Regular.ttf"}
+      bold:       {path: "builtinFonts/source/NotoSans/NotoSans-Bold.ttf"}
+      italic:     {path: "builtinFonts/source/NotoSans/NotoSans-Italic.ttf"}
+      bolditalic: {path: "builtinFonts/source/NotoSans/NotoSans-BoldItalic.ttf"}
+
+  - name: Inter
+    description: "Modern sans-serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/inter/Inter%5Bopsz%2Cwght%5D.ttf", variable: {wght: 400, opsz: 14}}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/inter/Inter%5Bopsz%2Cwght%5D.ttf", variable: {wght: 700, opsz: 14}}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/inter/Inter-Italic%5Bopsz%2Cwght%5D.ttf", variable: {wght: 400, opsz: 14}}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/inter/Inter-Italic%5Bopsz%2Cwght%5D.ttf", variable: {wght: 700, opsz: 14}}
+
+  - name: SourceSans3
+    description: "Adobe humanist sans-serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/adobe-fonts/source-sans/release/TTF/SourceSans3-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/adobe-fonts/source-sans/release/TTF/SourceSans3-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/adobe-fonts/source-sans/release/TTF/SourceSans3-It.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/adobe-fonts/source-sans/release/TTF/SourceSans3-BoldIt.ttf"}
+
+  - name: IBMPlexSans
+    description: "IBM corporate sans-serif (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/IBM/plex/master/packages/plex-sans/fonts/complete/ttf/IBMPlexSans-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/IBM/plex/master/packages/plex-sans/fonts/complete/ttf/IBMPlexSans-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/IBM/plex/master/packages/plex-sans/fonts/complete/ttf/IBMPlexSans-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/IBM/plex/master/packages/plex-sans/fonts/complete/ttf/IBMPlexSans-BoldItalic.ttf"}
+
+  - name: Alegreya
+    description: "Calligraphic serif/display (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/alegreya/Alegreya%5Bwght%5D.ttf", variable: {wght: 400}}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/alegreya/Alegreya%5Bwght%5D.ttf", variable: {wght: 700}}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/alegreya/Alegreya-Italic%5Bwght%5D.ttf", variable: {wght: 400}}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/alegreya/Alegreya-Italic%5Bwght%5D.ttf", variable: {wght: 700}}
+
+  # ── Monospace ──────────────────────────────────────────────────────────
+
+  - name: IBMPlexMono
+    description: "Monospace for code and technical reading (Latin, Greek, Cyrillic)"
+    intervals: latin-ext,greek,cyrillic
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexmono/IBMPlexMono-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexmono/IBMPlexMono-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexmono/IBMPlexMono-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/ibmplexmono/IBMPlexMono-BoldItalic.ttf"}
+
+  - name: SourceCodePro
+    description: "Adobe monospace with excellent hinting (Latin)"
+    intervals: latin-ext
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/adobe-fonts/source-code-pro/release/TTF/SourceCodePro-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/adobe-fonts/source-code-pro/release/TTF/SourceCodePro-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/adobe-fonts/source-code-pro/release/TTF/SourceCodePro-It.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/adobe-fonts/source-code-pro/release/TTF/SourceCodePro-BoldIt.ttf"}
+
+  # ── Accessibility ──────────────────────────────────────────────────────
+
+  - name: AtkinsonHyperlegibleNext
+    description: "Accessibility font for low vision (Latin)"
+    intervals: latin-ext
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible-next/main/fonts/ttf/AtkinsonHyperlegibleNext-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible-next/main/fonts/ttf/AtkinsonHyperlegibleNext-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible-next/main/fonts/ttf/AtkinsonHyperlegibleNext-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/googlefonts/atkinson-hyperlegible-next/main/fonts/ttf/AtkinsonHyperlegibleNext-BoldItalic.ttf"}
+
+  - name: LexicaUltralegible
+    description: "Accessibility font for low vision / dyslexia (Latin)"
+    intervals: latin-ext
+    sizes: [12, 14, 16, 18]
+    styles:
+      regular:    {url: "https://raw.githubusercontent.com/jacobxperez/lexica-ultralegible/main/fonts/ttf/LexicaUltralegible-Regular.ttf"}
+      bold:       {url: "https://raw.githubusercontent.com/jacobxperez/lexica-ultralegible/main/fonts/ttf/LexicaUltralegible-Bold.ttf"}
+      italic:     {url: "https://raw.githubusercontent.com/jacobxperez/lexica-ultralegible/main/fonts/ttf/LexicaUltralegible-Italic.ttf"}
+      bolditalic: {url: "https://raw.githubusercontent.com/jacobxperez/lexica-ultralegible/main/fonts/ttf/LexicaUltralegible-BoldItalic.ttf"}
diff --git a/lib/EpdFont/scripts/verify_compression.py b/lib/EpdFont/scripts/verify_compression.py
index c4b13e17..c2320c78 100644
--- a/lib/EpdFont/scripts/verify_compression.py
+++ b/lib/EpdFont/scripts/verify_compression.py
@@ -234,6 +234,9 @@ def main():
     if len(sys.argv) < 2:
         print(f"Usage: {sys.argv[0]} <font_headers_directory>", file=sys.stderr)
         sys.exit(1)
+    if sys.argv[1] in ("-h", "--help"):
+        print(f"Usage: {sys.argv[0]} <font_headers_directory>")
+        sys.exit(0)
 
     font_dir = sys.argv[1]
     if not os.path.isdir(font_dir):
diff --git a/lib/Epub/Epub.cpp b/lib/Epub/Epub.cpp
index 8a40b8af..636cfc85 100644
--- a/lib/Epub/Epub.cpp
+++ b/lib/Epub/Epub.cpp
@@ -12,6 +12,31 @@
 #include "Epub/parsers/TocNavParser.h"
 #include "Epub/parsers/TocNcxParser.h"
 
+namespace {
+constexpr int kDefaultThumbHeight = 180;
+
+bool nonEmptyFileExists(const std::string& path) {
+  if (!Storage.exists(path.c_str())) {
+    return false;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("EBP", path, file)) {
+    return false;
+  }
+  const bool nonEmpty = file.size() > 0;
+  file.close();
+  if (!nonEmpty) {
+    Storage.remove(path.c_str());
+  }
+  return nonEmpty;
+}
+
+std::string getThumbBmpPathForDimensions(const std::string& cachePath, int width, int height) {
+  return cachePath + "/thumb_" + std::to_string(width) + "x" + std::to_string(height) + ".bmp";
+}
+}  // namespace
+
 bool Epub::findContentOpfFile(std::string* contentOpfFile) const {
   const auto containerPath = "META-INF/container.xml";
   size_t containerSize;
@@ -274,7 +299,12 @@ void Epub::parseCssFiles() const {
   }
 
   // No cache yet - parse CSS files
-  for (const auto& cssPath : cssFiles) {
+  bool parsedAllCss = true;
+  size_t parsedCssFileCount = 0;
+  size_t failedCssFileIndex = 0;
+  std::string failedCssPath;
+  for (size_t cssFileIndex = 0; cssFileIndex < cssFiles.size(); ++cssFileIndex) {
+    const auto& cssPath = cssFiles[cssFileIndex];
     LOG_DBG("EBP", "Parsing CSS file: %s", cssPath.c_str());
 
     // Check heap before parsing - CSS parsing allocates heavily
@@ -318,19 +348,38 @@ void Epub::parseCssFiles() const {
       Storage.remove(tmpCssPath.c_str());
       continue;
     }
-    cssParser->loadFromStream(tempCssFile);
+    if (!cssParser->loadFromStream(tempCssFile)) {
+      failedCssFileIndex = cssFileIndex + 1;
+      failedCssPath = cssPath;
+      LOG_ERR("EBP", "CSS parsing failed for file %zu/%zu after %zu parsed files: %s", failedCssFileIndex,
+              cssFiles.size(), parsedCssFileCount, cssPath.c_str());
+      parsedAllCss = false;
+    } else {
+      ++parsedCssFileCount;
+    }
     // Explicitly close() file before calling Storage.remove()
     tempCssFile.close();
     Storage.remove(tmpCssPath.c_str());
+    if (!parsedAllCss) {
+      break;
+    }
+  }
+
+  if (!parsedAllCss) {
+    LOG_ERR("EBP",
+            "Discarding %zu partial CSS rules after parse failure in %s; CSS cache will not be written for this book",
+            cssParser->ruleCount(), failedCssPath.empty() ? "<unknown>" : failedCssPath.c_str());
+    cssParser->clear();
+    return;
   }
 
   // Save to cache for next time
   if (!cssParser->saveToCache()) {
     LOG_ERR("EBP", "Failed to save CSS rules to cache");
   }
-  cssParser->clear();
 
   LOG_DBG("EBP", "Loaded %zu CSS style rules from %zu files", cssParser->ruleCount(), cssFiles.size());
+  cssParser->clear();
 }
 
 // load in the meta data for the epub file
@@ -549,16 +598,24 @@ bool Epub::generateCoverBmp(bool cropped) const {
     if (!Storage.openFileForWrite("EBP", coverJpgTempPath, coverJpg)) {
       return false;
     }
-    readItemContentsToStream(coverImageHref, coverJpg, 1024);
+    if (!readItemContentsToStream(coverImageHref, coverJpg, 1024)) {
+      LOG_ERR("EBP", "Failed to read cover JPG item: %s", coverImageHref.c_str());
+      coverJpg.close();
+      Storage.remove(coverJpgTempPath.c_str());
+      return false;
+    }
     // Explicitly close() file before reopening for reading
     coverJpg.close();
 
     if (!Storage.openFileForRead("EBP", coverJpgTempPath, coverJpg)) {
+      Storage.remove(coverJpgTempPath.c_str());
       return false;
     }
 
     FsFile coverBmp;
     if (!Storage.openFileForWrite("EBP", getCoverBmpPath(cropped), coverBmp)) {
+      coverJpg.close();
+      Storage.remove(coverJpgTempPath.c_str());
       return false;
     }
     const bool success = JpegToBmpConverter::jpegFileToBmpStream(coverJpg, coverBmp, cropped);
@@ -583,16 +640,24 @@ bool Epub::generateCoverBmp(bool cropped) const {
     if (!Storage.openFileForWrite("EBP", coverPngTempPath, coverPng)) {
       return false;
     }
-    readItemContentsToStream(coverImageHref, coverPng, 1024);
+    if (!readItemContentsToStream(coverImageHref, coverPng, 1024)) {
+      LOG_ERR("EBP", "Failed to read cover PNG item: %s", coverImageHref.c_str());
+      coverPng.close();
+      Storage.remove(coverPngTempPath.c_str());
+      return false;
+    }
     // Explicitly close() file before reopening for reading
     coverPng.close();
 
     if (!Storage.openFileForRead("EBP", coverPngTempPath, coverPng)) {
+      Storage.remove(coverPngTempPath.c_str());
       return false;
     }
 
     FsFile coverBmp;
     if (!Storage.openFileForWrite("EBP", getCoverBmpPath(cropped), coverBmp)) {
+      coverPng.close();
+      Storage.remove(coverPngTempPath.c_str());
       return false;
     }
     const bool success = PngToBmpConverter::pngFileToBmpStream(coverPng, coverBmp, cropped);
@@ -613,12 +678,42 @@ bool Epub::generateCoverBmp(bool cropped) const {
   return false;
 }
 
-std::string Epub::getThumbBmpPath() const { return cachePath + "/thumb_[HEIGHT].bmp"; }
-std::string Epub::getThumbBmpPath(int height) const { return cachePath + "/thumb_" + std::to_string(height) + ".bmp"; }
+std::string Epub::getThumbBmpPath() const { return cachePath + "/thumb_[WIDTH]x[HEIGHT].bmp"; }
+std::string Epub::getThumbBmpPath(int height) const { return getThumbBmpPath(0, height); }
+std::string Epub::getThumbBmpPath(int width, int height) const {
+  if (height <= 0) {
+    height = kDefaultThumbHeight;
+  }
+  if (width <= 0) {
+    width = static_cast<int>((static_cast<int64_t>(height) * 3 + 2) / 5);
+  }
+  const std::string newPath = getThumbBmpPathForDimensions(cachePath, width, height);
+  if (Storage.exists(newPath.c_str())) {
+    return newPath;
+  }
+  const std::string legacyPath = cachePath + "/thumb_" + std::to_string(height) + ".bmp";
+  if (Storage.exists(legacyPath.c_str())) {
+    return legacyPath;
+  }
+  return newPath;
+}
+
+bool Epub::generateThumbBmp(int height) const { return generateThumbBmp(0, height); }
+
+bool Epub::generateThumbBmp(int width, int height) const { return generateThumbBmpInternal(width, height); }
+
+bool Epub::generateThumbBmpInternal(int width, int height) const {
+  if (height <= 0) {
+    LOG_DBG("EBP", "Using default thumb BMP height for requested dimensions: %dx%d", width, height);
+    height = kDefaultThumbHeight;
+  }
+  if (width <= 0) {
+    width = static_cast<int>((static_cast<int64_t>(height) * 3 + 2) / 5);
+  }
+  const std::string thumbPath = getThumbBmpPathForDimensions(cachePath, width, height);
 
-bool Epub::generateThumbBmp(int height) const {
   // Already generated, return true
-  if (Storage.exists(getThumbBmpPath(height).c_str())) {
+  if (nonEmptyFileExists(thumbPath)) {
     return true;
   }
 
@@ -638,21 +733,27 @@ bool Epub::generateThumbBmp(int height) const {
     if (!Storage.openFileForWrite("EBP", coverJpgTempPath, coverJpg)) {
       return false;
     }
-    readItemContentsToStream(coverImageHref, coverJpg, 1024);
+    if (!readItemContentsToStream(coverImageHref, coverJpg, 1024)) {
+      LOG_ERR("EBP", "Failed to read thumbnail JPG item: %s", coverImageHref.c_str());
+      coverJpg.close();
+      Storage.remove(coverJpgTempPath.c_str());
+      return false;
+    }
     // Explicitly close() file before reopening for reading
     coverJpg.close();
 
     if (!Storage.openFileForRead("EBP", coverJpgTempPath, coverJpg)) {
+      Storage.remove(coverJpgTempPath.c_str());
       return false;
     }
 
     FsFile thumbBmp;
-    if (!Storage.openFileForWrite("EBP", getThumbBmpPath(height), thumbBmp)) {
+    if (!Storage.openFileForWrite("EBP", thumbPath, thumbBmp)) {
+      coverJpg.close();
+      Storage.remove(coverJpgTempPath.c_str());
       return false;
     }
-    // Use smaller target size for Continue Reading card (half of screen: 240x400)
-    // Generate 1-bit BMP for fast home screen rendering (no gray passes needed)
-    int THUMB_TARGET_WIDTH = height * 0.6;
+    int THUMB_TARGET_WIDTH = width;
     int THUMB_TARGET_HEIGHT = height;
     const bool success = JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(coverJpg, thumbBmp, THUMB_TARGET_WIDTH,
                                                                              THUMB_TARGET_HEIGHT);
@@ -663,7 +764,7 @@ bool Epub::generateThumbBmp(int height) const {
 
     if (!success) {
       LOG_ERR("EBP", "Failed to generate thumb BMP from JPG cover image");
-      Storage.remove(getThumbBmpPath(height).c_str());
+      Storage.remove(thumbPath.c_str());
     }
     LOG_DBG("EBP", "Generated thumb BMP from JPG cover image, success: %s", success ? "yes" : "no");
     return success;
@@ -675,19 +776,27 @@ bool Epub::generateThumbBmp(int height) const {
     if (!Storage.openFileForWrite("EBP", coverPngTempPath, coverPng)) {
       return false;
     }
-    readItemContentsToStream(coverImageHref, coverPng, 1024);
+    if (!readItemContentsToStream(coverImageHref, coverPng, 1024)) {
+      LOG_ERR("EBP", "Failed to read thumbnail PNG item: %s", coverImageHref.c_str());
+      coverPng.close();
+      Storage.remove(coverPngTempPath.c_str());
+      return false;
+    }
     // Explicitly close() file before reopening for reading
     coverPng.close();
 
     if (!Storage.openFileForRead("EBP", coverPngTempPath, coverPng)) {
+      Storage.remove(coverPngTempPath.c_str());
       return false;
     }
 
     FsFile thumbBmp;
-    if (!Storage.openFileForWrite("EBP", getThumbBmpPath(height), thumbBmp)) {
+    if (!Storage.openFileForWrite("EBP", thumbPath, thumbBmp)) {
+      coverPng.close();
+      Storage.remove(coverPngTempPath.c_str());
       return false;
     }
-    int THUMB_TARGET_WIDTH = height * 0.6;
+    int THUMB_TARGET_WIDTH = width;
     int THUMB_TARGET_HEIGHT = height;
     const bool success =
         PngToBmpConverter::pngFileTo1BitBmpStreamWithSize(coverPng, thumbBmp, THUMB_TARGET_WIDTH, THUMB_TARGET_HEIGHT);
@@ -698,7 +807,7 @@ bool Epub::generateThumbBmp(int height) const {
 
     if (!success) {
       LOG_ERR("EBP", "Failed to generate thumb BMP from PNG cover image");
-      Storage.remove(getThumbBmpPath(height).c_str());
+      Storage.remove(thumbPath.c_str());
     }
     LOG_DBG("EBP", "Generated thumb BMP from PNG cover image, success: %s", success ? "yes" : "no");
     return success;
@@ -706,9 +815,6 @@ bool Epub::generateThumbBmp(int height) const {
     LOG_ERR("EBP", "Cover image is not a supported format, skipping thumbnail");
   }
 
-  // Write an empty bmp file to avoid generation attempts in the future
-  FsFile thumbBmp;
-  Storage.openFileForWrite("EBP", getThumbBmpPath(height), thumbBmp);
   return false;
 }
 
diff --git a/lib/Epub/Epub.h b/lib/Epub/Epub.h
index 9ffa8d37..2a28e213 100644
--- a/lib/Epub/Epub.h
+++ b/lib/Epub/Epub.h
@@ -54,8 +54,21 @@ class Epub {
   std::string getCoverBmpPath(bool cropped = false) const;
   bool generateCoverBmp(bool cropped = false) const;
   std::string getThumbBmpPath() const;
+  // Deprecated compatibility wrapper; forwards to getThumbBmpPath(0, height).
+  [[deprecated("use getThumbBmpPath(int width, int height)")]]
   std::string getThumbBmpPath(int height) const;
+  // Returns the thumbnail cache path. width <= 0 derives the default 3:5
+  // (width:height) thumbnail width from height; height <= 0 uses the default
+  // thumbnail height.
+  std::string getThumbBmpPath(int width, int height) const;
+  // Deprecated compatibility wrapper; forwards to generateThumbBmp(0, height).
+  [[deprecated("use generateThumbBmp(int width, int height)")]]
   bool generateThumbBmp(int height) const;
+  // Writes a thumbnail BMP to cache. width <= 0 derives the default 3:5
+  // (width:height) thumbnail width from height; height <= 0 uses the default
+  // thumbnail height.
+  // Returns false on missing cache/cover, unsupported image format, or conversion failure.
+  bool generateThumbBmp(int width, int height) const;
   uint8_t* readItemContentsToBytes(const std::string& itemHref, size_t* size = nullptr,
                                    bool trailingNullByte = false) const;
   bool readItemContentsToStream(const std::string& itemHref, Print& out, size_t chunkSize) const;
@@ -73,4 +86,7 @@ class Epub {
   float calculateProgress(int currentSpineIndex, float currentSpineRead) const;
   CssParser* getCssParser() const { return cssParser.get(); }
   int resolveHrefToSpineIndex(const std::string& href) const;
+
+ private:
+  bool generateThumbBmpInternal(int width, int height) const;
 };
diff --git a/lib/Epub/Epub/BookMetadataCache.cpp b/lib/Epub/Epub/BookMetadataCache.cpp
index 7e7b7791..5205ec94 100644
--- a/lib/Epub/Epub/BookMetadataCache.cpp
+++ b/lib/Epub/Epub/BookMetadataCache.cpp
@@ -10,7 +10,8 @@
 #include "FsHelpers.h"
 
 namespace {
-constexpr uint8_t BOOK_CACHE_VERSION = 5;
+constexpr uint32_t BOOK_CACHE_MAGIC = 0x425843FF;  // bytes: 0xFF, "CXB"
+constexpr uint8_t BOOK_CACHE_VERSION = 6;
 constexpr char bookBinFile[] = "/book.bin";
 constexpr char tmpSpineBinFile[] = "/spine.bin.tmp";
 constexpr char tmpTocBinFile[] = "/toc.bin.tmp";
@@ -119,8 +120,8 @@ bool BookMetadataCache::buildBookBin(const std::string& epubPath, const BookMeta
     return false;
   }
 
-  constexpr uint32_t headerASize =
-      sizeof(BOOK_CACHE_VERSION) + /* LUT Offset */ sizeof(uint32_t) + sizeof(spineCount) + sizeof(tocCount);
+  constexpr uint32_t headerASize = sizeof(BOOK_CACHE_MAGIC) + sizeof(BOOK_CACHE_VERSION) +
+                                   /* LUT Offset */ sizeof(uint32_t) + sizeof(spineCount) + sizeof(tocCount);
   const uint32_t metadataSize = metadata.title.size() + metadata.author.size() + metadata.language.size() +
                                 metadata.coverItemHref.size() + metadata.textReferenceHref.size() +
                                 sizeof(uint32_t) * 5;
@@ -128,6 +129,7 @@ bool BookMetadataCache::buildBookBin(const std::string& epubPath, const BookMeta
   const uint32_t lutOffset = headerASize + metadataSize;
 
   // Header A
+  serialization::writePod(bookFile, BOOK_CACHE_MAGIC);
   serialization::writePod(bookFile, BOOK_CACHE_VERSION);
   serialization::writePod(bookFile, lutOffset);
   serialization::writePod(bookFile, spineCount);
@@ -383,28 +385,51 @@ void BookMetadataCache::createTocEntry(const std::string& title, const std::stri
 /* ============= READING / LOADING FUNCTIONS ================ */
 
 bool BookMetadataCache::load() {
-  if (!Storage.openFileForRead("BMC", cachePath + bookBinFile, bookFile)) {
+  const auto bookBinPath = cachePath + bookBinFile;
+  if (!Storage.openFileForRead("BMC", bookBinPath, bookFile)) {
+    return false;
+  }
+
+  uint32_t magic;
+  if (!serialization::tryReadPod(bookFile, magic)) {
+    LOG_DBG("BMC", "Cache header is truncated");
+    bookFile.close();
+    Storage.remove(bookBinPath.c_str());
+    return false;
+  }
+  if (magic != BOOK_CACHE_MAGIC) {
+    LOG_DBG("BMC", "Cache magic mismatch");
+    bookFile.close();
+    Storage.remove(bookBinPath.c_str());
     return false;
   }
 
   uint8_t version;
-  serialization::readPod(bookFile, version);
+  if (!serialization::tryReadPod(bookFile, version)) {
+    LOG_DBG("BMC", "Cache version is missing");
+    bookFile.close();
+    Storage.remove(bookBinPath.c_str());
+    return false;
+  }
   if (version != BOOK_CACHE_VERSION) {
     LOG_DBG("BMC", "Cache version mismatch: expected %d, got %d", BOOK_CACHE_VERSION, version);
     // Explicit close() required: member variable persists beyond function scope
     bookFile.close();
+    Storage.remove(bookBinPath.c_str());
     return false;
   }
 
-  serialization::readPod(bookFile, lutOffset);
-  serialization::readPod(bookFile, spineCount);
-  serialization::readPod(bookFile, tocCount);
-
-  serialization::readString(bookFile, coreMetadata.title);
-  serialization::readString(bookFile, coreMetadata.author);
-  serialization::readString(bookFile, coreMetadata.language);
-  serialization::readString(bookFile, coreMetadata.coverItemHref);
-  serialization::readString(bookFile, coreMetadata.textReferenceHref);
+  if (!serialization::tryReadPod(bookFile, lutOffset) || !serialization::tryReadPod(bookFile, spineCount) ||
+      !serialization::tryReadPod(bookFile, tocCount) || !serialization::tryReadString(bookFile, coreMetadata.title) ||
+      !serialization::tryReadString(bookFile, coreMetadata.author) ||
+      !serialization::tryReadString(bookFile, coreMetadata.language) ||
+      !serialization::tryReadString(bookFile, coreMetadata.coverItemHref) ||
+      !serialization::tryReadString(bookFile, coreMetadata.textReferenceHref)) {
+    LOG_DBG("BMC", "Cache metadata is truncated");
+    bookFile.close();
+    Storage.remove(bookBinPath.c_str());
+    return false;
+  }
 
   loaded = true;
   LOG_DBG("BMC", "Loaded cache data: %d spine, %d TOC entries", spineCount, tocCount);
diff --git a/lib/Epub/Epub/BookMetadataCache.h b/lib/Epub/Epub/BookMetadataCache.h
index b7b29d18..e6826980 100644
--- a/lib/Epub/Epub/BookMetadataCache.h
+++ b/lib/Epub/Epub/BookMetadataCache.h
@@ -64,7 +64,7 @@ class BookMetadataCache {
   std::deque<SpineHrefIndexEntry> spineHrefIndex;
   bool useSpineHrefIndex = false;
 
-  static constexpr uint16_t LARGE_SPINE_THRESHOLD = 400;
+  static constexpr uint16_t LARGE_SPINE_THRESHOLD = 300;
 
   // FNV-1a 64-bit hash function
   static uint64_t fnvHash64(const std::string& s) {
diff --git a/lib/Epub/Epub/Page.cpp b/lib/Epub/Epub/Page.cpp
index d7a2722e..f9937e8c 100644
--- a/lib/Epub/Epub/Page.cpp
+++ b/lib/Epub/Epub/Page.cpp
@@ -7,6 +7,12 @@
 namespace {
 
 constexpr uint16_t MAX_PAGE_ELEMENTS = 1024;
+constexpr uint8_t MAX_TABLE_ROWS_PER_FRAGMENT = 64;
+constexpr uint8_t MAX_TABLE_CELLS_PER_ROW = 8;
+constexpr uint8_t MAX_TABLE_LINES_PER_CELL = 64;
+static_assert(TableFragmentCell::MAX_SERIALIZED_LINES == MAX_TABLE_LINES_PER_CELL);
+static_assert(TableFragmentRow::MAX_SERIALIZED_CELLS == MAX_TABLE_CELLS_PER_ROW);
+static_assert(PageTableFragment::MAX_SERIALIZED_ROWS == MAX_TABLE_ROWS_PER_FRAGMENT);
 
 template <typename Predicate>
 void renderFilteredPageElements(const std::vector<std::shared_ptr<PageElement>>& elements, GfxRenderer& renderer,
@@ -25,8 +31,10 @@ void PageLine::render(GfxRenderer& renderer, const int fontId, const int xOffset
 }
 
 bool PageLine::serialize(FsFile& file) {
-  serialization::writePod(file, xPos);
-  serialization::writePod(file, yPos);
+  if (!serialization::tryWritePod(file, xPos) || !serialization::tryWritePod(file, yPos)) {
+    LOG_ERR("PGE", "Serialization failed: could not write PageLine coordinates");
+    return false;
+  }
 
   // serialize TextBlock pointed to by PageLine
   return block->serialize(file);
@@ -35,8 +43,10 @@ bool PageLine::serialize(FsFile& file) {
 std::unique_ptr<PageLine> PageLine::deserialize(FsFile& file) {
   int16_t xPos;
   int16_t yPos;
-  serialization::readPod(file, xPos);
-  serialization::readPod(file, yPos);
+  if (!serialization::tryReadPod(file, xPos) || !serialization::tryReadPod(file, yPos)) {
+    LOG_ERR("PGE", "Deserialization failed: truncated PageLine coordinates");
+    return nullptr;
+  }
 
   auto tb = TextBlock::deserialize(file);
   if (!tb) {
@@ -58,8 +68,10 @@ void PageImage::render(GfxRenderer& renderer, const int fontId, const int xOffse
 }
 
 bool PageImage::serialize(FsFile& file) {
-  serialization::writePod(file, xPos);
-  serialization::writePod(file, yPos);
+  if (!serialization::tryWritePod(file, xPos) || !serialization::tryWritePod(file, yPos)) {
+    LOG_ERR("PGE", "Serialization failed: could not write PageImage coordinates");
+    return false;
+  }
 
   // serialize ImageBlock
   return imageBlock->serialize(file);
@@ -68,8 +80,10 @@ bool PageImage::serialize(FsFile& file) {
 std::unique_ptr<PageImage> PageImage::deserialize(FsFile& file) {
   int16_t xPos;
   int16_t yPos;
-  serialization::readPod(file, xPos);
-  serialization::readPod(file, yPos);
+  if (!serialization::tryReadPod(file, xPos) || !serialization::tryReadPod(file, yPos)) {
+    LOG_ERR("PGE", "Deserialization failed: truncated PageImage coordinates");
+    return nullptr;
+  }
 
   auto ib = ImageBlock::deserialize(file);
   if (!ib) {
@@ -85,14 +99,56 @@ std::unique_ptr<PageImage> PageImage::deserialize(FsFile& file) {
   return std::unique_ptr<PageImage>(pageImage);
 }
 
+void PageHorizontalRule::render(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) {
+  (void)fontId;
+  if (width == 0 || thickness == 0) {
+    return;
+  }
+
+  renderer.drawLine(xPos + xOffset, yPos + yOffset, xPos + xOffset + width - 1, yPos + yOffset, thickness, true);
+}
+
+bool PageHorizontalRule::serialize(FsFile& file) {
+  return serialization::tryWritePod(file, xPos) && serialization::tryWritePod(file, yPos) &&
+         serialization::tryWritePod(file, width) && serialization::tryWritePod(file, thickness);
+}
+
+std::unique_ptr<PageHorizontalRule> PageHorizontalRule::deserialize(FsFile& file) {
+  int16_t xPos = 0;
+  int16_t yPos = 0;
+  uint16_t width = 0;
+  uint8_t thickness = 0;
+  if (!serialization::tryReadPod(file, xPos) || !serialization::tryReadPod(file, yPos) ||
+      !serialization::tryReadPod(file, width) || !serialization::tryReadPod(file, thickness)) {
+    LOG_ERR("PGE", "Deserialization failed: truncated PageHorizontalRule metadata");
+    return nullptr;
+  }
+
+  if (width == 0 || thickness == 0) {
+    LOG_ERR("PGE", "Deserialization failed: invalid horizontal rule metadata (width=%u thickness=%u)", width,
+            thickness);
+    return nullptr;
+  }
+
+  auto* rule = new (std::nothrow) PageHorizontalRule(width, thickness, xPos, yPos);
+  if (!rule) {
+    LOG_ERR("PGE", "Deserialization failed: could not allocate PageHorizontalRule");
+    return nullptr;
+  }
+  return std::unique_ptr<PageHorizontalRule>(rule);
+}
+
 bool TableFragmentCell::serialize(FsFile& file) const {
-  if (lines.size() > MAX_SERIALIZED_LINES) {
+  if (lines.size() > MAX_TABLE_LINES_PER_CELL) {
     LOG_ERR("PTB", "Serialization failed: cell line count %u exceeds maximum", static_cast<uint32_t>(lines.size()));
     return false;
   }
 
-  serialization::writePod(file, isHeader);
-  serialization::writePod(file, static_cast<uint8_t>(lines.size()));
+  if (!serialization::tryWritePod(file, isHeader) ||
+      !serialization::tryWritePod(file, static_cast<uint8_t>(lines.size()))) {
+    LOG_ERR("PTB", "Serialization failed: could not write table cell header");
+    return false;
+  }
   for (const auto& line : lines) {
     if (!line || !line->serialize(file)) {
       LOG_ERR("PTB", "Serialization failed: invalid table cell line");
@@ -104,9 +160,11 @@ bool TableFragmentCell::serialize(FsFile& file) const {
 
 bool TableFragmentCell::deserialize(FsFile& file, TableFragmentCell& outCell) {
   uint8_t lineCount = 0;
-  serialization::readPod(file, outCell.isHeader);
-  serialization::readPod(file, lineCount);
-  if (lineCount > MAX_SERIALIZED_LINES) {
+  if (!serialization::tryReadPod(file, outCell.isHeader) || !serialization::tryReadPod(file, lineCount)) {
+    LOG_ERR("PTB", "Deserialization failed: truncated table cell metadata");
+    return false;
+  }
+  if (lineCount > MAX_TABLE_LINES_PER_CELL) {
     LOG_ERR("PTB", "Deserialization failed: cell line count %u exceeds maximum", lineCount);
     return false;
   }
@@ -125,14 +183,16 @@ bool TableFragmentCell::deserialize(FsFile& file, TableFragmentCell& outCell) {
 }
 
 bool TableFragmentRow::serialize(FsFile& file) const {
-  if (cells.size() > MAX_SERIALIZED_CELLS) {
+  if (cells.size() > MAX_TABLE_CELLS_PER_ROW) {
     LOG_ERR("PTB", "Serialization failed: row cell count %u exceeds maximum", static_cast<uint32_t>(cells.size()));
     return false;
   }
 
-  serialization::writePod(file, height);
-  serialization::writePod(file, headerSeparator);
-  serialization::writePod(file, static_cast<uint8_t>(cells.size()));
+  if (!serialization::tryWritePod(file, height) || !serialization::tryWritePod(file, headerSeparator) ||
+      !serialization::tryWritePod(file, static_cast<uint8_t>(cells.size()))) {
+    LOG_ERR("PTB", "Serialization failed: could not write table row metadata");
+    return false;
+  }
   for (const auto& cell : cells) {
     if (!cell.serialize(file)) {
       return false;
@@ -143,10 +203,12 @@ bool TableFragmentRow::serialize(FsFile& file) const {
 
 bool TableFragmentRow::deserialize(FsFile& file, TableFragmentRow& outRow) {
   uint8_t cellCount = 0;
-  serialization::readPod(file, outRow.height);
-  serialization::readPod(file, outRow.headerSeparator);
-  serialization::readPod(file, cellCount);
-  if (cellCount > MAX_SERIALIZED_CELLS) {
+  if (!serialization::tryReadPod(file, outRow.height) || !serialization::tryReadPod(file, outRow.headerSeparator) ||
+      !serialization::tryReadPod(file, cellCount)) {
+    LOG_ERR("PTB", "Deserialization failed: truncated table row metadata");
+    return false;
+  }
+  if (cellCount > MAX_TABLE_CELLS_PER_ROW) {
     LOG_ERR("PTB", "Deserialization failed: row cell count %u exceeds maximum", cellCount);
     return false;
   }
@@ -216,18 +278,18 @@ void PageTableFragment::render(GfxRenderer& renderer, const int fontId, const in
 }
 
 bool PageTableFragment::serialize(FsFile& file) {
-  if (rows.size() > MAX_SERIALIZED_ROWS) {
+  if (rows.size() > MAX_TABLE_ROWS_PER_FRAGMENT) {
     LOG_ERR("PTB", "Serialization failed: fragment row count %u exceeds maximum", static_cast<uint32_t>(rows.size()));
     return false;
   }
 
-  serialization::writePod(file, xPos);
-  serialization::writePod(file, yPos);
-  serialization::writePod(file, width);
-  serialization::writePod(file, columnCount);
-  serialization::writePod(file, cellPadding);
-  serialization::writePod(file, lineHeight);
-  serialization::writePod(file, static_cast<uint8_t>(rows.size()));
+  if (!serialization::tryWritePod(file, xPos) || !serialization::tryWritePod(file, yPos) ||
+      !serialization::tryWritePod(file, width) || !serialization::tryWritePod(file, columnCount) ||
+      !serialization::tryWritePod(file, cellPadding) || !serialization::tryWritePod(file, lineHeight) ||
+      !serialization::tryWritePod(file, static_cast<uint8_t>(rows.size()))) {
+    LOG_ERR("PTB", "Serialization failed: could not write fragment metadata");
+    return false;
+  }
   for (const auto& row : rows) {
     if (!row.serialize(file)) {
       return false;
@@ -244,16 +306,16 @@ std::unique_ptr<PageTableFragment> PageTableFragment::deserialize(FsFile& file)
   uint8_t cellPadding = 0;
   uint16_t lineHeight = 0;
   uint8_t rowCount = 0;
-  serialization::readPod(file, xPos);
-  serialization::readPod(file, yPos);
-  serialization::readPod(file, width);
-  serialization::readPod(file, columnCount);
-  serialization::readPod(file, cellPadding);
-  serialization::readPod(file, lineHeight);
-  serialization::readPod(file, rowCount);
-
-  if (rowCount == 0 || rowCount > MAX_SERIALIZED_ROWS || columnCount == 0 ||
-      columnCount > TableFragmentRow::MAX_SERIALIZED_CELLS || width < 2 || lineHeight == 0) {
+  if (!serialization::tryReadPod(file, xPos) || !serialization::tryReadPod(file, yPos) ||
+      !serialization::tryReadPod(file, width) || !serialization::tryReadPod(file, columnCount) ||
+      !serialization::tryReadPod(file, cellPadding) || !serialization::tryReadPod(file, lineHeight) ||
+      !serialization::tryReadPod(file, rowCount)) {
+    LOG_ERR("PTB", "Deserialization failed: truncated fragment metadata");
+    return nullptr;
+  }
+
+  if (rowCount == 0 || rowCount > MAX_TABLE_ROWS_PER_FRAGMENT || columnCount == 0 ||
+      columnCount > MAX_TABLE_CELLS_PER_ROW || width < 2 || lineHeight == 0) {
     LOG_ERR("PTB", "Deserialization failed: invalid fragment metadata (rows=%u cols=%u width=%u lineHeight=%u)",
             rowCount, columnCount, width, lineHeight);
     return nullptr;
@@ -294,11 +356,21 @@ void Page::renderImages(GfxRenderer& renderer, const int fontId, const int xOffs
 
 bool Page::serialize(FsFile& file) const {
   const uint16_t count = elements.size();
-  serialization::writePod(file, count);
+  if (elements.size() > MAX_PAGE_ELEMENTS) {
+    LOG_ERR("PGE", "Serialization failed: element count %u exceeds maximum", static_cast<uint32_t>(elements.size()));
+    return false;
+  }
+  if (!serialization::tryWritePod(file, count)) {
+    LOG_ERR("PGE", "Serialization failed: could not write element count");
+    return false;
+  }
 
   for (const auto& el : elements) {
     // Use getTag() method to determine type
-    serialization::writePod(file, static_cast<uint8_t>(el->getTag()));
+    if (!serialization::tryWritePod(file, static_cast<uint8_t>(el->getTag()))) {
+      LOG_ERR("PGE", "Serialization failed: could not write element tag");
+      return false;
+    }
 
     if (!el->serialize(file)) {
       return false;
@@ -307,7 +379,10 @@ bool Page::serialize(FsFile& file) const {
 
   // Serialize footnotes (clamp to MAX_FOOTNOTES_PER_PAGE to match addFootnote/deserialize limits)
   const uint16_t fnCount = std::min<uint16_t>(footnotes.size(), MAX_FOOTNOTES_PER_PAGE);
-  serialization::writePod(file, fnCount);
+  if (!serialization::tryWritePod(file, fnCount)) {
+    LOG_ERR("PGE", "Failed to write footnote count");
+    return false;
+  }
   for (uint16_t i = 0; i < fnCount; i++) {
     const auto& fn = footnotes[i];
     if (file.write(fn.number, sizeof(fn.number)) != sizeof(fn.number) ||
@@ -329,7 +404,10 @@ std::unique_ptr<Page> Page::deserialize(FsFile& file) {
   auto page = std::unique_ptr<Page>(rawPage);
 
   uint16_t count;
-  serialization::readPod(file, count);
+  if (!serialization::tryReadPod(file, count)) {
+    LOG_ERR("PGE", "Deserialization failed: could not read element count");
+    return nullptr;
+  }
   if (count > MAX_PAGE_ELEMENTS) {
     LOG_ERR("PGE", "Deserialization failed: element count %u exceeds maximum", count);
     return nullptr;
@@ -338,7 +416,10 @@ std::unique_ptr<Page> Page::deserialize(FsFile& file) {
 
   for (uint16_t i = 0; i < count; i++) {
     uint8_t tag;
-    serialization::readPod(file, tag);
+    if (!serialization::tryReadPod(file, tag)) {
+      LOG_ERR("PGE", "Deserialization failed: truncated element tag");
+      return nullptr;
+    }
 
     if (tag == TAG_PageLine) {
       auto pl = PageLine::deserialize(file);
@@ -358,6 +439,12 @@ std::unique_ptr<Page> Page::deserialize(FsFile& file) {
         return nullptr;
       }
       page->elements.push_back(std::move(fragment));
+    } else if (tag == TAG_PageHorizontalRule) {
+      auto rule = PageHorizontalRule::deserialize(file);
+      if (!rule) {
+        return nullptr;
+      }
+      page->elements.push_back(std::move(rule));
     } else {
       LOG_ERR("PGE", "Deserialization failed: Unknown tag %u", tag);
       return nullptr;
@@ -366,7 +453,10 @@ std::unique_ptr<Page> Page::deserialize(FsFile& file) {
 
   // Deserialize footnotes
   uint16_t fnCount;
-  serialization::readPod(file, fnCount);
+  if (!serialization::tryReadPod(file, fnCount)) {
+    LOG_ERR("PGE", "Failed to read footnote count");
+    return nullptr;
+  }
   if (fnCount > MAX_FOOTNOTES_PER_PAGE) {
     LOG_ERR("PGE", "Invalid footnote count %u", fnCount);
     return nullptr;
diff --git a/lib/Epub/Epub/Page.h b/lib/Epub/Epub/Page.h
index c0755d90..06d1e6a7 100644
--- a/lib/Epub/Epub/Page.h
+++ b/lib/Epub/Epub/Page.h
@@ -14,6 +14,7 @@ enum PageElementTag : uint8_t {
   TAG_PageLine = 1,
   TAG_PageImage = 2,  // New tag
   TAG_PageTableFragment = 3,
+  TAG_PageHorizontalRule = 4,
 };
 
 // represents something that has been added to a page
@@ -56,6 +57,20 @@ class PageImage final : public PageElement {
   const ImageBlock& getImageBlock() const { return *imageBlock; }
 };
 
+class PageHorizontalRule final : public PageElement {
+  uint16_t width;
+  uint8_t thickness;
+
+ public:
+  PageHorizontalRule(uint16_t width, uint8_t thickness, const int16_t xPos, const int16_t yPos)
+      : PageElement(xPos, yPos), width(width), thickness(thickness) {}
+
+  void render(GfxRenderer& renderer, int fontId, int xOffset, int yOffset) override;
+  bool serialize(FsFile& file) override;
+  PageElementTag getTag() const override { return TAG_PageHorizontalRule; }
+  static std::unique_ptr<PageHorizontalRule> deserialize(FsFile& file);
+};
+
 struct TableFragmentCell {
   static constexpr uint8_t MAX_SERIALIZED_LINES = 64;
   bool isHeader = false;
diff --git a/lib/Epub/Epub/ParsedText.cpp b/lib/Epub/Epub/ParsedText.cpp
index 79e827dd..d40e5f47 100644
--- a/lib/Epub/Epub/ParsedText.cpp
+++ b/lib/Epub/Epub/ParsedText.cpp
@@ -18,6 +18,8 @@ namespace {
 // Soft hyphen byte pattern used throughout EPUBs (UTF-8 for U+00AD).
 constexpr char SOFT_HYPHEN_UTF8[] = "\xC2\xAD";
 constexpr size_t SOFT_HYPHEN_BYTES = 2;
+constexpr size_t PATHOLOGICAL_TOKEN_MIN_BYTES = 128;
+constexpr size_t PATHOLOGICAL_TOKEN_SCAN_BYTES = 256;
 
 // Returns the first rendered codepoint of a word (skipping leading soft hyphens).
 uint32_t firstCodepoint(const std::string& word) {
@@ -43,6 +45,30 @@ uint32_t lastCodepoint(const std::string& word) {
 
 bool containsSoftHyphen(const std::string& word) { return word.find(SOFT_HYPHEN_UTF8) != std::string::npos; }
 
+bool isBase64LikeChar(const char c) {
+  return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '+' || c == '/' || c == '=';
+}
+
+bool isPathologicalUnbrokenToken(const std::string& word) {
+  if (word.size() < PATHOLOGICAL_TOKEN_MIN_BYTES) {
+    return false;
+  }
+
+  const size_t scanBytes = std::min(word.size(), PATHOLOGICAL_TOKEN_SCAN_BYTES);
+  size_t base64LikeCount = 0;
+  for (size_t i = 0; i < scanBytes; ++i) {
+    const char c = word[i];
+    if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
+      return false;
+    }
+    if (isBase64LikeChar(c)) {
+      ++base64LikeCount;
+    }
+  }
+
+  return base64LikeCount * 100 >= scanBytes * 95;
+}
+
 // Removes every soft hyphen in-place so rendered glyphs match measured widths.
 void stripSoftHyphensInPlace(std::string& word) {
   size_t pos = 0;
@@ -108,7 +134,7 @@ bool isWordCharacter(uint32_t cp) {
 }  // namespace
 
 void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle, const bool underline,
-                         const bool attachToPrevious) {
+                         const bool attachToPrevious, const bool backgroundBlack) {
   if (word.empty()) return;
 
   EpdFontFamily::Style baseStyle = fontStyle;
@@ -123,6 +149,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
     wordContinues.push_back(false);
     wordIsBionicSuffix.push_back(false);
     wordIsGuideDot.push_back(true);
+    wordBackgroundBlack.push_back(false);
   }
 
   // Already-bold text should stay fully bold; bionic splitting would make its suffix regular later.
@@ -132,6 +159,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
     wordContinues.push_back(attachToPrevious);
     wordIsBionicSuffix.push_back(false);
     wordIsGuideDot.push_back(false);
+    wordBackgroundBlack.push_back(backgroundBlack);
     return;
   }
 
@@ -159,6 +187,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
     wordContinues.reserve(newCapacity);
     wordIsBionicSuffix.reserve(newCapacity);
     wordIsGuideDot.reserve(newCapacity);
+    wordBackgroundBlack.reserve(newCapacity);
   }
 
   // Lambda helper to process and push individual sub-segments of the string
@@ -171,6 +200,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
       wordContinues.push_back(attach);
       wordIsBionicSuffix.push_back(false);
       wordIsGuideDot.push_back(false);
+      wordBackgroundBlack.push_back(backgroundBlack);
     } else {
       size_t charCount = 0;
       const unsigned char* countPtr = reinterpret_cast<const unsigned char*>(segment.data());
@@ -193,6 +223,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
         wordContinues.push_back(attach);
         wordIsBionicSuffix.push_back(false);
         wordIsGuideDot.push_back(false);
+        wordBackgroundBlack.push_back(backgroundBlack);
       } else {
         countPtr = reinterpret_cast<const unsigned char*>(segment.data());
         for (size_t i = 0; i < targetBoldChars; ++i) {
@@ -206,6 +237,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
         wordContinues.push_back(attach);
         wordIsBionicSuffix.push_back(false);
         wordIsGuideDot.push_back(false);
+        wordBackgroundBlack.push_back(backgroundBlack);
 
         // Regular suffix - marked so extractLine can merge it back into one TextBlock entry
         words.emplace_back(segment.substr(splitByteOffset));
@@ -213,6 +245,7 @@ void ParsedText::addWord(std::string word, const EpdFontFamily::Style fontStyle,
         wordContinues.push_back(true);
         wordIsBionicSuffix.push_back(true);
         wordIsGuideDot.push_back(false);
+        wordBackgroundBlack.push_back(backgroundBlack);
       }
     }
   };
@@ -264,6 +297,23 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
   // Apply fixed transforms before any per-line layout work.
   applyParagraphIndent();
 
+  // Ensure SD card font glyph metrics are loaded before measuring word widths.
+  // For flash-based fonts isSdCardFont() returns false and this block is skipped
+  // entirely — no heap allocation. For SD card fonts this reads glyph metadata
+  // (advanceX only, no bitmaps) for all unique codepoints in this paragraph so
+  // that calculateWordWidths() can measure text without on-demand SD I/O.
+  if (renderer.isSdCardFont(fontId)) {
+    // Style mask: only ask the SD font to load advances for styles actually
+    // used in this paragraph. Style index is the low two bits (regular/bold/
+    // italic/bold-italic); the underline bit is irrelevant to advance metrics.
+    uint8_t styleMask = 0;
+    for (auto s : wordStyles) {
+      styleMask |= static_cast<uint8_t>(1u << (static_cast<uint8_t>(s) & 0x03));
+    }
+    if (styleMask == 0) styleMask = 0x01;  // defensive: regular only
+    renderer.ensureSdCardFontReady(fontId, words, hyphenationEnabled, styleMask);
+  }
+
   const int pageWidth = viewportWidth;
   auto wordWidths = calculateWordWidths(renderer, fontId);
 
@@ -288,6 +338,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
     wordContinues.erase(wordContinues.begin(), wordContinues.begin() + consumed);
     wordIsBionicSuffix.erase(wordIsBionicSuffix.begin(), wordIsBionicSuffix.begin() + consumed);
     wordIsGuideDot.erase(wordIsGuideDot.begin(), wordIsGuideDot.begin() + consumed);
+    wordBackgroundBlack.erase(wordBackgroundBlack.begin(), wordBackgroundBlack.begin() + consumed);
   }
 }
 
@@ -540,6 +591,10 @@ bool ParsedText::hyphenateWordAtIndex(const size_t wordIndex, const int availabl
   const std::string& word = words[wordIndex];
   const auto style = wordStyles[wordIndex];
 
+  if (allowFallbackBreaks && isPathologicalUnbrokenToken(word)) {
+    return splitPathologicalTokenAtIndex(wordIndex, availableWidth, renderer, fontId, wordWidths);
+  }
+
   // Collect candidate breakpoints (byte offsets and hyphen requirements).
   auto breakInfos = Hyphenator::breakOffsets(word, allowFallbackBreaks);
   if (breakInfos.empty()) {
@@ -583,6 +638,7 @@ bool ParsedText::hyphenateWordAtIndex(const size_t wordIndex, const int availabl
   // Insert the remainder word (with matching style and continuation flag) directly after the prefix.
   words.insert(words.begin() + wordIndex + 1, remainder);
   wordStyles.insert(wordStyles.begin() + wordIndex + 1, style);
+  wordBackgroundBlack.insert(wordBackgroundBlack.begin() + wordIndex + 1, wordBackgroundBlack[wordIndex]);
   // The hyphen remainder is neither a bionic suffix nor a guide dot - it starts fresh on the next line.
   wordIsBionicSuffix.insert(wordIsBionicSuffix.begin() + wordIndex + 1, false);
   wordIsGuideDot.insert(wordIsGuideDot.begin() + wordIndex + 1, false);
@@ -616,6 +672,60 @@ bool ParsedText::hyphenateWordAtIndex(const size_t wordIndex, const int availabl
   return true;
 }
 
+bool ParsedText::splitPathologicalTokenAtIndex(const size_t wordIndex, const int availableWidth,
+                                               const GfxRenderer& renderer, const int fontId,
+                                               std::vector<uint16_t>& wordWidths) {
+  if (availableWidth <= 0 || wordIndex >= words.size() || wordIndex >= wordWidths.size()) {
+    return false;
+  }
+
+  const std::string& word = words[wordIndex];
+  if (word.size() < 2) {
+    return false;
+  }
+
+  const auto style = wordStyles[wordIndex];
+  size_t low = 1;
+  size_t high = std::min(word.size() - 1, PATHOLOGICAL_TOKEN_SCAN_BYTES);
+  size_t chosenOffset = 0;
+  int chosenWidth = -1;
+  std::string prefix;
+  prefix.reserve(high);
+
+  while (low <= high) {
+    const size_t mid = low + (high - low) / 2;
+    prefix.assign(word.data(), mid);
+    const int prefixWidth = measureWordWidth(renderer, fontId, prefix, style);
+    if (prefixWidth <= availableWidth) {
+      chosenOffset = mid;
+      chosenWidth = prefixWidth;
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+
+  if (chosenOffset == 0) {
+    return false;
+  }
+
+  std::string remainder = word.substr(chosenOffset);
+  words[wordIndex].resize(chosenOffset);
+  words.insert(words.begin() + wordIndex + 1, remainder);
+  wordStyles.insert(wordStyles.begin() + wordIndex + 1, style);
+  wordBackgroundBlack.insert(wordBackgroundBlack.begin() + wordIndex + 1, wordBackgroundBlack[wordIndex]);
+  wordIsBionicSuffix.insert(wordIsBionicSuffix.begin() + wordIndex + 1, false);
+  wordIsGuideDot.insert(wordIsGuideDot.begin() + wordIndex + 1, false);
+  wordContinues.insert(wordContinues.begin() + wordIndex + 1, false);
+
+  wordWidths[wordIndex] = static_cast<uint16_t>(chosenWidth);
+  const uint16_t remainderWidth = remainder.size() >= PATHOLOGICAL_TOKEN_MIN_BYTES
+                                      ? std::numeric_limits<uint16_t>::max()
+                                      : measureWordWidth(renderer, fontId, remainder, style);
+  wordWidths.insert(wordWidths.begin() + wordIndex + 1, remainderWidth);
+  return true;
+}
+
 void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const std::vector<uint16_t>& wordWidths,
                              const std::vector<bool>& continuesVec, const std::vector<size_t>& lineBreakIndices,
                              const std::function<void(std::shared_ptr<TextBlock>)>& processLine,
@@ -653,6 +763,9 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
           renderer.getSpaceAdvance(fontId, lastCodepoint(words[lastBreakAt + wordIdx - 1]),
                                    firstCodepoint(words[lastBreakAt + wordIdx]), wordStyles[lastBreakAt + wordIdx - 1]);
     } else if (wordIdx > 0 && continuesVec[lastBreakAt + wordIdx]) {
+      if (words[lastBreakAt + wordIdx] == " ") {
+        actualGapCount++;
+      }
       // Cross-boundary kerning for continuation words (e.g. nonbreaking spaces, attached punctuation)
       totalNaturalGaps +=
           renderer.getKerning(fontId, lastCodepoint(words[lastBreakAt + wordIdx - 1]),
@@ -694,6 +807,10 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
       advance +=
           renderer.getKerning(fontId, lastCodepoint(words[lastBreakAt + wordIdx]),
                               firstCodepoint(words[lastBreakAt + wordIdx + 1]), wordStyles[lastBreakAt + wordIdx]);
+      if (words[lastBreakAt + wordIdx] == " " && continuesVec[lastBreakAt + wordIdx] &&
+          blockStyle.alignment == CssTextAlign::Justify && !isLastLine) {
+        advance += justifyExtra;
+      }
       xpos += advance;
     } else {
       int gap = 0;
@@ -709,65 +826,88 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
     }
   }
 
-  // Build line data by moving from the original vectors using index range
-  std::vector<std::string> lineWords(std::make_move_iterator(words.begin() + lastBreakAt),
-                                     std::make_move_iterator(words.begin() + lineBreak));
-  std::vector<EpdFontFamily::Style> lineWordStyles(wordStyles.begin() + lastBreakAt, wordStyles.begin() + lineBreak);
-
-  for (auto& word : lineWords) {
-    if (containsSoftHyphen(word)) {
-      stripSoftHyphensInPlace(word);
+  bool lineHasBionicSplit = false;
+  bool lineHasGuideDot = false;
+  for (size_t i = 0; i < lineWordCount; i++) {
+    if (wordIsBionicSuffix[lastBreakAt + i]) {
+      lineHasBionicSplit = true;
+    }
+    if (wordIsGuideDot[lastBreakAt + i]) {
+      lineHasGuideDot = true;
+    }
+    if (lineHasBionicSplit && lineHasGuideDot) {
+      break;
     }
   }
 
   // Merge bionic suffix tokens and guide dot tokens back into their preceding word entry so each
   // original word occupies one TextBlock slot. Both splits are recorded as per-word annotations
   // applied at render time, cutting the token count significantly when either feature is active.
+  // Bionic boundary/suffix and guide-dot vectors stay empty when this line has none.
   std::vector<std::string> outWords;
   std::vector<int16_t> outXPos;
   std::vector<EpdFontFamily::Style> outStyles;
   std::vector<uint8_t> outBoundaries;
   std::vector<uint16_t> outSuffixX;
   std::vector<uint16_t> outGuideDotXOffset;
+  std::vector<uint8_t> outBackgroundBlack;
   outWords.reserve(lineWordCount);
   outXPos.reserve(lineWordCount);
   outStyles.reserve(lineWordCount);
-  outBoundaries.reserve(lineWordCount);
-  outSuffixX.reserve(lineWordCount);
-  outGuideDotXOffset.reserve(lineWordCount);
+  if (lineHasBionicSplit) {
+    outBoundaries.reserve(lineWordCount);
+    outSuffixX.reserve(lineWordCount);
+  }
+  if (lineHasGuideDot) {
+    outGuideDotXOffset.reserve(lineWordCount);
+  }
+  outBackgroundBlack.reserve(lineWordCount);
 
   for (size_t i = 0; i < lineWordCount; i++) {
-    if (wordIsBionicSuffix[lastBreakAt + i] && !outWords.empty()) {
+    const size_t sourceIndex = lastBreakAt + i;
+    std::string& sourceWord = words[sourceIndex];
+    if (containsSoftHyphen(sourceWord)) {
+      stripSoftHyphensInPlace(sourceWord);
+    }
+
+    if (wordIsBionicSuffix[sourceIndex] && !outWords.empty()) {
       // Bionic suffix: merge string into the preceding bold-prefix entry.
-      outWords.back() += lineWords[i];
-    } else if (wordIsGuideDot[lastBreakAt + i] && !outWords.empty()) {
+      outWords.back() += sourceWord;
+    } else if (wordIsGuideDot[sourceIndex] && !outWords.empty()) {
       // Guide dot: annotate the preceding word entry with the dot's pixel offset.
       // Offset is relative to that word's x so render can place it without extra data.
-      outGuideDotXOffset.back() = static_cast<uint16_t>(lineXPos[i] - outXPos.back());
+      if (lineHasGuideDot) {
+        outGuideDotXOffset.back() = static_cast<uint16_t>(lineXPos[i] - outXPos.back());
+      }
     } else {
       // Normal word: check for a following bionic suffix to record the byte boundary.
       uint8_t boundary = 0;
       uint16_t suffixX = 0;
-      if (i + 1 < lineWordCount && wordIsBionicSuffix[lastBreakAt + i + 1]) {
-        boundary = static_cast<uint8_t>(std::min(lineWords[i].size(), size_t{255}));
+      if (i + 1 < lineWordCount && wordIsBionicSuffix[sourceIndex + 1]) {
+        boundary = static_cast<uint8_t>(std::min(sourceWord.size(), size_t{255}));
         // Suffix x offset = layout-time advance of the bold prefix, already known from xpos table.
         suffixX = static_cast<uint16_t>(lineXPos[i + 1] - lineXPos[i]);
       }
-      outWords.push_back(std::move(lineWords[i]));
+      outWords.push_back(std::move(sourceWord));
       outXPos.push_back(lineXPos[i]);
       // For bionic entries with a suffix, strip BOLD from the stored style.
       // Render re-applies it to the prefix portion only, via the boundary field.
       const EpdFontFamily::Style storedStyle =
-          boundary > 0 ? static_cast<EpdFontFamily::Style>(lineWordStyles[i] & ~EpdFontFamily::BOLD)
-                       : lineWordStyles[i];
+          boundary > 0 ? static_cast<EpdFontFamily::Style>(wordStyles[sourceIndex] & ~EpdFontFamily::BOLD)
+                       : wordStyles[sourceIndex];
       outStyles.push_back(storedStyle);
-      outBoundaries.push_back(boundary);
-      outSuffixX.push_back(suffixX);
-      outGuideDotXOffset.push_back(0);  // filled in later if a guide dot follows
+      if (lineHasBionicSplit) {
+        outBoundaries.push_back(boundary);
+        outSuffixX.push_back(suffixX);
+      }
+      if (lineHasGuideDot) {
+        outGuideDotXOffset.push_back(0);  // filled in later if a guide dot follows
+      }
+      outBackgroundBlack.push_back(wordBackgroundBlack[sourceIndex]);
     }
   }
 
   processLine(std::make_shared<TextBlock>(std::move(outWords), std::move(outXPos), std::move(outStyles),
                                           std::move(outBoundaries), std::move(outSuffixX),
-                                          std::move(outGuideDotXOffset), blockStyle));
+                                          std::move(outGuideDotXOffset), std::move(outBackgroundBlack), blockStyle));
 }
diff --git a/lib/Epub/Epub/ParsedText.h b/lib/Epub/Epub/ParsedText.h
index 3868909e..c38ca7d1 100644
--- a/lib/Epub/Epub/ParsedText.h
+++ b/lib/Epub/Epub/ParsedText.h
@@ -18,6 +18,7 @@ class ParsedText {
   std::vector<bool> wordContinues;       // true = word attaches to previous (no space before it)
   std::vector<bool> wordIsBionicSuffix;  // true = token is the regular tail of a bionic bold-prefix split
   std::vector<bool> wordIsGuideDot;      // true = token is a guide dot (U+00B7) inserted between words
+  std::vector<uint8_t> wordBackgroundBlack;
   bool extraParagraphSpacing;
   bool forceParagraphIndents;
   bool hyphenationEnabled;
@@ -32,6 +33,8 @@ class ParsedText {
                                                   std::vector<uint16_t>& wordWidths, std::vector<bool>& continuesVec);
   bool hyphenateWordAtIndex(size_t wordIndex, int availableWidth, const GfxRenderer& renderer, int fontId,
                             std::vector<uint16_t>& wordWidths, bool allowFallbackBreaks);
+  bool splitPathologicalTokenAtIndex(size_t wordIndex, int availableWidth, const GfxRenderer& renderer, int fontId,
+                                     std::vector<uint16_t>& wordWidths);
   void extractLine(size_t breakIndex, int pageWidth, const std::vector<uint16_t>& wordWidths,
                    const std::vector<bool>& continuesVec, const std::vector<size_t>& lineBreakIndices,
                    const std::function<void(std::shared_ptr<TextBlock>)>& processLine, const GfxRenderer& renderer,
@@ -50,7 +53,8 @@ class ParsedText {
         blockStyle(blockStyle) {}
   ~ParsedText() = default;
 
-  void addWord(std::string word, EpdFontFamily::Style fontStyle, bool underline = false, bool attachToPrevious = false);
+  void addWord(std::string word, EpdFontFamily::Style fontStyle, bool underline = false, bool attachToPrevious = false,
+               bool backgroundBlack = false);
   void setBlockStyle(const BlockStyle& blockStyle) { this->blockStyle = blockStyle; }
   BlockStyle& getBlockStyle() { return blockStyle; }
   size_t size() const { return words.size(); }
diff --git a/lib/Epub/Epub/Section.cpp b/lib/Epub/Epub/Section.cpp
index fd79d2f0..e992cf09 100644
--- a/lib/Epub/Epub/Section.cpp
+++ b/lib/Epub/Epub/Section.cpp
@@ -1,7 +1,9 @@
 #include "Section.h"
 
+#include <Arduino.h>
 #include <HalStorage.h>
 #include <Logging.h>
+#include <MemoryBudget.h>
 #include <Serialization.h>
 
 #include "Epub/css/CssParser.h"
@@ -10,15 +12,18 @@
 #include "parsers/ChapterHtmlSlimParser.h"
 
 namespace {
-constexpr uint8_t SECTION_FILE_VERSION = 29;
-constexpr uint32_t HEADER_SIZE = sizeof(uint8_t) + sizeof(int) + sizeof(float) + sizeof(bool) + sizeof(bool) +
-                                 sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint16_t) +
-                                 sizeof(bool) + sizeof(bool) + sizeof(uint8_t) + sizeof(bool) + sizeof(bool) +
-                                 sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t);
+constexpr uint32_t SECTION_CACHE_MAGIC = 0x535843FF;  // bytes: 0xFF, "CXS"
+constexpr uint8_t SECTION_FILE_VERSION = 36;
+constexpr uint32_t HEADER_SIZE = sizeof(SECTION_CACHE_MAGIC) + sizeof(uint8_t) + sizeof(int) + sizeof(float) +
+                                 sizeof(bool) + sizeof(bool) + sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint16_t) +
+                                 sizeof(uint16_t) + sizeof(bool) + sizeof(bool) + sizeof(uint8_t) + sizeof(bool) +
+                                 sizeof(bool) + sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) +
+                                 sizeof(uint32_t);
 
 struct PageLutEntry {
   uint32_t fileOffset;
   uint16_t paragraphIndex;
+  uint16_t listItemIndex;
 };
 }  // namespace
 
@@ -33,13 +38,14 @@ uint32_t Section::onPageComplete(std::unique_ptr<Page> page) {
     LOG_ERR("SCT", "Failed to serialize page %d", pageCount);
     return 0;
   }
-  LOG_DBG("SCT", "Page %d processed", pageCount);
+  LOG_DBG("SCT", "Page %d processed (pos=%lu, free=%u, maxAlloc=%u)", pageCount, static_cast<unsigned long>(position),
+          ESP.getFreeHeap(), ESP.getMaxAllocHeap());
 
   pageCount++;
   return position;
 }
 
-void Section::writeSectionFileHeader(const int fontId, const float lineCompression, const bool extraParagraphSpacing,
+bool Section::writeSectionFileHeader(const int fontId, const float lineCompression, const bool extraParagraphSpacing,
                                      const bool forceParagraphIndents, const uint8_t paragraphAlignment,
                                      const uint16_t viewportWidth, const uint16_t viewportHeight,
                                      const bool hyphenationEnabled, const bool embeddedStyle,
@@ -47,32 +53,34 @@ void Section::writeSectionFileHeader(const int fontId, const float lineCompressi
                                      const bool guideReadingEnabled) {
   if (!file) {
     LOG_DBG("SCT", "File not open for writing header");
-    return;
-  }
-  static_assert(HEADER_SIZE == sizeof(SECTION_FILE_VERSION) + sizeof(fontId) + sizeof(lineCompression) +
-                                   sizeof(extraParagraphSpacing) + sizeof(forceParagraphIndents) +
-                                   sizeof(paragraphAlignment) + sizeof(viewportWidth) + sizeof(viewportHeight) +
-                                   sizeof(pageCount) + sizeof(hyphenationEnabled) + sizeof(embeddedStyle) +
-                                   sizeof(imageRendering) + sizeof(bionicReadingEnabled) + sizeof(guideReadingEnabled) +
-                                   sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t),
+    return false;
+  }
+  static_assert(HEADER_SIZE == sizeof(SECTION_CACHE_MAGIC) + sizeof(SECTION_FILE_VERSION) + sizeof(fontId) +
+                                   sizeof(lineCompression) + sizeof(extraParagraphSpacing) +
+                                   sizeof(forceParagraphIndents) + sizeof(paragraphAlignment) + sizeof(viewportWidth) +
+                                   sizeof(viewportHeight) + sizeof(pageCount) + sizeof(hyphenationEnabled) +
+                                   sizeof(embeddedStyle) + sizeof(imageRendering) + sizeof(bionicReadingEnabled) +
+                                   sizeof(guideReadingEnabled) + sizeof(uint32_t) + sizeof(uint32_t) +
+                                   sizeof(uint32_t) + sizeof(uint32_t),
                 "Header size mismatch");
-  serialization::writePod(file, SECTION_FILE_VERSION);
-  serialization::writePod(file, fontId);
-  serialization::writePod(file, lineCompression);
-  serialization::writePod(file, extraParagraphSpacing);
-  serialization::writePod(file, forceParagraphIndents);
-  serialization::writePod(file, paragraphAlignment);
-  serialization::writePod(file, viewportWidth);
-  serialization::writePod(file, viewportHeight);
-  serialization::writePod(file, hyphenationEnabled);
-  serialization::writePod(file, embeddedStyle);
-  serialization::writePod(file, imageRendering);
-  serialization::writePod(file, bionicReadingEnabled);
-  serialization::writePod(file, guideReadingEnabled);
-  serialization::writePod(file, pageCount);  // Placeholder for page count (will be initially 0, patched later)
-  serialization::writePod(file, static_cast<uint32_t>(0));  // Placeholder for LUT offset (patched later)
-  serialization::writePod(file, static_cast<uint32_t>(0));  // Placeholder for anchor map offset (patched later)
-  serialization::writePod(file, static_cast<uint32_t>(0));  // Placeholder for paragraph LUT offset (patched later)
+  return serialization::tryWritePod(file, SECTION_CACHE_MAGIC) &&
+         serialization::tryWritePod(file, SECTION_FILE_VERSION) && serialization::tryWritePod(file, fontId) &&
+         serialization::tryWritePod(file, lineCompression) && serialization::tryWritePod(file, extraParagraphSpacing) &&
+         serialization::tryWritePod(file, forceParagraphIndents) &&
+         serialization::tryWritePod(file, paragraphAlignment) && serialization::tryWritePod(file, viewportWidth) &&
+         serialization::tryWritePod(file, viewportHeight) && serialization::tryWritePod(file, hyphenationEnabled) &&
+         serialization::tryWritePod(file, embeddedStyle) && serialization::tryWritePod(file, imageRendering) &&
+         serialization::tryWritePod(file, bionicReadingEnabled) &&
+         serialization::tryWritePod(file, guideReadingEnabled) &&
+         serialization::tryWritePod(file,
+                                    pageCount) &&  // Placeholder for page count (will be initially 0, patched later)
+         serialization::tryWritePod(file, static_cast<uint32_t>(0)) &&  // Placeholder for LUT offset (patched later)
+         serialization::tryWritePod(file,
+                                    static_cast<uint32_t>(0)) &&  // Placeholder for anchor map offset (patched later)
+         serialization::tryWritePod(
+             file,
+             static_cast<uint32_t>(0)) &&  // Placeholder for paragraph LUT offset (patched later)
+         serialization::tryWritePod(file, static_cast<uint32_t>(0));  // Placeholder for li LUT offset (patched later)
 }
 
 bool Section::loadSectionFile(const int fontId, const float lineCompression, const bool extraParagraphSpacing,
@@ -86,8 +94,27 @@ bool Section::loadSectionFile(const int fontId, const float lineCompression, con
 
   // Match parameters
   {
+    uint32_t magic;
+    if (!serialization::tryReadPod(file, magic)) {
+      file.close();
+      LOG_ERR("SCT", "Deserialization failed: could not read cache magic");
+      clearCache();
+      return false;
+    }
+    if (magic != SECTION_CACHE_MAGIC) {
+      file.close();
+      LOG_ERR("SCT", "Deserialization failed: cache magic mismatch");
+      clearCache();
+      return false;
+    }
+
     uint8_t version;
-    serialization::readPod(file, version);
+    if (!serialization::tryReadPod(file, version)) {
+      file.close();
+      LOG_ERR("SCT", "Deserialization failed: could not read version");
+      clearCache();
+      return false;
+    }
     if (version != SECTION_FILE_VERSION) {
       // Explicit close() required: member variable persists beyond function scope
       file.close();
@@ -107,18 +134,20 @@ bool Section::loadSectionFile(const int fontId, const float lineCompression, con
     uint8_t fileImageRendering;
     bool fileBionicReadingEnabled;
     bool fileGuideReadingEnabled;
-    serialization::readPod(file, fileFontId);
-    serialization::readPod(file, fileLineCompression);
-    serialization::readPod(file, fileExtraParagraphSpacing);
-    serialization::readPod(file, fileForceParagraphIndents);
-    serialization::readPod(file, fileParagraphAlignment);
-    serialization::readPod(file, fileViewportWidth);
-    serialization::readPod(file, fileViewportHeight);
-    serialization::readPod(file, fileHyphenationEnabled);
-    serialization::readPod(file, fileEmbeddedStyle);
-    serialization::readPod(file, fileImageRendering);
-    serialization::readPod(file, fileBionicReadingEnabled);
-    serialization::readPod(file, fileGuideReadingEnabled);
+    if (!serialization::tryReadPod(file, fileFontId) || !serialization::tryReadPod(file, fileLineCompression) ||
+        !serialization::tryReadPod(file, fileExtraParagraphSpacing) ||
+        !serialization::tryReadPod(file, fileForceParagraphIndents) ||
+        !serialization::tryReadPod(file, fileParagraphAlignment) ||
+        !serialization::tryReadPod(file, fileViewportWidth) || !serialization::tryReadPod(file, fileViewportHeight) ||
+        !serialization::tryReadPod(file, fileHyphenationEnabled) ||
+        !serialization::tryReadPod(file, fileEmbeddedStyle) || !serialization::tryReadPod(file, fileImageRendering) ||
+        !serialization::tryReadPod(file, fileBionicReadingEnabled) ||
+        !serialization::tryReadPod(file, fileGuideReadingEnabled)) {
+      file.close();
+      LOG_ERR("SCT", "Deserialization failed: truncated section header");
+      clearCache();
+      return false;
+    }
 
     if (fontId != fileFontId || lineCompression != fileLineCompression ||
         extraParagraphSpacing != fileExtraParagraphSpacing || forceParagraphIndents != fileForceParagraphIndents ||
@@ -133,7 +162,12 @@ bool Section::loadSectionFile(const int fontId, const float lineCompression, con
     }
   }
 
-  serialization::readPod(file, pageCount);
+  if (!serialization::tryReadPod(file, pageCount)) {
+    file.close();
+    LOG_ERR("SCT", "Deserialization failed: missing page count");
+    clearCache();
+    return false;
+  }
   // Explicit close() required: member variable persists beyond function scope
   file.close();
   LOG_DBG("SCT", "Deserialization succeeded: %d pages", pageCount);
@@ -161,9 +195,16 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c
                                 const uint16_t viewportWidth, const uint16_t viewportHeight,
                                 const bool hyphenationEnabled, const bool embeddedStyle, const uint8_t imageRendering,
                                 const bool bionicReadingEnabled, const bool guideReadingEnabled,
-                                const std::function<void()>& popupFn, bool* imagesWereSuppressed) {
+                                const std::function<void()>& popupFn, bool* imagesWereSuppressed,
+                                bool* layoutAbortedForLowMemory) {
   const auto localPath = epub->getSpineItem(spineIndex).href;
   const auto tmpHtmlPath = epub->getCachePath() + "/.tmp_" + std::to_string(spineIndex) + ".html";
+  const auto tmpSectionPath = filePath + ".tmp";
+  pageCount = 0;
+  if (layoutAbortedForLowMemory) *layoutAbortedForLowMemory = false;
+  LOG_DBG("SCT", "Create section start: spine=%d viewport=%ux%u image=%u bionic=%u guide=%u free=%u maxAlloc=%u",
+          spineIndex, viewportWidth, viewportHeight, imageRendering, bionicReadingEnabled, guideReadingEnabled,
+          ESP.getFreeHeap(), ESP.getMaxAllocHeap());
 
   // Create cache directory if it doesn't exist
   {
@@ -206,14 +247,24 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c
     return false;
   }
 
-  LOG_DBG("SCT", "Streamed temp HTML to %s (%d bytes)", tmpHtmlPath.c_str(), fileSize);
+  LOG_DBG("SCT", "Streamed temp HTML to %s (%d bytes, free=%u, maxAlloc=%u)", tmpHtmlPath.c_str(), fileSize,
+          ESP.getFreeHeap(), ESP.getMaxAllocHeap());
+
+  if (Storage.exists(tmpSectionPath.c_str())) {
+    Storage.remove(tmpSectionPath.c_str());
+  }
 
-  if (!Storage.openFileForWrite("SCT", filePath, file)) {
+  if (!Storage.openFileForWrite("SCT", tmpSectionPath, file)) {
+    return false;
+  }
+  if (!writeSectionFileHeader(fontId, lineCompression, extraParagraphSpacing, forceParagraphIndents, paragraphAlignment,
+                              viewportWidth, viewportHeight, hyphenationEnabled, embeddedStyle, imageRendering,
+                              bionicReadingEnabled, guideReadingEnabled)) {
+    LOG_ERR("SCT", "Failed to write section header");
+    file.close();
+    Storage.remove(tmpSectionPath.c_str());
     return false;
   }
-  writeSectionFileHeader(fontId, lineCompression, extraParagraphSpacing, forceParagraphIndents, paragraphAlignment,
-                         viewportWidth, viewportHeight, hyphenationEnabled, embeddedStyle, imageRendering,
-                         bionicReadingEnabled, guideReadingEnabled);
   std::vector<PageLutEntry> lut = {};
 
   // Derive the content base directory and image cache path prefix for the parser
@@ -225,7 +276,16 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c
   if (embeddedStyle) {
     cssParser = epub->getCssParser();
     if (cssParser) {
-      if (!cssParser->loadFromCache()) {
+      const auto cssHeapBefore = MemoryBudget::snapshot();
+      const bool cssLoaded = cssParser->loadFromCache();
+      const auto cssHeapAfter = MemoryBudget::snapshot();
+      LOG_DBG("SCT", "CSS cache load: ok=%u rules=%u free=%u->%u delta=%d maxAlloc=%u->%u delta=%d",
+              cssLoaded ? 1U : 0U, static_cast<unsigned>(cssParser->ruleCount()), cssHeapBefore.freeHeap,
+              cssHeapAfter.freeHeap,
+              static_cast<int32_t>(cssHeapAfter.freeHeap) - static_cast<int32_t>(cssHeapBefore.freeHeap),
+              cssHeapBefore.maxAllocHeap, cssHeapAfter.maxAllocHeap,
+              static_cast<int32_t>(cssHeapAfter.maxAllocHeap) - static_cast<int32_t>(cssHeapBefore.maxAllocHeap));
+      if (!cssLoaded) {
         LOG_ERR("SCT", "Failed to load CSS from cache");
       }
     }
@@ -234,21 +294,25 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c
   ChapterHtmlSlimParser visitor(
       epub, tmpHtmlPath, renderer, fontId, lineCompression, extraParagraphSpacing, forceParagraphIndents,
       paragraphAlignment, viewportWidth, viewportHeight, hyphenationEnabled, bionicReadingEnabled, guideReadingEnabled,
-      [this, &lut](std::unique_ptr<Page> page, const uint16_t paragraphIndex) {
-        lut.push_back({this->onPageComplete(std::move(page)), paragraphIndex});
+      [this, &lut](std::unique_ptr<Page> page, const uint16_t paragraphIndex, const uint16_t listItemIndex) {
+        lut.push_back({this->onPageComplete(std::move(page)), paragraphIndex, listItemIndex});
       },
       embeddedStyle, contentBase, imageBasePath, imageRendering, popupFn, cssParser);
   Hyphenator::setPreferredLanguage(epub->getLanguage());
+  LOG_DBG("SCT", "Parser start: spine=%d free=%u maxAlloc=%u", spineIndex, ESP.getFreeHeap(), ESP.getMaxAllocHeap());
   success = visitor.parseAndBuildPages();
+  LOG_DBG("SCT", "Parser done: spine=%d success=%u pages=%u free=%u maxAlloc=%u", spineIndex, success, pageCount,
+          ESP.getFreeHeap(), ESP.getMaxAllocHeap());
 
   if (imagesWereSuppressed) *imagesWereSuppressed = visitor.wasLowMemoryFallbackTriggered();
+  if (layoutAbortedForLowMemory) *layoutAbortedForLowMemory = visitor.wasLowMemoryAbortTriggered();
 
   Storage.remove(tmpHtmlPath.c_str());
   if (!success) {
     LOG_ERR("SCT", "Failed to parse XML and build pages");
     // Explicitly close() file before calling Storage.remove()
     file.close();
-    Storage.remove(filePath.c_str());
+    Storage.remove(tmpSectionPath.c_str());
     if (cssParser) {
       cssParser->clear();
     }
@@ -263,43 +327,90 @@ bool Section::createSectionFile(const int fontId, const float lineCompression, c
       hasFailedLutRecords = true;
       break;
     }
-    serialization::writePod(file, entry.fileOffset);
+    if (!serialization::tryWritePod(file, entry.fileOffset)) {
+      hasFailedLutRecords = true;
+      break;
+    }
   }
 
   if (hasFailedLutRecords) {
     LOG_ERR("SCT", "Failed to write LUT due to invalid page positions");
     // Explicitly close() file before calling Storage.remove()
     file.close();
-    Storage.remove(filePath.c_str());
+    Storage.remove(tmpSectionPath.c_str());
     return false;
   }
 
   // Write anchor-to-page map for fragment navigation (e.g. footnote targets)
   const uint32_t anchorMapOffset = file.position();
   const auto& anchors = visitor.getAnchors();
-  serialization::writePod(file, static_cast<uint16_t>(anchors.size()));
+  if (!serialization::tryWritePod(file, static_cast<uint16_t>(anchors.size()))) {
+    file.close();
+    Storage.remove(tmpSectionPath.c_str());
+    return false;
+  }
   for (const auto& [anchor, page] : anchors) {
-    serialization::writeString(file, anchor);
-    serialization::writePod(file, page);
+    if (!serialization::tryWriteString(file, anchor) || !serialization::tryWritePod(file, page)) {
+      file.close();
+      Storage.remove(tmpSectionPath.c_str());
+      return false;
+    }
   }
 
   const uint32_t paragraphLutOffset = file.position();
-  serialization::writePod(file, static_cast<uint16_t>(lut.size()));
+  if (!serialization::tryWritePod(file, static_cast<uint16_t>(lut.size()))) {
+    file.close();
+    Storage.remove(tmpSectionPath.c_str());
+    return false;
+  }
   for (const auto& entry : lut) {
-    serialization::writePod(file, entry.paragraphIndex);
+    if (!serialization::tryWritePod(file, entry.paragraphIndex)) {
+      file.close();
+      Storage.remove(tmpSectionPath.c_str());
+      return false;
+    }
   }
 
-  // Patch header with final pageCount, lutOffset, anchorMapOffset, and paragraphLutOffset
-  file.seek(HEADER_SIZE - sizeof(uint32_t) * 3 - sizeof(pageCount));
-  serialization::writePod(file, pageCount);
-  serialization::writePod(file, lutOffset);
-  serialization::writePod(file, anchorMapOffset);
-  serialization::writePod(file, paragraphLutOffset);
+  const uint32_t liLutFileOffset = static_cast<uint32_t>(file.position());
+  for (const auto& entry : lut) {
+    if (!serialization::tryWritePod(file, entry.listItemIndex)) {
+      file.close();
+      Storage.remove(tmpSectionPath.c_str());
+      return false;
+    }
+  }
+
+  // Patch header with final pageCount, lutOffset, anchorMapOffset, paragraphLutOffset, and liLutOffset.
+  if (!file.seek(HEADER_SIZE - sizeof(uint32_t) * 4 - sizeof(pageCount)) ||
+      !serialization::tryWritePod(file, pageCount) || !serialization::tryWritePod(file, lutOffset) ||
+      !serialization::tryWritePod(file, anchorMapOffset) || !serialization::tryWritePod(file, paragraphLutOffset) ||
+      !serialization::tryWritePod(file, liLutFileOffset) || !file.sync()) {
+    LOG_ERR("SCT", "Failed to finalize section cache");
+    file.close();
+    Storage.remove(tmpSectionPath.c_str());
+    if (cssParser) {
+      cssParser->clear();
+    }
+    return false;
+  }
   // Explicit close() required: member variable persists beyond function scope
   file.close();
+  if (Storage.exists(filePath.c_str())) {
+    Storage.remove(filePath.c_str());
+  }
+  if (!Storage.rename(tmpSectionPath.c_str(), filePath.c_str())) {
+    LOG_ERR("SCT", "Failed to promote temp section cache into place");
+    Storage.remove(tmpSectionPath.c_str());
+    if (cssParser) {
+      cssParser->clear();
+    }
+    return false;
+  }
   if (cssParser) {
     cssParser->clear();
   }
+  LOG_DBG("SCT", "Create section done: spine=%d pages=%u free=%u maxAlloc=%u", spineIndex, pageCount, ESP.getFreeHeap(),
+          ESP.getMaxAllocHeap());
   return true;
 }
 
@@ -308,13 +419,20 @@ std::unique_ptr<Page> Section::loadPageFromSectionFile() {
     return nullptr;
   }
 
-  file.seek(HEADER_SIZE - sizeof(uint32_t) * 3);
+  if (!file.seek(HEADER_SIZE - sizeof(uint32_t) * 4)) {
+    file.close();
+    return nullptr;
+  }
   uint32_t lutOffset;
-  serialization::readPod(file, lutOffset);
-  file.seek(lutOffset + sizeof(uint32_t) * currentPage);
+  if (!serialization::tryReadPod(file, lutOffset) || !file.seek(lutOffset + sizeof(uint32_t) * currentPage)) {
+    file.close();
+    return nullptr;
+  }
   uint32_t pagePos;
-  serialization::readPod(file, pagePos);
-  file.seek(pagePos);
+  if (!serialization::tryReadPod(file, pagePos) || !file.seek(pagePos)) {
+    file.close();
+    return nullptr;
+  }
 
   auto page = Page::deserialize(file);
   // Explicit close() required: member variable persists beyond function scope
@@ -329,21 +447,30 @@ std::optional<uint16_t> Section::getPageForAnchor(const std::string& anchor) con
   }
 
   const uint32_t fileSize = f.size();
-  f.seek(HEADER_SIZE - sizeof(uint32_t) * 2);
+  if (!f.seek(HEADER_SIZE - sizeof(uint32_t) * 3)) {
+    return std::nullopt;
+  }
   uint32_t anchorMapOffset;
-  serialization::readPod(f, anchorMapOffset);
+  if (!serialization::tryReadPod(f, anchorMapOffset)) {
+    return std::nullopt;
+  }
   if (anchorMapOffset == 0 || anchorMapOffset >= fileSize) {
     return std::nullopt;
   }
 
-  f.seek(anchorMapOffset);
+  if (!f.seek(anchorMapOffset)) {
+    return std::nullopt;
+  }
   uint16_t count;
-  serialization::readPod(f, count);
+  if (!serialization::tryReadPod(f, count)) {
+    return std::nullopt;
+  }
   for (uint16_t i = 0; i < count; i++) {
     std::string key;
     uint16_t page;
-    serialization::readString(f, key);
-    serialization::readPod(f, page);
+    if (!serialization::tryReadString(f, key) || !serialization::tryReadPod(f, page)) {
+      return std::nullopt;
+    }
     if (key == anchor) {
       return page;
     }
@@ -359,16 +486,24 @@ std::optional<uint16_t> Section::getPageForParagraphIndex(const uint16_t pIndex)
   }
 
   const uint32_t fileSize = f.size();
-  f.seek(HEADER_SIZE - sizeof(uint32_t));
+  if (!f.seek(HEADER_SIZE - sizeof(uint32_t) * 2)) {
+    return std::nullopt;
+  }
   uint32_t paragraphLutOffset;
-  serialization::readPod(f, paragraphLutOffset);
+  if (!serialization::tryReadPod(f, paragraphLutOffset)) {
+    return std::nullopt;
+  }
   if (paragraphLutOffset == 0 || paragraphLutOffset >= fileSize) {
     return std::nullopt;
   }
 
-  f.seek(paragraphLutOffset);
+  if (!f.seek(paragraphLutOffset)) {
+    return std::nullopt;
+  }
   uint16_t count;
-  serialization::readPod(f, count);
+  if (!serialization::tryReadPod(f, count)) {
+    return std::nullopt;
+  }
   if (count == 0) {
     return std::nullopt;
   }
@@ -381,7 +516,9 @@ std::optional<uint16_t> Section::getPageForParagraphIndex(const uint16_t pIndex)
   uint16_t resultPage = count - 1;
   for (uint16_t i = 0; i < count; i++) {
     uint16_t pagePIdx;
-    serialization::readPod(f, pagePIdx);
+    if (!serialization::tryReadPod(f, pagePIdx)) {
+      return std::nullopt;
+    }
     if (pagePIdx >= pIndex) {
       resultPage = i;
       break;
@@ -398,16 +535,24 @@ std::optional<uint16_t> Section::getParagraphIndexForPage(const uint16_t page) c
   }
 
   const uint32_t fileSize = f.size();
-  f.seek(HEADER_SIZE - sizeof(uint32_t));
+  if (!f.seek(HEADER_SIZE - sizeof(uint32_t) * 2)) {
+    return std::nullopt;
+  }
   uint32_t paragraphLutOffset;
-  serialization::readPod(f, paragraphLutOffset);
+  if (!serialization::tryReadPod(f, paragraphLutOffset)) {
+    return std::nullopt;
+  }
   if (paragraphLutOffset == 0 || paragraphLutOffset >= fileSize) {
     return std::nullopt;
   }
 
-  f.seek(paragraphLutOffset);
+  if (!f.seek(paragraphLutOffset)) {
+    return std::nullopt;
+  }
   uint16_t count;
-  serialization::readPod(f, count);
+  if (!serialization::tryReadPod(f, count)) {
+    return std::nullopt;
+  }
   if (count == 0 || page >= count) {
     return std::nullopt;
   }
@@ -417,8 +562,76 @@ std::optional<uint16_t> Section::getParagraphIndexForPage(const uint16_t page) c
     return std::nullopt;
   }
 
-  f.seek(paragraphLutOffset + sizeof(uint16_t) + page * sizeof(uint16_t));
+  if (!f.seek(paragraphLutOffset + sizeof(uint16_t) + page * sizeof(uint16_t))) {
+    return std::nullopt;
+  }
   uint16_t pIdx;
-  serialization::readPod(f, pIdx);
+  if (!serialization::tryReadPod(f, pIdx)) {
+    return std::nullopt;
+  }
   return pIdx;
 }
+
+std::optional<uint16_t> Section::getPageForListItemIndex(const uint16_t liIndex) const {
+  FsFile f;
+  if (!Storage.openFileForRead("SCT", filePath, f)) {
+    return std::nullopt;
+  }
+
+  const uint32_t fileSize = f.size();
+  if (!f.seek(HEADER_SIZE - sizeof(uint32_t))) {
+    return std::nullopt;
+  }
+  uint32_t liLutOffset;
+  if (!serialization::tryReadPod(f, liLutOffset)) {
+    return std::nullopt;
+  }
+  if (liLutOffset == 0 || liLutOffset >= fileSize) {
+    return std::nullopt;
+  }
+
+  // The li LUT shares count with the paragraph LUT; read count from paragraphLutOffset
+  if (!f.seek(HEADER_SIZE - sizeof(uint32_t) * 2)) {
+    return std::nullopt;
+  }
+  uint32_t paragraphLutOffset;
+  if (!serialization::tryReadPod(f, paragraphLutOffset)) {
+    return std::nullopt;
+  }
+  if (paragraphLutOffset == 0 || paragraphLutOffset >= fileSize) {
+    return std::nullopt;
+  }
+
+  if (!f.seek(paragraphLutOffset)) {
+    return std::nullopt;
+  }
+  uint16_t count;
+  if (!serialization::tryReadPod(f, count)) {
+    return std::nullopt;
+  }
+  if (count == 0) {
+    return std::nullopt;
+  }
+
+  const uint32_t lutEnd = liLutOffset + count * sizeof(uint16_t);
+  if (lutEnd > fileSize) {
+    return std::nullopt;
+  }
+
+  if (!f.seek(liLutOffset)) {
+    return std::nullopt;
+  }
+  uint16_t resultPage = count - 1;
+  for (uint16_t i = 0; i < count; i++) {
+    uint16_t pageLiIdx;
+    if (!serialization::tryReadPod(f, pageLiIdx)) {
+      return std::nullopt;
+    }
+    if (pageLiIdx >= liIndex) {
+      resultPage = i;
+      break;
+    }
+  }
+
+  return resultPage;
+}
diff --git a/lib/Epub/Epub/Section.h b/lib/Epub/Epub/Section.h
index fbb05a7e..3af054b4 100644
--- a/lib/Epub/Epub/Section.h
+++ b/lib/Epub/Epub/Section.h
@@ -16,7 +16,7 @@ class Section {
   std::string filePath;
   FsFile file;
 
-  void writeSectionFileHeader(int fontId, float lineCompression, bool extraParagraphSpacing, bool forceParagraphIndents,
+  bool writeSectionFileHeader(int fontId, float lineCompression, bool extraParagraphSpacing, bool forceParagraphIndents,
                               uint8_t paragraphAlignment, uint16_t viewportWidth, uint16_t viewportHeight,
                               bool hyphenationEnabled, bool embeddedStyle, uint8_t imageRendering,
                               bool bionicReadingEnabled, bool guideReadingEnabled);
@@ -41,7 +41,7 @@ class Section {
                          uint8_t paragraphAlignment, uint16_t viewportWidth, uint16_t viewportHeight,
                          bool hyphenationEnabled, bool embeddedStyle, uint8_t imageRendering, bool bionicReadingEnabled,
                          bool guideReadingEnabled, const std::function<void()>& popupFn = nullptr,
-                         bool* imagesWereSuppressed = nullptr);
+                         bool* imagesWereSuppressed = nullptr, bool* layoutAbortedForLowMemory = nullptr);
   std::unique_ptr<Page> loadPageFromSectionFile();
 
   // Look up the page number for an anchor id from the section cache file.
@@ -50,6 +50,9 @@ class Section {
   // Look up the page number for a synthetic paragraph index from XPath p[N].
   std::optional<uint16_t> getPageForParagraphIndex(uint16_t pIndex) const;
 
+  // Look up the page number for a running list-item index from the li LUT.
+  std::optional<uint16_t> getPageForListItemIndex(uint16_t liIndex) const;
+
   // Look up the synthetic paragraph index for the given rendered page.
   std::optional<uint16_t> getParagraphIndexForPage(uint16_t page) const;
 };
diff --git a/lib/Epub/Epub/blocks/BlockStyle.h b/lib/Epub/Epub/blocks/BlockStyle.h
index 1a842aaa..62e1945a 100644
--- a/lib/Epub/Epub/blocks/BlockStyle.h
+++ b/lib/Epub/Epub/blocks/BlockStyle.h
@@ -34,45 +34,62 @@ struct BlockStyle {
   // NOT propagated through getCombinedBlockStyle so it can't leak into sibling blocks.
   bool fromBrElement = false;
 
-  // Combined horizontal insets (margin + padding)
+  // Combined insets (margin + padding)
   [[nodiscard]] int16_t leftInset() const { return marginLeft + paddingLeft; }
   [[nodiscard]] int16_t rightInset() const { return marginRight + paddingRight; }
   [[nodiscard]] int16_t totalHorizontalInset() const { return leftInset() + rightInset(); }
+  [[nodiscard]] int16_t topInset() const { return marginTop + paddingTop; }
+  [[nodiscard]] int16_t bottomInset() const { return marginBottom + paddingBottom; }
 
-  // Combine with another block style. Useful for parent -> child styles, where the child style should be
-  // applied on top of the parent's style to get the combined style.
-  BlockStyle getCombinedBlockStyle(const BlockStyle& child) const {
-    BlockStyle combinedBlockStyle;
+  // Return a copy with bottom margins/padding zeroed out.
+  [[nodiscard]] BlockStyle withoutBottom() const {
+    BlockStyle result = *this;
+    result.marginBottom = 0;
+    result.paddingBottom = 0;
+    return result;
+  }
 
-    combinedBlockStyle.marginTop = static_cast<int16_t>(child.marginTop + marginTop);
-    combinedBlockStyle.marginBottom = static_cast<int16_t>(child.marginBottom + marginBottom);
-    combinedBlockStyle.marginLeft = static_cast<int16_t>(child.marginLeft + marginLeft);
-    combinedBlockStyle.marginRight = static_cast<int16_t>(child.marginRight + marginRight);
+  // Return a copy with bottom margins/padding collapsed (max) with the source's.
+  // Uses CSS margin collapsing: adjacent parent-child margins resolve to the larger value.
+  [[nodiscard]] BlockStyle addBottom(const BlockStyle& source) const {
+    BlockStyle result = *this;
+    result.marginBottom = std::max(marginBottom, source.marginBottom);
+    result.paddingBottom = static_cast<int16_t>(paddingBottom + source.paddingBottom);
+    return result;
+  }
 
-    combinedBlockStyle.paddingTop = static_cast<int16_t>(child.paddingTop + paddingTop);
-    combinedBlockStyle.paddingBottom = static_cast<int16_t>(child.paddingBottom + paddingBottom);
-    combinedBlockStyle.paddingLeft = static_cast<int16_t>(child.paddingLeft + paddingLeft);
-    combinedBlockStyle.paddingRight = static_cast<int16_t>(child.paddingRight + paddingRight);
-    // Text indent: use child's if defined
-    if (child.textIndentDefined) {
-      combinedBlockStyle.textIndent = child.textIndent;
-      combinedBlockStyle.textIndentDefined = true;
-    } else {
-      combinedBlockStyle.textIndent = textIndent;
-      combinedBlockStyle.textIndentDefined = textIndentDefined;
-    }
-    // Text align: use child's if defined
-    if (child.textAlignDefined) {
-      combinedBlockStyle.alignment = child.alignment;
-      combinedBlockStyle.textAlignDefined = true;
+  enum class CombineAxis : uint8_t {
+    Horizontal = 1,  // margins left/right, padding left/right, text-align, text-indent
+    Vertical = 2,    // margins top/bottom, padding top/bottom
+  };
+
+  // Combine this style's properties with a child style along the specified axis.
+  // Properties on the other axis are kept from the child unchanged.
+  [[nodiscard]] BlockStyle getCombinedBlockStyle(const BlockStyle& child, CombineAxis axis) const {
+    BlockStyle result = child;
+
+    if (axis == CombineAxis::Horizontal) {
+      result.marginLeft = static_cast<int16_t>(child.marginLeft + marginLeft);
+      result.marginRight = static_cast<int16_t>(child.marginRight + marginRight);
+      result.paddingLeft = static_cast<int16_t>(child.paddingLeft + paddingLeft);
+      result.paddingRight = static_cast<int16_t>(child.paddingRight + paddingRight);
+      if (!child.textIndentDefined && textIndentDefined) {
+        result.textIndent = textIndent;
+        result.textIndentDefined = true;
+      }
+      if (!child.textAlignDefined && textAlignDefined) {
+        result.alignment = alignment;
+        result.textAlignDefined = true;
+      }
     } else {
-      combinedBlockStyle.alignment = alignment;
-      combinedBlockStyle.textAlignDefined = textAlignDefined;
+      result.marginTop = std::max(child.marginTop, marginTop);
+      result.marginBottom = std::max(child.marginBottom, marginBottom);
+      result.paddingTop = static_cast<int16_t>(child.paddingTop + paddingTop);
+      result.paddingBottom = static_cast<int16_t>(child.paddingBottom + paddingBottom);
     }
-    // fromBrElement is never propagated — it is consumed by startNewTextBlock
-    // when the empty <br> block is merged with the following paragraph.
-    combinedBlockStyle.fromBrElement = false;
-    return combinedBlockStyle;
+    // fromBrElement is consumed by startNewTextBlock and should not leak through ancestor style merging.
+    result.fromBrElement = false;
+    return result;
   }
 
   // Create a BlockStyle from CSS style properties, resolving CssLength values to pixels
diff --git a/lib/Epub/Epub/blocks/ImageBlock.cpp b/lib/Epub/Epub/blocks/ImageBlock.cpp
index 1b71817a..c7eacd29 100644
--- a/lib/Epub/Epub/blocks/ImageBlock.cpp
+++ b/lib/Epub/Epub/blocks/ImageBlock.cpp
@@ -4,8 +4,8 @@
 #include <Logging.h>
 #include <Serialization.h>
 
-#include "../converters/DirectPixelWriter.h"
-#include "../converters/ImageDecoderFactory.h"
+#include "Epub/converters/DirectPixelWriter.h"
+#include "Epub/converters/ImageDecoderFactory.h"
 
 // Cache file format:
 // - uint16_t width
@@ -37,6 +37,7 @@ bool renderFromCache(GfxRenderer& renderer, const std::string& cachePath, int x,
 
   uint16_t cachedWidth, cachedHeight;
   if (cacheFile.read(&cachedWidth, 2) != 2 || cacheFile.read(&cachedHeight, 2) != 2) {
+    cacheFile.close();
     return false;
   }
 
@@ -46,6 +47,7 @@ bool renderFromCache(GfxRenderer& renderer, const std::string& cachePath, int x,
   if (widthDiff > 1 || heightDiff > 1) {
     LOG_ERR("IMG", "Cache dimension mismatch: %dx%d vs %dx%d", cachedWidth, cachedHeight, expectedWidth,
             expectedHeight);
+    cacheFile.close();
     return false;
   }
 
@@ -55,11 +57,29 @@ bool renderFromCache(GfxRenderer& renderer, const std::string& cachePath, int x,
 
   LOG_DBG("IMG", "Loading from cache: %s (%dx%d)", cachePath.c_str(), cachedWidth, cachedHeight);
 
+  const int screenWidth = renderer.getScreenWidth();
+  const int screenHeight = renderer.getScreenHeight();
+  int clipXStart = 0;
+  int clipYStart = 0;
+  int clipXEnd = cachedWidth;
+  int clipYEnd = cachedHeight;
+  if (x < 0) clipXStart = -x;
+  if (y < 0) clipYStart = -y;
+  if (screenWidth - x < clipXEnd) clipXEnd = screenWidth - x;
+  if (screenHeight - y < clipYEnd) clipYEnd = screenHeight - y;
+
+  if (clipXStart >= clipXEnd || clipYStart >= clipYEnd) {
+    LOG_DBG("IMG", "Cached image is outside screen after clipping");
+    cacheFile.close();
+    return true;
+  }
+
   // Read and render row by row to minimize memory usage
   const int bytesPerRow = (cachedWidth + 3) / 4;  // 2 bits per pixel, 4 pixels per byte
   uint8_t* rowBuffer = (uint8_t*)malloc(bytesPerRow);
   if (!rowBuffer) {
     LOG_ERR("IMG", "Failed to allocate row buffer");
+    cacheFile.close();
     return false;
   }
 
@@ -70,12 +90,16 @@ bool renderFromCache(GfxRenderer& renderer, const std::string& cachePath, int x,
     if (cacheFile.read(rowBuffer, bytesPerRow) != bytesPerRow) {
       LOG_ERR("IMG", "Cache read error at row %d", row);
       free(rowBuffer);
+      cacheFile.close();
       return false;
     }
 
+    if (row < clipYStart) continue;
+    if (row >= clipYEnd) break;
+
     const int destY = y + row;
     pw.beginRow(destY);
-    for (int col = 0; col < cachedWidth; col++) {
+    for (int col = clipXStart; col < clipXEnd; col++) {
       const int byteIdx = col >> 2;            // col / 4
       const int bitShift = 6 - (col & 3) * 2;  // MSB first within byte
       uint8_t pixelValue = (rowBuffer[byteIdx] >> bitShift) & 0x03;
@@ -85,6 +109,7 @@ bool renderFromCache(GfxRenderer& renderer, const std::string& cachePath, int x,
   }
 
   free(rowBuffer);
+  cacheFile.close();
   LOG_DBG("IMG", "Cache render complete");
   return true;
 }
@@ -97,12 +122,19 @@ void ImageBlock::render(GfxRenderer& renderer, const int x, const int y) {
   const int screenWidth = renderer.getScreenWidth();
   const int screenHeight = renderer.getScreenHeight();
 
-  // Bounds check render position using logical screen dimensions
-  if (x < 0 || y < 0 || x + width > screenWidth || y + height > screenHeight) {
+  if (width <= 0 || height <= 0) {
+    LOG_ERR("IMG", "Invalid image size: %dx%d", width, height);
+    return;
+  }
+
+  // Reject only fully off-screen images. Decoders and cache rendering clip
+  // partially visible images to the logical screen bounds.
+  if (x >= screenWidth || y >= screenHeight || x + width <= 0 || y + height <= 0) {
     LOG_ERR("IMG", "Invalid render position: (%d,%d) size (%dx%d) screen (%dx%d)", x, y, width, height, screenWidth,
             screenHeight);
     return;
   }
+  const bool fullyOnScreen = x >= 0 && y >= 0 && x + width <= screenWidth && y + height <= screenHeight;
 
   // Try to render from cache first
   std::string cachePath = getCachePath(imagePath);
@@ -136,7 +168,9 @@ void ImageBlock::render(GfxRenderer& renderer, const int x, const int y) {
   config.useDithering = true;
   config.performanceMode = false;
   config.useExactDimensions = true;  // Use pre-calculated dimensions to avoid rounding mismatches
-  config.cachePath = cachePath;      // Enable caching during decode
+  if (fullyOnScreen) {
+    config.cachePath = cachePath;  // Enable caching during decode
+  }
 
   ImageToFramebufferDecoder* decoder = ImageDecoderFactory::getDecoder(imagePath);
   if (!decoder) {
@@ -156,17 +190,26 @@ void ImageBlock::render(GfxRenderer& renderer, const int x, const int y) {
 }
 
 bool ImageBlock::serialize(FsFile& file) {
-  serialization::writeString(file, imagePath);
-  serialization::writePod(file, width);
-  serialization::writePod(file, height);
-  return true;
+  return serialization::tryWriteString(file, imagePath) && serialization::tryWritePod(file, width) &&
+         serialization::tryWritePod(file, height);
 }
 
 std::unique_ptr<ImageBlock> ImageBlock::deserialize(FsFile& file) {
   std::string path;
-  serialization::readString(file, path);
+  if (!serialization::tryReadString(file, path)) {
+    LOG_ERR("IMG", "Deserialization failed: could not read image path");
+    return nullptr;
+  }
   int16_t w, h;
-  serialization::readPod(file, w);
-  serialization::readPod(file, h);
-  return std::unique_ptr<ImageBlock>(new ImageBlock(path, w, h));
+  if (!serialization::tryReadPod(file, w) || !serialization::tryReadPod(file, h)) {
+    LOG_ERR("IMG", "Deserialization failed: truncated image metadata");
+    return nullptr;
+  }
+
+  auto* imageBlock = new (std::nothrow) ImageBlock(path, w, h);
+  if (!imageBlock) {
+    LOG_ERR("IMG", "Deserialization failed: could not allocate ImageBlock");
+    return nullptr;
+  }
+  return std::unique_ptr<ImageBlock>(imageBlock);
 }
diff --git a/lib/Epub/Epub/blocks/TextBlock.cpp b/lib/Epub/Epub/blocks/TextBlock.cpp
index a5f287f3..7f544670 100644
--- a/lib/Epub/Epub/blocks/TextBlock.cpp
+++ b/lib/Epub/Epub/blocks/TextBlock.cpp
@@ -13,12 +13,51 @@ constexpr uint16_t MAX_WORDS_PER_TEXT_BLOCK = 512;
 constexpr uint32_t MAX_SERIALIZED_WORD_BYTES = 4096;
 constexpr uint32_t SERIALIZED_TEXT_BLOCK_TAIL_BYTES =
     sizeof(EpdFontFamily::Style) + sizeof(bool) + sizeof(int16_t) * 7 + sizeof(bool);
-constexpr uint32_t SERIALIZED_WORD_METADATA_BYTES = sizeof(uint32_t) + sizeof(int16_t) + sizeof(EpdFontFamily::Style) +
-                                                    sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint16_t);
+constexpr uint32_t SERIALIZED_MIN_WORD_METADATA_BYTES =
+    sizeof(uint32_t) + sizeof(int16_t) + sizeof(EpdFontFamily::Style) + sizeof(uint8_t);
+constexpr uint32_t SERIALIZED_POST_WORD_MIN_METADATA_BYTES =
+    sizeof(int16_t) + sizeof(EpdFontFamily::Style) + sizeof(uint8_t);
+
+uint16_t measureBackgroundWidth(const GfxRenderer& renderer, const int fontId, const std::string& word,
+                                const EpdFontFamily::Style style) {
+  if (word.size() == 1 && word[0] == ' ') {
+    return renderer.getSpaceWidth(fontId, style);
+  }
+  return static_cast<uint16_t>(std::max(0, renderer.getTextAdvanceX(fontId, word.c_str(), style)));
+}
+
+bool isWhitespaceOnlyBackgroundToken(const std::string& word) {
+  if (word.empty()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < word.size();) {
+    const auto c = static_cast<uint8_t>(word[i]);
+    if (c == ' ' || c == '\r' || c == '\n' || c == '\t') {
+      ++i;
+      continue;
+    }
+    if (c == 0xC2 && i + 1 < word.size() && static_cast<uint8_t>(word[i + 1]) == 0xA0) {
+      i += 2;
+      continue;
+    }
+    if (c == 0xE2 && i + 2 < word.size() && static_cast<uint8_t>(word[i + 1]) == 0x80 &&
+        static_cast<uint8_t>(word[i + 2]) == 0xAF) {
+      i += 3;
+      continue;
+    }
+    return false;
+  }
+
+  return true;
+}
 
 bool readBoundedString(FsFile& file, std::string& s) {
   uint32_t len = 0;
-  serialization::readPod(file, len);
+  if (!serialization::tryReadPod(file, len)) {
+    LOG_ERR("TXB", "Deserialization failed: could not read word length");
+    return false;
+  }
   if (len > MAX_SERIALIZED_WORD_BYTES) {
     LOG_ERR("TXB", "Deserialization failed: word length %lu exceeds maximum", static_cast<unsigned long>(len));
     return false;
@@ -48,20 +87,31 @@ bool readBoundedString(FsFile& file, std::string& s) {
 
 void TextBlock::render(const GfxRenderer& renderer, const int fontId, const int x, const int y) const {
   // Validate iterator bounds before rendering
+  const bool hasBionic = !wordBionicBoundary.empty();
+  const bool hasGuideDots = !wordGuideDotXOffset.empty();
   if (words.size() != wordXpos.size() || words.size() != wordStyles.size() ||
-      words.size() != wordBionicBoundary.size() || words.size() != wordBionicSuffixX.size() ||
-      words.size() != wordGuideDotXOffset.size()) {
-    LOG_ERR("TXB", "Render skipped: size mismatch (words=%u, xpos=%u, styles=%u, boundary=%u, suffixX=%u, dotX=%u)\n",
+      words.size() != wordBackgroundBlack.size() ||
+      (hasBionic && (words.size() != wordBionicBoundary.size() || words.size() != wordBionicSuffixX.size())) ||
+      (!hasBionic && !wordBionicSuffixX.empty()) || (hasGuideDots && words.size() != wordGuideDotXOffset.size())) {
+    LOG_ERR("TXB",
+            "Render skipped: size mismatch (words=%u, xpos=%u, styles=%u, boundary=%u, suffixX=%u, dotX=%u, bg=%u)\n",
             (uint32_t)words.size(), (uint32_t)wordXpos.size(), (uint32_t)wordStyles.size(),
             (uint32_t)wordBionicBoundary.size(), (uint32_t)wordBionicSuffixX.size(),
-            (uint32_t)wordGuideDotXOffset.size());
+            (uint32_t)wordGuideDotXOffset.size(), (uint32_t)wordBackgroundBlack.size());
     return;
   }
 
   for (size_t i = 0; i < words.size(); i++) {
     const int wordX = wordXpos[i] + x;
     const EpdFontFamily::Style currentStyle = wordStyles[i];
-    const uint8_t boundary = wordBionicBoundary[i];
+    const uint8_t boundary = hasBionic ? wordBionicBoundary[i] : 0;
+
+    if (wordBackgroundBlack[i] != 0 && isWhitespaceOnlyBackgroundToken(words[i])) {
+      const uint16_t backgroundWidth = measureBackgroundWidth(renderer, fontId, words[i], currentStyle);
+      if (backgroundWidth > 0) {
+        renderer.fillRect(wordX, y, backgroundWidth, renderer.getFontAscenderSize(fontId), true);
+      }
+    }
 
     if (boundary > 0) {
       // Bionic split: draw bold prefix (max 9 codepoints = 36 UTF-8 bytes + null).
@@ -78,7 +128,7 @@ void TextBlock::render(const GfxRenderer& renderer, const int fontId, const int
       renderer.drawText(fontId, wordX, y, words[i].c_str(), true, currentStyle);
     }
 
-    if (wordGuideDotXOffset[i] > 0) {
+    if (hasGuideDots && wordGuideDotXOffset[i] > 0) {
       renderer.drawText(fontId, wordX + wordGuideDotXOffset[i], y, "\xc2\xb7", true, EpdFontFamily::REGULAR);
     }
 
@@ -132,41 +182,75 @@ void TextBlock::render(const GfxRenderer& renderer, const int fontId, const int
 }
 
 bool TextBlock::serialize(FsFile& file) const {
+  const bool hasBionic = !wordBionicBoundary.empty();
+  const bool hasGuideDots = !wordGuideDotXOffset.empty();
   if (words.size() != wordXpos.size() || words.size() != wordStyles.size() ||
-      words.size() != wordBionicBoundary.size() || words.size() != wordBionicSuffixX.size() ||
-      words.size() != wordGuideDotXOffset.size()) {
-    LOG_ERR("TXB",
-            "Serialization failed: size mismatch (words=%u, xpos=%u, styles=%u, boundary=%u, suffixX=%u, dotX=%u)\n",
-            static_cast<uint32_t>(words.size()), static_cast<uint32_t>(wordXpos.size()),
-            static_cast<uint32_t>(wordStyles.size()), static_cast<uint32_t>(wordBionicBoundary.size()),
-            static_cast<uint32_t>(wordBionicSuffixX.size()), static_cast<uint32_t>(wordGuideDotXOffset.size()));
+      words.size() != wordBackgroundBlack.size() ||
+      (hasBionic && (words.size() != wordBionicBoundary.size() || words.size() != wordBionicSuffixX.size())) ||
+      (!hasBionic && !wordBionicSuffixX.empty()) || (hasGuideDots && words.size() != wordGuideDotXOffset.size())) {
+    LOG_ERR(
+        "TXB",
+        "Serialization failed: size mismatch (words=%u, xpos=%u, styles=%u, boundary=%u, suffixX=%u, dotX=%u, bg=%u)\n",
+        static_cast<uint32_t>(words.size()), static_cast<uint32_t>(wordXpos.size()),
+        static_cast<uint32_t>(wordStyles.size()), static_cast<uint32_t>(wordBionicBoundary.size()),
+        static_cast<uint32_t>(wordBionicSuffixX.size()), static_cast<uint32_t>(wordGuideDotXOffset.size()),
+        static_cast<uint32_t>(wordBackgroundBlack.size()));
     return false;
   }
 
   // Word data
-  serialization::writePod(file, static_cast<uint16_t>(words.size()));
-  for (const auto& w : words) serialization::writeString(file, w);
-  for (auto x : wordXpos) serialization::writePod(file, x);
-  for (auto s : wordStyles) serialization::writePod(file, s);
-  for (auto b : wordBionicBoundary) serialization::writePod(file, b);
-  for (auto sx : wordBionicSuffixX) serialization::writePod(file, sx);
-  for (auto dx : wordGuideDotXOffset) serialization::writePod(file, dx);
+  if (!serialization::tryWritePod(file, static_cast<uint16_t>(words.size()))) {
+    LOG_ERR("TXB", "Serialization failed: could not write word count");
+    return false;
+  }
+  for (const auto& w : words) {
+    if (!serialization::tryWriteString(file, w)) {
+      LOG_ERR("TXB", "Serialization failed: could not write word payload");
+      return false;
+    }
+  }
+  for (auto x : wordXpos) {
+    if (!serialization::tryWritePod(file, x)) return false;
+  }
+  for (auto s : wordStyles) {
+    if (!serialization::tryWritePod(file, s)) return false;
+  }
+  if (!serialization::tryWritePod(file, static_cast<uint8_t>(hasBionic ? 1 : 0))) {
+    return false;
+  }
+  if (hasBionic) {
+    for (auto b : wordBionicBoundary) {
+      if (!serialization::tryWritePod(file, b)) return false;
+    }
+    for (auto sx : wordBionicSuffixX) {
+      if (!serialization::tryWritePod(file, sx)) return false;
+    }
+  }
+  if (!serialization::tryWritePod(file, static_cast<uint8_t>(hasGuideDots ? 1 : 0))) {
+    return false;
+  }
+  if (hasGuideDots) {
+    for (auto dx : wordGuideDotXOffset) {
+      if (!serialization::tryWritePod(file, dx)) return false;
+    }
+  }
+  for (auto bg : wordBackgroundBlack) {
+    if (!serialization::tryWritePod(file, bg)) return false;
+  }
 
   // Style (alignment + margins/padding/indent)
-  serialization::writePod(file, blockStyle.alignment);
-  serialization::writePod(file, blockStyle.textAlignDefined);
-  serialization::writePod(file, blockStyle.marginTop);
-  serialization::writePod(file, blockStyle.marginBottom);
-  serialization::writePod(file, blockStyle.marginLeft);
-  serialization::writePod(file, blockStyle.marginRight);
-  serialization::writePod(file, blockStyle.paddingTop);
-  serialization::writePod(file, blockStyle.paddingBottom);
-  serialization::writePod(file, blockStyle.paddingLeft);
-  serialization::writePod(file, blockStyle.paddingRight);
-  serialization::writePod(file, blockStyle.textIndent);
-  serialization::writePod(file, blockStyle.textIndentDefined);
-
-  return true;
+  return serialization::tryWritePod(file, blockStyle.alignment) &&
+         serialization::tryWritePod(file, blockStyle.textAlignDefined) &&
+         serialization::tryWritePod(file, blockStyle.marginTop) &&
+         serialization::tryWritePod(file, blockStyle.marginBottom) &&
+         serialization::tryWritePod(file, blockStyle.marginLeft) &&
+         serialization::tryWritePod(file, blockStyle.marginRight) &&
+         serialization::tryWritePod(file, blockStyle.paddingTop) &&
+         serialization::tryWritePod(file, blockStyle.paddingBottom) &&
+         serialization::tryWritePod(file, blockStyle.paddingLeft) &&
+         serialization::tryWritePod(file, blockStyle.paddingRight) &&
+         serialization::tryWritePod(file, blockStyle.textIndent) &&
+         serialization::tryWritePod(file, blockStyle.textIndentDefined);
 }
 
 std::unique_ptr<TextBlock> TextBlock::deserialize(FsFile& file) {
@@ -177,10 +261,14 @@ std::unique_ptr<TextBlock> TextBlock::deserialize(FsFile& file) {
   std::vector<uint8_t> wordBionicBoundary;
   std::vector<uint16_t> wordBionicSuffixX;
   std::vector<uint16_t> wordGuideDotXOffset;
+  std::vector<uint8_t> wordBackgroundBlack;
   BlockStyle blockStyle;
 
   // Word count
-  serialization::readPod(file, wc);
+  if (!serialization::tryReadPod(file, wc)) {
+    LOG_ERR("TXB", "Deserialization failed: could not read word count");
+    return nullptr;
+  }
 
   // A TextBlock is one rendered line of text, so counts far above a few hundred are not legitimate.
   // Clamp aggressively here so corrupted cache data cannot trigger huge STL allocations on the ESP32-C3.
@@ -189,8 +277,8 @@ std::unique_ptr<TextBlock> TextBlock::deserialize(FsFile& file) {
     return nullptr;
   }
 
-  const uint32_t minimumRemainingBytes =
-      static_cast<uint32_t>(wc) * SERIALIZED_WORD_METADATA_BYTES + SERIALIZED_TEXT_BLOCK_TAIL_BYTES;
+  const uint32_t minimumRemainingBytes = static_cast<uint32_t>(wc) * SERIALIZED_MIN_WORD_METADATA_BYTES +
+                                         sizeof(uint8_t) + sizeof(uint8_t) + SERIALIZED_TEXT_BLOCK_TAIL_BYTES;
   const int remainingBeforeWords = file.available();
   if (remainingBeforeWords < 0 || static_cast<uint32_t>(remainingBeforeWords) < minimumRemainingBytes) {
     LOG_ERR("TXB", "Deserialization failed: truncated block metadata (%u words need at least %lu bytes, %d available)",
@@ -202,19 +290,15 @@ std::unique_ptr<TextBlock> TextBlock::deserialize(FsFile& file) {
   words.resize(wc);
   wordXpos.resize(wc);
   wordStyles.resize(wc);
-  wordBionicBoundary.resize(wc);
-  wordBionicSuffixX.resize(wc);
-  wordGuideDotXOffset.resize(wc);
+  wordBackgroundBlack.resize(wc);
   for (auto& w : words) {
     if (!readBoundedString(file, w)) {
       return nullptr;
     }
   }
 
-  const uint32_t remainingMetadataBytes =
-      static_cast<uint32_t>(wc) *
-          (sizeof(int16_t) + sizeof(EpdFontFamily::Style) + sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint16_t)) +
-      SERIALIZED_TEXT_BLOCK_TAIL_BYTES;
+  const uint32_t remainingMetadataBytes = static_cast<uint32_t>(wc) * SERIALIZED_POST_WORD_MIN_METADATA_BYTES +
+                                          sizeof(uint8_t) + sizeof(uint8_t) + SERIALIZED_TEXT_BLOCK_TAIL_BYTES;
   const int remainingAfterWords = file.available();
   if (remainingAfterWords < 0 || static_cast<uint32_t>(remainingAfterWords) < remainingMetadataBytes) {
     LOG_ERR("TXB", "Deserialization failed: truncated post-word metadata (%lu bytes needed, %d available)",
@@ -222,29 +306,62 @@ std::unique_ptr<TextBlock> TextBlock::deserialize(FsFile& file) {
     return nullptr;
   }
 
-  for (auto& x : wordXpos) serialization::readPod(file, x);
-  for (auto& s : wordStyles) serialization::readPod(file, s);
-  for (auto& b : wordBionicBoundary) serialization::readPod(file, b);
-  for (auto& sx : wordBionicSuffixX) serialization::readPod(file, sx);
-  for (auto& dx : wordGuideDotXOffset) serialization::readPod(file, dx);
+  for (auto& x : wordXpos) {
+    if (!serialization::tryReadPod(file, x)) return nullptr;
+  }
+  for (auto& s : wordStyles) {
+    if (!serialization::tryReadPod(file, s)) return nullptr;
+  }
+  uint8_t hasBionic = 0;
+  if (!serialization::tryReadPod(file, hasBionic) || hasBionic > 1) {
+    LOG_ERR("TXB", "Deserialization failed: invalid bionic metadata flag");
+    return nullptr;
+  }
+  if (hasBionic) {
+    wordBionicBoundary.resize(wc);
+    wordBionicSuffixX.resize(wc);
+    for (auto& b : wordBionicBoundary) {
+      if (!serialization::tryReadPod(file, b)) return nullptr;
+    }
+    for (auto& sx : wordBionicSuffixX) {
+      if (!serialization::tryReadPod(file, sx)) return nullptr;
+    }
+  }
+  uint8_t hasGuideDots = 0;
+  if (!serialization::tryReadPod(file, hasGuideDots) || hasGuideDots > 1) {
+    LOG_ERR("TXB", "Deserialization failed: invalid guide-dot metadata flag");
+    return nullptr;
+  }
+  if (hasGuideDots) {
+    wordGuideDotXOffset.resize(wc);
+    for (auto& dx : wordGuideDotXOffset) {
+      if (!serialization::tryReadPod(file, dx)) return nullptr;
+    }
+  }
+  for (auto& bg : wordBackgroundBlack) {
+    if (!serialization::tryReadPod(file, bg)) return nullptr;
+  }
 
   // Style (alignment + margins/padding/indent)
-  serialization::readPod(file, blockStyle.alignment);
-  serialization::readPod(file, blockStyle.textAlignDefined);
-  serialization::readPod(file, blockStyle.marginTop);
-  serialization::readPod(file, blockStyle.marginBottom);
-  serialization::readPod(file, blockStyle.marginLeft);
-  serialization::readPod(file, blockStyle.marginRight);
-  serialization::readPod(file, blockStyle.paddingTop);
-  serialization::readPod(file, blockStyle.paddingBottom);
-  serialization::readPod(file, blockStyle.paddingLeft);
-  serialization::readPod(file, blockStyle.paddingRight);
-  serialization::readPod(file, blockStyle.textIndent);
-  serialization::readPod(file, blockStyle.textIndentDefined);
-
-  auto* textBlock = new (std::nothrow)
-      TextBlock(std::move(words), std::move(wordXpos), std::move(wordStyles), std::move(wordBionicBoundary),
-                std::move(wordBionicSuffixX), std::move(wordGuideDotXOffset), blockStyle);
+  if (!serialization::tryReadPod(file, blockStyle.alignment) ||
+      !serialization::tryReadPod(file, blockStyle.textAlignDefined) ||
+      !serialization::tryReadPod(file, blockStyle.marginTop) ||
+      !serialization::tryReadPod(file, blockStyle.marginBottom) ||
+      !serialization::tryReadPod(file, blockStyle.marginLeft) ||
+      !serialization::tryReadPod(file, blockStyle.marginRight) ||
+      !serialization::tryReadPod(file, blockStyle.paddingTop) ||
+      !serialization::tryReadPod(file, blockStyle.paddingBottom) ||
+      !serialization::tryReadPod(file, blockStyle.paddingLeft) ||
+      !serialization::tryReadPod(file, blockStyle.paddingRight) ||
+      !serialization::tryReadPod(file, blockStyle.textIndent) ||
+      !serialization::tryReadPod(file, blockStyle.textIndentDefined)) {
+    LOG_ERR("TXB", "Deserialization failed: truncated block style metadata");
+    return nullptr;
+  }
+
+  auto* textBlock = new (std::nothrow) TextBlock(
+      std::move(words), std::move(wordXpos), std::move(wordStyles), std::move(wordBionicBoundary),
+      std::move(wordBionicSuffixX), std::move(wordGuideDotXOffset), std::move(wordBackgroundBlack), blockStyle);
   if (!textBlock) {
     LOG_ERR("TXB", "Deserialization failed: could not allocate TextBlock");
     return nullptr;
diff --git a/lib/Epub/Epub/blocks/TextBlock.h b/lib/Epub/Epub/blocks/TextBlock.h
index 03231eb2..02bb69c8 100644
--- a/lib/Epub/Epub/blocks/TextBlock.h
+++ b/lib/Epub/Epub/blocks/TextBlock.h
@@ -17,26 +17,32 @@ class TextBlock final : public Block {
   std::vector<EpdFontFamily::Style> wordStyles;
   // Per-word bionic boundary: N > 0 means the first N bytes of words[i] are rendered bold,
   // the remainder in the base style. 0 means no split (whole word uses wordStyles[i]).
+  // Empty when no word in the block has a bionic split.
   std::vector<uint8_t> wordBionicBoundary;
   // Pre-computed pixel offset from word start to the regular suffix, stored when boundary > 0.
   // Eliminates getTextAdvanceX from the render path. 0 when boundary == 0.
+  // Empty in lockstep with wordBionicBoundary.
   std::vector<uint16_t> wordBionicSuffixX;
   // Pre-computed pixel offset from word start to the guide dot that follows it. 0 = no dot.
   // Eliminates the guide dot as a separate TextBlock entry, saving ~12 bytes per inter-word gap.
+  // Empty when no word in the block has a guide dot.
   std::vector<uint16_t> wordGuideDotXOffset;
+  // 1 when a simple black CSS background should be painted behind this word/token.
+  std::vector<uint8_t> wordBackgroundBlack;
   BlockStyle blockStyle;
 
  public:
   explicit TextBlock(std::vector<std::string> words, std::vector<int16_t> word_xpos,
                      std::vector<EpdFontFamily::Style> word_styles, std::vector<uint8_t> bionic_boundary,
                      std::vector<uint16_t> bionic_suffix_x, std::vector<uint16_t> guide_dot_x_offset,
-                     const BlockStyle& blockStyle = BlockStyle())
+                     std::vector<uint8_t> background_black, const BlockStyle& blockStyle = BlockStyle())
       : words(std::move(words)),
         wordXpos(std::move(word_xpos)),
         wordStyles(std::move(word_styles)),
         wordBionicBoundary(std::move(bionic_boundary)),
         wordBionicSuffixX(std::move(bionic_suffix_x)),
         wordGuideDotXOffset(std::move(guide_dot_x_offset)),
+        wordBackgroundBlack(std::move(background_black)),
         blockStyle(blockStyle) {}
   ~TextBlock() override = default;
   void setBlockStyle(const BlockStyle& blockStyle) { this->blockStyle = blockStyle; }
diff --git a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.cpp b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.cpp
index bee6f272..8e44ef09 100644
--- a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.cpp
+++ b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.cpp
@@ -2,10 +2,14 @@
 
 #include <Logging.h>
 
-bool ImageToFramebufferDecoder::validateImageDimensions(int width, int height, const std::string& format) {
-  if (width * height > MAX_SOURCE_PIXELS) {
-    LOG_ERR("IMG", "Image too large (%dx%d = %d pixels %s), max supported: %d pixels", width, height, width * height,
-            format.c_str(), MAX_SOURCE_PIXELS);
+bool ImageToFramebufferDecoder::validateImageDimensions(int width, int height, const std::string& format,
+                                                        int maxSourceWidth) {
+  const int64_t pixels = static_cast<int64_t>(width) * static_cast<int64_t>(height);
+  if (width <= 0 || height <= 0 || width > maxSourceWidth || height > MAX_SOURCE_HEIGHT || pixels > MAX_SOURCE_PIXELS) {
+    LOG_ERR("IMG",
+            "Image too large or invalid (%dx%d %s, pixels=%lld), max supported: width<=%d height<=%d pixels<=%lld",
+            width, height, format.c_str(), static_cast<long long>(pixels), maxSourceWidth, MAX_SOURCE_HEIGHT,
+            static_cast<long long>(MAX_SOURCE_PIXELS));
     return false;
   }
   return true;
diff --git a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
index afb5c3bd..ab8bffa4 100644
--- a/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
+++ b/lib/Epub/Epub/converters/ImageToFramebufferDecoder.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <HalStorage.h>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
@@ -33,8 +34,13 @@ class ImageToFramebufferDecoder {
 
  protected:
   // Size validation helpers
-  static constexpr int MAX_SOURCE_PIXELS = 3145728;  // 2048 * 1536
-
-  bool validateImageDimensions(int width, int height, const std::string& format);
+  static constexpr int MAX_SOURCE_WIDTH = 2048;
+  // JPEGDEC streams scaled MCU blocks, so moderately wider JPEG sources are
+  // safe as long as the total-pixel and heap guards still pass.
+  static constexpr int MAX_JPEG_SOURCE_WIDTH = 4096;
+  static constexpr int MAX_SOURCE_HEIGHT = 3072;
+  static constexpr int64_t MAX_SOURCE_PIXELS = 2048LL * 3072LL;
+
+  bool validateImageDimensions(int width, int height, const std::string& format, int maxSourceWidth = MAX_SOURCE_WIDTH);
   void warnUnsupportedFeature(const std::string& feature, const std::string& imagePath);
 };
diff --git a/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp b/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
index 4cf55ae3..9fd66141 100644
--- a/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
+++ b/lib/Epub/Epub/converters/JpegToFramebufferConverter.cpp
@@ -5,6 +5,7 @@
 #include <HalStorage.h>
 #include <JPEGDEC.h>
 #include <Logging.h>
+#include <MemoryBudget.h>
 
 #include <cstdlib>
 #include <new>
@@ -32,9 +33,15 @@ struct JpegContext {
   int dstWidth{0};
   int dstHeight{0};
 
-  // Fine scale in 16.16 fixed-point (ESP32-C3 has no FPU)
-  int32_t fineScaleFP{1 << 16};  // src -> dst mapping
-  int32_t invScaleFP{1 << 16};   // dst -> src mapping
+  // Fine scale in 16.16 fixed-point (ESP32-C3 has no FPU).
+  // X and Y axes use separate scale factors: the aspect ratio of the output (dstWidth/dstHeight)
+  // may differ from the source (srcWidth/srcHeight) due to integer rounding of displayHeight.
+  // Using a single (X-based) scale for both axes causes the wrong srcRow to be skipped
+  // during nearest-neighbor downscaling, potentially losing critical image content.
+  int32_t fineScaleFPX{1 << 16};  // X: src -> dst column mapping
+  int32_t invScaleFPX{1 << 16};   // X: dst -> src column mapping
+  int32_t fineScaleFPY{1 << 16};  // Y: src -> dst row mapping
+  int32_t invScaleFPY{1 << 16};   // Y: dst -> src row mapping
 
   PixelCache cache;
   bool caching{false};
@@ -83,8 +90,7 @@ int32_t jpegSeek(JPEGFILE* pFile, int32_t pos) {
 
 // JPEGDEC object is ~17 KB due to internal decode buffers.
 // Heap-allocate on demand so memory is only used during active decode.
-constexpr size_t JPEG_DECODER_APPROX_SIZE = 20 * 1024;
-constexpr size_t MIN_FREE_HEAP_FOR_JPEG = JPEG_DECODER_APPROX_SIZE + 16 * 1024;
+constexpr uint32_t JPEG_DECODER_APPROX_SIZE = 20U * 1024U;
 
 // Choose JPEGDEC's built-in scale factor for coarse downscaling.
 // Returns the scale denominator (1, 2, 4, or 8) and sets jpegScaleOption.
@@ -125,8 +131,10 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
 
   const bool useDithering = ctx->config->useDithering;
   const bool caching = ctx->caching;
-  const int32_t fineScaleFP = ctx->fineScaleFP;
-  const int32_t invScaleFP = ctx->invScaleFP;
+  const int32_t fineScaleFPX = ctx->fineScaleFPX;
+  const int32_t invScaleFPX = ctx->invScaleFPX;
+  const int32_t fineScaleFPY = ctx->fineScaleFPY;
+  const int32_t invScaleFPY = ctx->invScaleFPY;
   GfxRenderer& renderer = *ctx->renderer;
   const int cfgX = ctx->config->x;
   const int cfgY = ctx->config->y;
@@ -137,10 +145,10 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
   const int srcYEnd = blockY + blockH;
   const int srcXEnd = blockX + validW;
 
-  int dstYStart = (int)((int64_t)blockY * fineScaleFP >> FP_SHIFT);
-  int dstYEnd = (srcYEnd >= ctx->scaledSrcHeight) ? ctx->dstHeight : (int)((int64_t)srcYEnd * fineScaleFP >> FP_SHIFT);
-  int dstXStart = (int)((int64_t)blockX * fineScaleFP >> FP_SHIFT);
-  int dstXEnd = (srcXEnd >= ctx->scaledSrcWidth) ? ctx->dstWidth : (int)((int64_t)srcXEnd * fineScaleFP >> FP_SHIFT);
+  int dstYStart = (int)((int64_t)blockY * fineScaleFPY >> FP_SHIFT);
+  int dstYEnd = (srcYEnd >= ctx->scaledSrcHeight) ? ctx->dstHeight : (int)((int64_t)srcYEnd * fineScaleFPY >> FP_SHIFT);
+  int dstXStart = (int)((int64_t)blockX * fineScaleFPX >> FP_SHIFT);
+  int dstXEnd = (srcXEnd >= ctx->scaledSrcWidth) ? ctx->dstWidth : (int)((int64_t)srcXEnd * fineScaleFPX >> FP_SHIFT);
 
   // Pre-clamp destination ranges to screen bounds (eliminates per-pixel screen checks)
   int clampYMax = ctx->dstHeight;
@@ -165,7 +173,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
   }
 
   // === 1:1 fast path: no scaling math ===
-  if (fineScaleFP == FP_ONE) {
+  if (fineScaleFPX == FP_ONE && fineScaleFPY == FP_ONE) {
     for (int dstY = dstYStart; dstY < dstYEnd; dstY++) {
       const int outY = cfgY + dstY;
       pw.beginRow(outY);
@@ -191,11 +199,11 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
   // === Bilinear interpolation (upscale: fineScale > 1.0) ===
   // Smooths block boundaries that would otherwise create visible banding
   // on progressive JPEG DC-only decode (1/8 resolution upscaled to target).
-  if (fineScaleFP > FP_ONE) {
+  if (fineScaleFPX > FP_ONE || fineScaleFPY > FP_ONE) {
     // Pre-compute safe X range where lx0 and lx0+1 are both in [0, validW-1].
     // Only the left/right edge pixels (typically 0-2 and 1-8 respectively) need clamping.
-    int safeXStart = (int)(((int64_t)blockX * fineScaleFP + FP_MASK) >> FP_SHIFT);
-    int safeXEnd = (int)((int64_t)(blockX + validW - 1) * fineScaleFP >> FP_SHIFT);
+    int safeXStart = (int)(((int64_t)blockX * fineScaleFPX + FP_MASK) >> FP_SHIFT);
+    int safeXEnd = (int)((int64_t)(blockX + validW - 1) * fineScaleFPX >> FP_SHIFT);
     if (safeXStart < dstXStart) safeXStart = dstXStart;
     if (safeXEnd > dstXEnd) safeXEnd = dstXEnd;
     if (safeXStart > safeXEnd) safeXEnd = safeXStart;
@@ -204,7 +212,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
       const int outY = cfgY + dstY;
       pw.beginRow(outY);
       if (caching) cw.beginRow(outY, ctx->config->y);
-      const int32_t srcFyFP = dstY * invScaleFP;
+      const int32_t srcFyFP = dstY * invScaleFPY;
       const int32_t fy = srcFyFP & FP_MASK;
       const int32_t fyInv = FP_ONE - fy;
       int ly0 = (srcFyFP >> FP_SHIFT) - blockY;
@@ -219,7 +227,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
       // Left edge (with X boundary clamping)
       for (int dstX = dstXStart; dstX < safeXStart; dstX++) {
         const int outX = cfgX + dstX;
-        const int32_t srcFxFP = dstX * invScaleFP;
+        const int32_t srcFxFP = dstX * invScaleFPX;
         const int32_t fx = srcFxFP & FP_MASK;
         const int32_t fxInv = FP_ONE - fx;
         int lx0 = (srcFxFP >> FP_SHIFT) - blockX;
@@ -247,7 +255,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
       // Interior (no X boundary checks — lx0 and lx0+1 guaranteed in bounds)
       for (int dstX = safeXStart; dstX < safeXEnd; dstX++) {
         const int outX = cfgX + dstX;
-        const int32_t srcFxFP = dstX * invScaleFP;
+        const int32_t srcFxFP = dstX * invScaleFPX;
         const int32_t fx = srcFxFP & FP_MASK;
         const int32_t fxInv = FP_ONE - fx;
         const int lx0 = (srcFxFP >> FP_SHIFT) - blockX;
@@ -270,7 +278,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
       // Right edge (with X boundary clamping)
       for (int dstX = safeXEnd; dstX < dstXEnd; dstX++) {
         const int outX = cfgX + dstX;
-        const int32_t srcFxFP = dstX * invScaleFP;
+        const int32_t srcFxFP = dstX * invScaleFPX;
         const int32_t fx = srcFxFP & FP_MASK;
         const int32_t fxInv = FP_ONE - fx;
         int lx0 = (srcFxFP >> FP_SHIFT) - blockX;
@@ -301,7 +309,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
     const int outY = cfgY + dstY;
     pw.beginRow(outY);
     if (caching) cw.beginRow(outY, ctx->config->y);
-    const int32_t srcFyFP = dstY * invScaleFP;
+    const int32_t srcFyFP = dstY * invScaleFPY;
     int ly = (srcFyFP >> FP_SHIFT) - blockY;
     if (ly < 0) ly = 0;
     if (ly >= blockH) ly = blockH - 1;
@@ -309,7 +317,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
 
     for (int dstX = dstXStart; dstX < dstXEnd; dstX++) {
       const int outX = cfgX + dstX;
-      const int32_t srcFxFP = dstX * invScaleFP;
+      const int32_t srcFxFP = dstX * invScaleFPX;
       int lx = (srcFxFP >> FP_SHIFT) - blockX;
       if (lx < 0) lx = 0;
       if (lx >= validW) lx = validW - 1;
@@ -333,9 +341,7 @@ int jpegDrawCallback(JPEGDRAW* pDraw) {
 }  // namespace
 
 bool JpegToFramebufferConverter::getDimensionsStatic(const std::string& imagePath, ImageDimensions& out) {
-  size_t freeHeap = ESP.getFreeHeap();
-  if (freeHeap < MIN_FREE_HEAP_FOR_JPEG) {
-    LOG_ERR("JPG", "Not enough heap for JPEG decoder (%u free, need %u)", freeHeap, MIN_FREE_HEAP_FOR_JPEG);
+  if (!MemoryBudget::hasHeapForImageDecoder("JPG", "JPEG", JPEG_DECODER_APPROX_SIZE)) {
     return false;
   }
 
@@ -365,9 +371,7 @@ bool JpegToFramebufferConverter::decodeToFramebuffer(const std::string& imagePat
                                                      const RenderConfig& config) {
   LOG_DBG("JPG", "Decoding JPEG: %s", imagePath.c_str());
 
-  size_t freeHeap = ESP.getFreeHeap();
-  if (freeHeap < MIN_FREE_HEAP_FOR_JPEG) {
-    LOG_ERR("JPG", "Not enough heap for JPEG decoder (%u free, need %u)", freeHeap, MIN_FREE_HEAP_FOR_JPEG);
+  if (!MemoryBudget::hasHeapForImageDecoder("JPG", "JPEG", JPEG_DECODER_APPROX_SIZE)) {
     return false;
   }
 
@@ -400,7 +404,7 @@ bool JpegToFramebufferConverter::decodeToFramebuffer(const std::string& imagePat
     return false;
   }
 
-  if (!validateImageDimensions(srcWidth, srcHeight, "JPEG")) {
+  if (!validateImageDimensions(srcWidth, srcHeight, "JPEG", MAX_JPEG_SOURCE_WIDTH)) {
     jpeg->close();
     delete jpeg;
     return false;
@@ -442,16 +446,34 @@ bool JpegToFramebufferConverter::decodeToFramebuffer(const std::string& imagePat
     jpegScaleDenom = chooseJpegScale(targetScale, jpegScaleOption);
   }
 
+  if (destWidth <= 0 || destHeight <= 0) {
+    LOG_ERR("JPG", "Degenerate output dimensions %dx%d for %s, skipping render", destWidth, destHeight,
+            imagePath.c_str());
+    jpeg->close();
+    delete jpeg;
+    return false;
+  }
+
   ctx.scaledSrcWidth = (srcWidth + jpegScaleDenom - 1) / jpegScaleDenom;
   ctx.scaledSrcHeight = (srcHeight + jpegScaleDenom - 1) / jpegScaleDenom;
   ctx.dstWidth = destWidth;
   ctx.dstHeight = destHeight;
-  ctx.fineScaleFP = (int32_t)((int64_t)destWidth * FP_ONE / ctx.scaledSrcWidth);
-  ctx.invScaleFP = (int32_t)((int64_t)ctx.scaledSrcWidth * FP_ONE / destWidth);
+  if (ctx.scaledSrcWidth <= 0 || ctx.scaledSrcHeight <= 0) {
+    LOG_ERR("JPG", "Invalid scaled JPEG dimensions: src=%dx%d scaled=%dx%d dst=%dx%d", srcWidth, srcHeight,
+            ctx.scaledSrcWidth, ctx.scaledSrcHeight, destWidth, destHeight);
+    jpeg->close();
+    delete jpeg;
+    return false;
+  }
+
+  ctx.fineScaleFPX = (int32_t)((int64_t)destWidth * FP_ONE / ctx.scaledSrcWidth);
+  ctx.fineScaleFPY = (int32_t)((int64_t)destHeight * FP_ONE / ctx.scaledSrcHeight);
+  ctx.invScaleFPX = (int32_t)((int64_t)ctx.scaledSrcWidth * FP_ONE / destWidth);
+  ctx.invScaleFPY = (int32_t)((int64_t)ctx.scaledSrcHeight * FP_ONE / destHeight);
 
-  LOG_DBG("JPG", "JPEG %dx%d -> %dx%d (scale %.2f, jpegScale 1/%d, fineScale %.2f)%s", srcWidth, srcHeight, destWidth,
-          destHeight, targetScale, jpegScaleDenom, (float)destWidth / ctx.scaledSrcWidth,
-          isProgressive ? " [progressive]" : "");
+  LOG_DBG("JPG", "JPEG %dx%d -> %dx%d (scale %.2f, jpegScale 1/%d, fineScale %.2fx%.2f)%s", srcWidth, srcHeight,
+          destWidth, destHeight, targetScale, jpegScaleDenom, (float)destWidth / ctx.scaledSrcWidth,
+          (float)destHeight / ctx.scaledSrcHeight, isProgressive ? " [progressive]" : "");
 
   // Set pixel type to 8-bit grayscale (must be after open())
   jpeg->setPixelType(EIGHT_BIT_GRAYSCALE);
diff --git a/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp b/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
index 0cc1616a..5a720316 100644
--- a/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
+++ b/lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
@@ -4,6 +4,7 @@
 #include <GfxRenderer.h>
 #include <HalStorage.h>
 #include <Logging.h>
+#include <MemoryBudget.h>
 #include <PNGdec.h>
 
 #include <cstdlib>
@@ -74,8 +75,7 @@ int32_t pngSeekWithHandle(PNGFILE* pFile, int32_t pos) {
 // We heap-allocate it on demand rather than using a static instance, so this memory
 // is only consumed while actually decoding/querying PNG images. This is critical on
 // the ESP32-C3 where total RAM is ~320 KB.
-constexpr size_t PNG_DECODER_APPROX_SIZE = 44 * 1024;                          // ~42 KB + overhead
-constexpr size_t MIN_FREE_HEAP_FOR_PNG = PNG_DECODER_APPROX_SIZE + 16 * 1024;  // decoder + 16 KB headroom
+constexpr uint32_t PNG_DECODER_APPROX_SIZE = 44U * 1024U;  // ~42 KB + overhead
 
 // PNGdec keeps TWO scanlines in its internal ucPixels buffer (current + previous)
 // and each scanline includes a leading filter byte.
@@ -210,7 +210,7 @@ int pngDrawCallback(PNGDRAW* pDraw) {
 
   for (int dstX = 0; dstX < dstWidth; dstX++) {
     int outX = outXBase + dstX;
-    if (outX < screenWidth) {
+    if (outX >= 0 && outX < screenWidth) {
       uint8_t gray = ctx->grayLineBuffer[srcX];
 
       uint8_t ditheredGray;
@@ -238,9 +238,7 @@ int pngDrawCallback(PNGDRAW* pDraw) {
 }  // namespace
 
 bool PngToFramebufferConverter::getDimensionsStatic(const std::string& imagePath, ImageDimensions& out) {
-  size_t freeHeap = ESP.getFreeHeap();
-  if (freeHeap < MIN_FREE_HEAP_FOR_PNG) {
-    LOG_ERR("PNG", "Not enough heap for PNG decoder (%u free, need %u)", freeHeap, MIN_FREE_HEAP_FOR_PNG);
+  if (!MemoryBudget::hasHeapForImageDecoder("PNG", "PNG", PNG_DECODER_APPROX_SIZE)) {
     return false;
   }
 
@@ -271,9 +269,7 @@ bool PngToFramebufferConverter::decodeToFramebuffer(const std::string& imagePath
                                                     const RenderConfig& config) {
   LOG_DBG("PNG", "Decoding PNG: %s", imagePath.c_str());
 
-  size_t freeHeap = ESP.getFreeHeap();
-  if (freeHeap < MIN_FREE_HEAP_FOR_PNG) {
-    LOG_ERR("PNG", "Not enough heap for PNG decoder (%u free, need %u)", freeHeap, MIN_FREE_HEAP_FOR_PNG);
+  if (!MemoryBudget::hasHeapForImageDecoder("PNG", "PNG", PNG_DECODER_APPROX_SIZE)) {
     return false;
   }
 
diff --git a/lib/Epub/Epub/css/CssParser.cpp b/lib/Epub/Epub/css/CssParser.cpp
index a5d4944f..b85f0e7c 100644
--- a/lib/Epub/Epub/css/CssParser.cpp
+++ b/lib/Epub/Epub/css/CssParser.cpp
@@ -5,7 +5,9 @@
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <cctype>
+#include <iterator>
 #include <string_view>
 
 namespace {
@@ -52,9 +54,35 @@ constexpr size_t MIN_FREE_HEAP_FOR_CSS = 48 * 1024;
 // Prevents parsing of extremely long or malformed selectors
 constexpr size_t MAX_SELECTOR_LENGTH = 256;
 
+// Grow selector storage in small chunks. Reserving MAX_RULES up front can
+// require one large contiguous heap block and abort on ESP32-C3.
+constexpr size_t RULE_RESERVE_CHUNK = 32;
+constexpr uint32_t MIN_HEAP_AFTER_RULE_GROW = 16 * 1024;
+
 // Check if character is CSS whitespace
 bool isCssWhitespace(const char c) { return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f'; }
 
+size_t mergeDuplicateRules(std::vector<std::pair<std::string, CssStyle>>& rules) {
+  if (rules.empty()) return 0;
+  assert(std::is_sorted(rules.begin(), rules.end(), [](const auto& a, const auto& b) { return a.first < b.first; }));
+
+  const size_t originalSize = rules.size();
+  auto writeIt = rules.begin();
+  for (auto readIt = std::next(rules.begin()); readIt != rules.end(); ++readIt) {
+    if (writeIt->first == readIt->first) {
+      writeIt->second.applyOver(readIt->second);
+      continue;
+    }
+    ++writeIt;
+    if (writeIt != readIt) {
+      *writeIt = std::move(*readIt);
+    }
+  }
+
+  rules.erase(std::next(writeIt), rules.end());
+  return originalSize - rules.size();
+}
+
 std::string_view stripTrailingImportant(std::string_view value) {
   constexpr std::string_view IMPORTANT = "!important";
 
@@ -78,6 +106,57 @@ std::string_view stripTrailingImportant(std::string_view value) {
   return value;
 }
 
+bool tryInterpretBackgroundBlack(std::string_view value, bool& out) {
+  value = stripTrailingImportant(value);
+  while (!value.empty() && isCssWhitespace(value.front())) {
+    value.remove_prefix(1);
+  }
+
+  if (value.empty()) {
+    return false;
+  }
+
+  bool sawExplicitNonBlack = false;
+  size_t tokenStart = 0;
+  for (size_t i = 0; i <= value.size(); ++i) {
+    if (i == value.size() || isCssWhitespace(value[i])) {
+      if (i > tokenStart) {
+        const std::string_view token = value.substr(tokenStart, i - tokenStart);
+        if (token == "black" || token == "#000" || token == "#000000") {
+          out = true;
+          return true;
+        }
+        if (token == "white" || token == "#fff" || token == "#ffffff" || token == "transparent" || token == "none") {
+          sawExplicitNonBlack = true;
+        }
+      }
+      tokenStart = i + 1;
+    }
+  }
+
+  std::string compact;
+  compact.reserve(value.size());
+  for (const char c : value) {
+    if (!isCssWhitespace(c)) {
+      compact.push_back(c);
+    }
+  }
+
+  if (compact == "rgb(0,0,0)" || compact == "rgba(0,0,0,1)" || compact == "rgba(0,0,0,1.0)" ||
+      compact.find("rgb(0,0,0)") != std::string::npos || compact.find("rgba(0,0,0,1)") != std::string::npos ||
+      compact.find("rgba(0,0,0,1.0)") != std::string::npos) {
+    out = true;
+    return true;
+  }
+
+  if (sawExplicitNonBlack || compact == "transparent" || compact == "none") {
+    out = false;
+    return true;
+  }
+
+  return false;
+}
+
 }  // anonymous namespace
 
 // String utilities implementation
@@ -350,6 +429,12 @@ void CssParser::parseDeclarationIntoStyle(const std::string& decl, CssStyle& sty
     const std::string_view displayValue = stripTrailingImportant(propValueBuf);
     style.display = (displayValue == "none") ? CssDisplay::None : CssDisplay::Block;
     style.defined.display = 1;
+  } else if (propNameBuf == "background" || propNameBuf == "background-color") {
+    bool backgroundBlack = false;
+    if (tryInterpretBackgroundBlack(propValueBuf, backgroundBlack)) {
+      style.backgroundBlack = backgroundBlack;
+      style.defined.backgroundBlack = 1;
+    }
   }
 }
 
@@ -402,11 +487,67 @@ bool CssParser::selectorMatchesElement(const std::string& selector, const std::s
 
 // Rule processing
 
-void CssParser::processRuleBlockWithStyle(const std::string& selectorGroup, const CssStyle& style) {
+bool CssParser::ensureRuleCapacity() {
+  if (rulesBySelector_.size() < rulesBySelector_.capacity()) {
+    return true;
+  }
+  if (rulesBySelector_.capacity() >= MAX_RULES) {
+    return false;
+  }
+
+  const size_t nextCapacity = std::min(rulesBySelector_.capacity() + RULE_RESERVE_CHUNK, MAX_RULES);
+  size_t existingKeyCapacity = 0;
+  for (const auto& rule : rulesBySelector_) {
+    existingKeyCapacity += rule.first.capacity() + 1;
+  }
+  size_t averageKeyCapacity = MAX_SELECTOR_LENGTH / 2;
+  if (!rulesBySelector_.empty()) {
+    averageKeyCapacity = std::max<size_t>(1, existingKeyCapacity / rulesBySelector_.size());
+  }
+  const size_t extraSlots = nextCapacity - rulesBySelector_.size();
+  const size_t reserveBytes = nextCapacity * sizeof(decltype(rulesBySelector_)::value_type) + existingKeyCapacity +
+                              extraSlots * (averageKeyCapacity + 1);
+  const uint32_t freeHeap = ESP.getFreeHeap();
+  const uint32_t maxAllocHeap = ESP.getMaxAllocHeap();
+  if (freeHeap <= reserveBytes + MIN_HEAP_AFTER_RULE_GROW || maxAllocHeap <= reserveBytes + MIN_HEAP_AFTER_RULE_GROW) {
+    LOG_ERR("CSS", "Skipping remaining CSS rules: heap too low for rule table growth (free=%u, maxAlloc=%u, need=%zu)",
+            freeHeap, maxAllocHeap, reserveBytes);
+    return false;
+  }
+
+  rulesBySelector_.reserve(nextCapacity);
+  return true;
+}
+
+bool CssParser::upsertRule(std::string key, const CssStyle& style) {
+  const auto it = std::lower_bound(rulesBySelector_.begin(), rulesBySelector_.end(), key,
+                                   [](const std::pair<std::string, CssStyle>& entry, const std::string& searchKey) {
+                                     return entry.first < searchKey;
+                                   });
+  if (it != rulesBySelector_.end() && it->first == key) {
+    it->second.applyOver(style);
+    return true;
+  }
+
+  if (rulesBySelector_.size() >= MAX_RULES) {
+    LOG_ERR("CSS", "Reached max rules limit, treating CSS parse as incomplete");
+    return false;
+  }
+
+  const size_t insertIndex = std::distance(rulesBySelector_.begin(), it);
+  if (!ensureRuleCapacity()) {
+    return false;
+  }
+
+  rulesBySelector_.insert(rulesBySelector_.begin() + insertIndex, {std::move(key), style});
+  return true;
+}
+
+bool CssParser::processRuleBlockWithStyle(const std::string& selectorGroup, const CssStyle& style) {
   // Check if we've reached the rule limit before processing
   if (rulesBySelector_.size() >= MAX_RULES) {
-    LOG_DBG("CSS", "Reached max rules limit (%zu), stopping CSS parsing", MAX_RULES);
-    return;
+    LOG_ERR("CSS", "Reached max rules limit (%zu), treating CSS parse as incomplete", MAX_RULES);
+    return false;
   }
 
   // Handle comma-separated selectors
@@ -500,20 +641,9 @@ void CssParser::processRuleBlockWithStyle(const std::string& selectorGroup, cons
       continue;
     }
 
-    // Skip if this would exceed the rule limit
-    if (rulesBySelector_.size() >= MAX_RULES) {
-      LOG_DBG("CSS", "Reached max rules limit, stopping selector processing");
-      return;
-    }
-
-    // Store or merge with existing
-    auto it = rulesBySelector_.find(key);
-    if (it != rulesBySelector_.end()) {
-      it->second.applyOver(style);
-    } else {
-      rulesBySelector_[key] = style;
-    }
+    if (!upsertRule(std::move(key), style)) return false;
   }
+  return true;
 }
 
 // Main parsing entry point
@@ -542,6 +672,7 @@ bool CssParser::loadFromStream(FsFile& source) {
 
   int bodyDepth = 0;
   bool skippingRule = false;
+  bool stopParsing = false;
   CssStyle currentStyle;
 
   auto handleChar = [&](const char c) {
@@ -591,7 +722,7 @@ bool CssParser::loadFromStream(FsFile& source) {
           parseDeclarationIntoStyle(declBuffer.str(), currentStyle, propNameBuf, propValueBuf);
         }
         if (!skippingRule) {
-          processRuleBlockWithStyle(selector.str(), currentStyle);
+          stopParsing = !processRuleBlockWithStyle(selector.str(), currentStyle);
         }
         selector.clear();
         declBuffer.clear();
@@ -616,13 +747,13 @@ bool CssParser::loadFromStream(FsFile& source) {
   };
 
   char buffer[READ_BUFFER_SIZE];
-  while (source.available()) {
+  while (!stopParsing && source.available()) {
     int bytesRead = source.read(buffer, sizeof(buffer));
     if (bytesRead <= 0) break;
 
     totalRead += static_cast<size_t>(bytesRead);
 
-    for (int i = 0; i < bytesRead; ++i) {
+    for (int i = 0; i < bytesRead && !stopParsing; ++i) {
       const char c = buffer[i];
 
       if (inComment) {
@@ -656,16 +787,42 @@ bool CssParser::loadFromStream(FsFile& source) {
     }
   }
 
-  if (maybeSlash) {
+  if (!stopParsing && maybeSlash) {
     handleChar('/');
   }
 
+  if (stopParsing) {
+    LOG_ERR("CSS", "CSS parse stopped after %zu bytes with %zu selector rules and %zu descendant rules loaded",
+            totalRead, rulesBySelector_.size(), descendantRules_.size());
+    return false;
+  }
+
+  std::sort(rulesBySelector_.begin(), rulesBySelector_.end(),
+            [](const std::pair<std::string, CssStyle>& a, const std::pair<std::string, CssStyle>& b) {
+              return a.first < b.first;
+            });
+  const size_t duplicateCount = mergeDuplicateRules(rulesBySelector_);
+  if (duplicateCount > 0) {
+    LOG_DBG("CSS", "Merged %zu duplicate CSS selector rules after parse", duplicateCount);
+  }
+
   LOG_DBG("CSS", "Parsed %zu rules from %zu bytes", rulesBySelector_.size(), totalRead);
   return true;
 }
 
 // Style resolution
 
+const CssStyle* CssParser::findRule(const std::string& key) const {
+  auto it = std::lower_bound(rulesBySelector_.begin(), rulesBySelector_.end(), key,
+                             [](const std::pair<std::string, CssStyle>& entry, const std::string& searchKey) {
+                               return entry.first < searchKey;
+                             });
+  if (it != rulesBySelector_.end() && it->first == key) {
+    return &it->second;
+  }
+  return nullptr;
+}
+
 CssStyle CssParser::resolveStyle(const std::string& tagName, const std::string& classAttr,
                                  const std::vector<CssAncestorEntry>& ancestors) const {
   static bool lowHeapWarningLogged = false;
@@ -681,9 +838,8 @@ CssStyle CssParser::resolveStyle(const std::string& tagName, const std::string&
   const std::string tag = normalized(tagName);
 
   // 1. Apply element-level style (lowest priority)
-  const auto tagIt = rulesBySelector_.find(tag);
-  if (tagIt != rulesBySelector_.end()) {
-    result.applyOver(tagIt->second);
+  if (const auto* tagStyle = findRule(tag)) {
+    result.applyOver(*tagStyle);
   }
 
   // 2. Apply two-part descendant rules — higher specificity than bare element, lower than class
@@ -704,24 +860,27 @@ CssStyle CssParser::resolveStyle(const std::string& tagName, const std::string&
   // 4. Apply class styles (medium priority)
   if (!classAttr.empty()) {
     const auto classes = splitWhitespace(classAttr);
+    std::string selectorKey;
+    selectorKey.reserve(tag.size() + MAX_SELECTOR_LENGTH + 2);
 
     for (const auto& cls : classes) {
-      std::string classKey = "." + normalized(cls);
-
-      auto classIt = rulesBySelector_.find(classKey);
-      if (classIt != rulesBySelector_.end()) {
-        result.applyOver(classIt->second);
+      selectorKey.clear();
+      selectorKey.push_back('.');
+      selectorKey.append(normalized(cls));
+      if (const auto* classStyle = findRule(selectorKey)) {
+        result.applyOver(*classStyle);
       }
     }
 
     // TODO: Support combinations of classes (e.g. style on p.class1.class2)
     // 5. Apply element.class styles (highest priority)
     for (const auto& cls : classes) {
-      std::string combinedKey = tag + "." + normalized(cls);
-
-      auto combinedIt = rulesBySelector_.find(combinedKey);
-      if (combinedIt != rulesBySelector_.end()) {
-        result.applyOver(combinedIt->second);
+      selectorKey.clear();
+      selectorKey.append(tag);
+      selectorKey.push_back('.');
+      selectorKey.append(normalized(cls));
+      if (const auto* combinedStyle = findRule(selectorKey)) {
+        result.applyOver(*combinedStyle);
       }
     }
   }
@@ -735,7 +894,7 @@ CssStyle CssParser::parseInlineStyle(const std::string& styleValue) { return par
 
 // Cache serialization
 
-// Cache file name (version is CssParser::CSS_CACHE_VERSION)
+// Cache file name (magic + version identify Crossink-owned CSS rule caches)
 constexpr char rulesCache[] = "/css_rules.cache";
 
 bool CssParser::hasCache() const { return Storage.exists((cachePath + rulesCache).c_str()); }
@@ -754,7 +913,9 @@ bool CssParser::saveToCache() const {
     return false;
   }
 
-  // Write version
+  // Write header
+  const uint32_t magic = CssParser::CSS_CACHE_MAGIC;
+  file.write(reinterpret_cast<const uint8_t*>(&magic), sizeof(magic));
   file.write(CssParser::CSS_CACHE_VERSION);
 
   // Write rule count
@@ -783,7 +944,8 @@ bool CssParser::saveToCache() const {
     writeLength(style.imageHeight);
     writeLength(style.imageWidth);
     file.write(static_cast<uint8_t>(style.display));
-    uint16_t definedBits = 0;
+    file.write(static_cast<uint8_t>(style.backgroundBlack ? 1 : 0));
+    uint32_t definedBits = 0;
     if (style.defined.textAlign) definedBits |= 1 << 0;
     if (style.defined.fontStyle) definedBits |= 1 << 1;
     if (style.defined.fontWeight) definedBits |= 1 << 2;
@@ -800,6 +962,7 @@ bool CssParser::saveToCache() const {
     if (style.defined.imageHeight) definedBits |= 1 << 13;
     if (style.defined.imageWidth) definedBits |= 1 << 14;
     if (style.defined.display) definedBits |= 1 << 15;
+    if (style.defined.backgroundBlack) definedBits |= 1 << 16;
     file.write(reinterpret_cast<const uint8_t*>(&definedBits), sizeof(definedBits));
   };
 
@@ -849,7 +1012,15 @@ bool CssParser::loadFromCache() {
   // Clear existing rules
   clear();
 
-  // Read and verify version
+  // Read and verify header
+  uint32_t magic = 0;
+  if (file.read(&magic, sizeof(magic)) != sizeof(magic) || magic != CssParser::CSS_CACHE_MAGIC) {
+    LOG_DBG("CSS", "Cache magic mismatch, removing stale cache for rebuild");
+    file.close();
+    Storage.remove((cachePath + rulesCache).c_str());
+    return false;
+  }
+
   uint8_t version = 0;
   if (file.read(&version, 1) != 1 || version != CssParser::CSS_CACHE_VERSION) {
     LOG_DBG("CSS", "Cache version mismatch (got %u, expected %u), removing stale cache for rebuild", version,
@@ -879,7 +1050,7 @@ bool CssParser::loadFromCache() {
   constexpr size_t CSS_LENGTH_FIELD_COUNT = 11;
   constexpr size_t CSS_LENGTH_BYTES = sizeof(float) + sizeof(uint8_t);
   constexpr size_t CSS_FIXED_STYLE_BYTES =
-      4 * sizeof(uint8_t) + (CSS_LENGTH_FIELD_COUNT * CSS_LENGTH_BYTES) + sizeof(uint8_t) + sizeof(uint16_t);
+      4 * sizeof(uint8_t) + (CSS_LENGTH_FIELD_COUNT * CSS_LENGTH_BYTES) + 2 * sizeof(uint8_t) + sizeof(uint32_t);
 
   auto readLength = [&file](CssLength& len) -> bool {
     if (file.read(&len.value, sizeof(len.value)) != sizeof(len.value)) return false;
@@ -908,7 +1079,10 @@ bool CssParser::loadFromCache() {
     uint8_t displayVal;
     if (file.read(&displayVal, 1) != 1) return false;
     style.display = static_cast<CssDisplay>(displayVal);
-    uint16_t definedBits = 0;
+    uint8_t backgroundBlackVal = 0;
+    if (file.read(&backgroundBlackVal, 1) != 1) return false;
+    style.backgroundBlack = backgroundBlackVal != 0;
+    uint32_t definedBits = 0;
     if (file.read(&definedBits, sizeof(definedBits)) != sizeof(definedBits)) return false;
     style.defined.textAlign = (definedBits & 1 << 0) != 0;
     style.defined.fontStyle = (definedBits & 1 << 1) != 0;
@@ -926,6 +1100,7 @@ bool CssParser::loadFromCache() {
     style.defined.imageHeight = (definedBits & 1 << 13) != 0;
     style.defined.imageWidth = (definedBits & 1 << 14) != 0;
     style.defined.display = (definedBits & 1 << 15) != 0;
+    style.defined.backgroundBlack = (definedBits & 1 << 16) != 0;
     return true;
   };
 
@@ -958,7 +1133,19 @@ bool CssParser::loadFromCache() {
       rulesBySelector_.clear();
       return false;
     }
-    rulesBySelector_[selector] = style;
+    if (!upsertRule(std::move(selector), style)) {
+      rulesBySelector_.clear();
+      return false;
+    }
+  }
+
+  std::sort(rulesBySelector_.begin(), rulesBySelector_.end(),
+            [](const std::pair<std::string, CssStyle>& a, const std::pair<std::string, CssStyle>& b) {
+              return a.first < b.first;
+            });
+  const size_t duplicateCount = mergeDuplicateRules(rulesBySelector_);
+  if (duplicateCount > 0) {
+    LOG_DBG("CSS", "Merged %zu duplicate CSS selector rules from cache", duplicateCount);
   }
 
   // Read descendant rules
@@ -1000,6 +1187,6 @@ bool CssParser::loadFromCache() {
     }
   }
 
-  LOG_DBG("CSS", "Loaded %u rules + %u descendant rules from cache", ruleCount, descendantCount);
+  LOG_DBG("CSS", "Loaded %zu rules + %u descendant rules from cache", rulesBySelector_.size(), descendantCount);
   return true;
 }
diff --git a/lib/Epub/Epub/css/CssParser.h b/lib/Epub/Epub/css/CssParser.h
index 288591cb..c77224c8 100644
--- a/lib/Epub/Epub/css/CssParser.h
+++ b/lib/Epub/Epub/css/CssParser.h
@@ -3,7 +3,6 @@
 #include <HalStorage.h>
 
 #include <string>
-#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -45,7 +44,8 @@ struct CssAncestorEntry {
 class CssParser {
  public:
   // Bump when CSS cache format or rules change; section caches are invalidated when this changes
-  static constexpr uint8_t CSS_CACHE_VERSION = 5;
+  static constexpr uint32_t CSS_CACHE_MAGIC = 0x435843FF;  // bytes: 0xFF, "CXC"
+  static constexpr uint8_t CSS_CACHE_VERSION = 8;
 
   static constexpr size_t MAX_DESCENDANT_RULES = 100;
 
@@ -97,8 +97,11 @@ class CssParser {
    * Clear all loaded rules
    */
   void clear() {
-    rulesBySelector_.clear();
-    descendantRules_.clear();
+    // These buffers can grow large during chapter indexing. Swap with empty
+    // vectors so the capacity is released back to the heap, matching the old
+    // post-index cleanup behavior callers relied on.
+    decltype(rulesBySelector_){}.swap(rulesBySelector_);
+    decltype(descendantRules_){}.swap(descendantRules_);
   }
 
   /**
@@ -131,14 +134,19 @@ class CssParser {
     CssStyle style;
   };
 
-  // Storage: maps normalized selector -> style properties
-  std::unordered_map<std::string, CssStyle> rulesBySelector_;
+  // Storage: sorted vector of (selector, style) pairs.
+  // Kept sorted on insert so resolveStyle can safely use binary search.
+  std::vector<std::pair<std::string, CssStyle>> rulesBySelector_;
   std::vector<DescendantRule> descendantRules_;
 
   std::string cachePath;
 
+  const CssStyle* findRule(const std::string& key) const;
+  [[nodiscard]] bool ensureRuleCapacity();
+  [[nodiscard]] bool upsertRule(std::string key, const CssStyle& style);
+
   // Internal parsing helpers
-  void processRuleBlockWithStyle(const std::string& selectorGroup, const CssStyle& style);
+  [[nodiscard]] bool processRuleBlockWithStyle(const std::string& selectorGroup, const CssStyle& style);
   static bool selectorMatchesElement(const std::string& selector, const std::string& tag, const std::string& classAttr);
   static CssStyle parseDeclarations(const std::string& declBlock);
   static void parseDeclarationIntoStyle(const std::string& decl, CssStyle& style, std::string& propNameBuf,
diff --git a/lib/Epub/Epub/css/CssStyle.h b/lib/Epub/Epub/css/CssStyle.h
index 3ba22d65..c9db47a8 100644
--- a/lib/Epub/Epub/css/CssStyle.h
+++ b/lib/Epub/Epub/css/CssStyle.h
@@ -59,22 +59,23 @@ enum class CssDisplay : uint8_t { Block = 0, None = 1 };
 
 // Bitmask for tracking which properties have been explicitly set
 struct CssPropertyFlags {
-  uint16_t textAlign : 1;
-  uint16_t fontStyle : 1;
-  uint16_t fontWeight : 1;
-  uint16_t textDecoration : 1;
-  uint16_t textIndent : 1;
-  uint16_t marginTop : 1;
-  uint16_t marginBottom : 1;
-  uint16_t marginLeft : 1;
-  uint16_t marginRight : 1;
-  uint16_t paddingTop : 1;
-  uint16_t paddingBottom : 1;
-  uint16_t paddingLeft : 1;
-  uint16_t paddingRight : 1;
-  uint16_t imageHeight : 1;
-  uint16_t imageWidth : 1;
-  uint16_t display : 1;
+  uint32_t textAlign : 1;
+  uint32_t fontStyle : 1;
+  uint32_t fontWeight : 1;
+  uint32_t textDecoration : 1;
+  uint32_t textIndent : 1;
+  uint32_t marginTop : 1;
+  uint32_t marginBottom : 1;
+  uint32_t marginLeft : 1;
+  uint32_t marginRight : 1;
+  uint32_t paddingTop : 1;
+  uint32_t paddingBottom : 1;
+  uint32_t paddingLeft : 1;
+  uint32_t paddingRight : 1;
+  uint32_t imageHeight : 1;
+  uint32_t imageWidth : 1;
+  uint32_t display : 1;
+  uint32_t backgroundBlack : 1;
 
   CssPropertyFlags()
       : textAlign(0),
@@ -92,19 +93,20 @@ struct CssPropertyFlags {
         paddingRight(0),
         imageHeight(0),
         imageWidth(0),
-        display(0) {}
+        display(0),
+        backgroundBlack(0) {}
 
   [[nodiscard]] bool anySet() const {
     return textAlign || fontStyle || fontWeight || textDecoration || textIndent || marginTop || marginBottom ||
            marginLeft || marginRight || paddingTop || paddingBottom || paddingLeft || paddingRight || imageHeight ||
-           imageWidth || display;
+           imageWidth || display || backgroundBlack;
   }
 
   void clearAll() {
     textAlign = fontStyle = fontWeight = textDecoration = textIndent = 0;
     marginTop = marginBottom = marginLeft = marginRight = 0;
     paddingTop = paddingBottom = paddingLeft = paddingRight = 0;
-    imageHeight = imageWidth = display = 0;
+    imageHeight = imageWidth = display = backgroundBlack = 0;
   }
 };
 
@@ -129,6 +131,7 @@ struct CssStyle {
   CssLength imageHeight;    // Height for img (e.g. 2em) – width derived from aspect ratio when only height set
   CssLength imageWidth;     // Width for img when both or only width set
   CssDisplay display = CssDisplay::Block;  // display property (Block or None)
+  bool backgroundBlack = false;            // Simple black inline/block background support
 
   CssPropertyFlags defined;  // Tracks which properties were explicitly set
 
@@ -199,6 +202,10 @@ struct CssStyle {
       display = base.display;
       defined.display = 1;
     }
+    if (base.hasBackgroundBlack()) {
+      backgroundBlack = base.backgroundBlack;
+      defined.backgroundBlack = 1;
+    }
   }
 
   [[nodiscard]] bool hasTextAlign() const { return defined.textAlign; }
@@ -217,6 +224,7 @@ struct CssStyle {
   [[nodiscard]] bool hasImageHeight() const { return defined.imageHeight; }
   [[nodiscard]] bool hasImageWidth() const { return defined.imageWidth; }
   [[nodiscard]] bool hasDisplay() const { return defined.display; }
+  [[nodiscard]] bool hasBackgroundBlack() const { return defined.backgroundBlack; }
 
   void reset() {
     textAlign = CssTextAlign::Left;
@@ -228,6 +236,7 @@ struct CssStyle {
     paddingTop = paddingBottom = paddingLeft = paddingRight = CssLength{};
     imageHeight = imageWidth = CssLength{};
     display = CssDisplay::Block;
+    backgroundBlack = false;
     defined.clearAll();
   }
 };
diff --git a/lib/Epub/Epub/htmlEntities.cpp b/lib/Epub/Epub/htmlEntities.cpp
index 6fdcb71c..2fd35b8a 100644
--- a/lib/Epub/Epub/htmlEntities.cpp
+++ b/lib/Epub/Epub/htmlEntities.cpp
@@ -4,6 +4,7 @@
 #include "htmlEntities.h"
 
 #include <cstring>
+#include <iterator>
 
 struct EntityPair {
   const char* key;
@@ -62,8 +63,6 @@ static constexpr EntityPair ENTITY_LOOKUP[] = {
     {"&yen;", "¥"},      {"&yuml;", "ÿ"},       {"&zeta;", "ζ"},       {"&zwj;", "\u200D"}, {"&zwnj;", "\u200C"},
 };
 
-static const size_t ENTITY_LOOKUP_COUNT = sizeof(ENTITY_LOOKUP) / sizeof(ENTITY_LOOKUP[0]);
-
 // Verify the table is sorted at compile time.
 static constexpr int constexprStrcmp(const char* a, const char* b) {
   for (size_t i = 0;; i++) {
@@ -73,7 +72,7 @@ static constexpr int constexprStrcmp(const char* a, const char* b) {
 }
 
 static constexpr bool isTableSorted() {
-  for (size_t i = 1; i < ENTITY_LOOKUP_COUNT; i++) {
+  for (size_t i = 1; i < std::size(ENTITY_LOOKUP); i++) {
     if (constexprStrcmp(ENTITY_LOOKUP[i - 1].key, ENTITY_LOOKUP[i].key) >= 0) return false;
   }
   return true;
@@ -85,7 +84,7 @@ const char* lookupHtmlEntity(const char* entity, size_t len) {
   if (entity == nullptr || len == 0) return nullptr;
 
   size_t lo = 0;
-  size_t hi = ENTITY_LOOKUP_COUNT;
+  size_t hi = std::size(ENTITY_LOOKUP);
 
   while (lo < hi) {
     const size_t mid = lo + (hi - lo) / 2;
diff --git a/lib/Epub/Epub/hyphenation/HyphenationCommon.cpp b/lib/Epub/Epub/hyphenation/HyphenationCommon.cpp
index 4b2ac4a1..13be2263 100644
--- a/lib/Epub/Epub/hyphenation/HyphenationCommon.cpp
+++ b/lib/Epub/Epub/hyphenation/HyphenationCommon.cpp
@@ -13,9 +13,19 @@ uint32_t toLowerLatinImpl(const uint32_t cp) {
     return cp + 0x20;
   }
 
+  // Latin Extended-A (U+0100..U+017E): uppercase letters are paired with
+  // lowercase at cp+1. Two sub-ranges have different alignment:
+  //   U+0100..U+0137: uppercase on EVEN codepoints
+  //   U+0139..U+0148: uppercase on ODD codepoints
+  //   U+014A..U+0177: uppercase on EVEN codepoints
+  //   U+0179..U+017E: uppercase on ODD codepoints
+  // Covers Polish (Ą/ą, Ć/ć, Ę/ę, Ł/ł, Ń/ń, Ś/ś, Ź/ź, Ż/ż), Czech, Hungarian, Turkish, etc.
+  if ((cp >= 0x0100 && cp <= 0x0137 && (cp % 2 == 0)) || (cp >= 0x0139 && cp <= 0x0148 && (cp % 2 == 1)) ||
+      (cp >= 0x014A && cp <= 0x0177 && (cp % 2 == 0)) || (cp >= 0x0179 && cp <= 0x017E && (cp % 2 == 1))) {
+    return cp + 1;
+  }
+
   switch (cp) {
-    case 0x0152:      // Œ
-      return 0x0153;  // œ
     case 0x0178:      // Ÿ
       return 0x00FF;  // ÿ
     case 0x1E9E:      // ẞ
@@ -54,6 +64,11 @@ bool isLatinLetter(const uint32_t cp) {
     return true;
   }
 
+  // Latin Extended-A (U+0100..U+017F): Polish, Czech, Hungarian, Turkish, etc.
+  if (cp >= 0x0100 && cp <= 0x017F) {
+    return true;
+  }
+
   switch (cp) {
     case 0x0152:  // Œ
     case 0x0153:  // œ
@@ -273,6 +288,30 @@ std::vector<CodepointInfo> collectCodepoints(const std::string& word) {
             case 0x0079:
               composed = 0x00FD;
               break;  // y -> ý
+            case 0x0043:
+              composed = 0x0106;
+              break;  // C -> Ć
+            case 0x0063:
+              composed = 0x0107;
+              break;  // c -> ć
+            case 0x004E:
+              composed = 0x0143;
+              break;  // N -> Ń
+            case 0x006E:
+              composed = 0x0144;
+              break;  // n -> ń
+            case 0x0053:
+              composed = 0x015A;
+              break;  // S -> Ś
+            case 0x0073:
+              composed = 0x015B;
+              break;  // s -> ś
+            case 0x005A:
+              composed = 0x0179;
+              break;  // Z -> Ź
+            case 0x007A:
+              composed = 0x017A;
+              break;  // z -> ź
             default:
               break;
           }
@@ -373,6 +412,18 @@ std::vector<CodepointInfo> collectCodepoints(const std::string& word) {
               break;
           }
           break;
+        case 0x0307:  // dot above (Polish Ż)
+          switch (prev) {
+            case 0x005A:
+              composed = 0x017B;
+              break;  // Z -> Ż
+            case 0x007A:
+              composed = 0x017C;
+              break;  // z -> ż
+            default:
+              break;
+          }
+          break;
         case 0x0327:  // cedilla
           switch (prev) {
             case 0x0043:
@@ -385,6 +436,24 @@ std::vector<CodepointInfo> collectCodepoints(const std::string& word) {
               break;
           }
           break;
+        case 0x0328:  // ogonek (Polish Ą, Ę)
+          switch (prev) {
+            case 0x0041:
+              composed = 0x0104;
+              break;  // A -> Ą
+            case 0x0061:
+              composed = 0x0105;
+              break;  // a -> ą
+            case 0x0045:
+              composed = 0x0118;
+              break;  // E -> Ę
+            case 0x0065:
+              composed = 0x0119;
+              break;  // e -> ę
+            default:
+              break;
+          }
+          break;
         default:
           break;
       }
diff --git a/lib/Epub/Epub/hyphenation/Hyphenator.cpp b/lib/Epub/Epub/hyphenation/Hyphenator.cpp
index ad5de454..ada620e2 100644
--- a/lib/Epub/Epub/hyphenation/Hyphenator.cpp
+++ b/lib/Epub/Epub/hyphenation/Hyphenator.cpp
@@ -1,5 +1,7 @@
 #include "Hyphenator.h"
 
+#include <Utf8.h>
+
 #include <algorithm>
 #include <cassert>
 #include <vector>
@@ -256,7 +258,16 @@ std::vector<Hyphenator::BreakInfo> Hyphenator::breakOffsets(const std::string& w
   std::vector<Hyphenator::BreakInfo> breaks;
   breaks.reserve(indexes.size());
   for (const size_t idx : indexes) {
-    breaks.push_back({byteOffsetForIndex(cps, idx), true});
+    // CJK characters can break without inserting a visible hyphen.
+    // Check the codepoint at the break position: if it's a CJK character,
+    // no hyphen is needed since CJK scripts don't use hyphenation.
+    bool needsHyphen = true;
+    if (idx < cps.size() && utf8IsCjkBreakable(cps[idx].value)) {
+      needsHyphen = false;
+    } else if (idx > 0 && utf8IsCjkBreakable(cps[idx - 1].value)) {
+      needsHyphen = false;
+    }
+    breaks.push_back({byteOffsetForIndex(cps, idx), needsHyphen});
   }
 
   return breaks;
diff --git a/lib/Epub/Epub/hyphenation/LanguageRegistry.cpp b/lib/Epub/Epub/hyphenation/LanguageRegistry.cpp
index 052d47ee..541e9a27 100644
--- a/lib/Epub/Epub/hyphenation/LanguageRegistry.cpp
+++ b/lib/Epub/Epub/hyphenation/LanguageRegistry.cpp
@@ -9,6 +9,7 @@
 #include "generated/hyph-es.trie.h"
 #include "generated/hyph-fr.trie.h"
 #include "generated/hyph-it.trie.h"
+#include "generated/hyph-pl.trie.h"
 #include "generated/hyph-ru.trie.h"
 #include "generated/hyph-uk.trie.h"
 
@@ -22,8 +23,9 @@ LanguageHyphenator russianHyphenator(ru_patterns, isCyrillicLetter, toLowerCyril
 LanguageHyphenator spanishHyphenator(es_patterns, isLatinLetter, toLowerLatin);
 LanguageHyphenator italianHyphenator(it_patterns, isLatinLetter, toLowerLatin);
 LanguageHyphenator ukrainianHyphenator(uk_patterns, isCyrillicLetter, toLowerCyrillic);
+LanguageHyphenator polishHyphenator(pl_patterns, isLatinLetter, toLowerLatin);
 
-using EntryArray = std::array<LanguageEntry, 7>;
+using EntryArray = std::array<LanguageEntry, 8>;
 
 const EntryArray& entries() {
   static const EntryArray kEntries = {{{"english", "en", &englishHyphenator},
@@ -32,6 +34,7 @@ const EntryArray& entries() {
                                        {"russian", "ru", &russianHyphenator},
                                        {"spanish", "es", &spanishHyphenator},
                                        {"italian", "it", &italianHyphenator},
+                                       {"polish", "pl", &polishHyphenator},
                                        {"ukrainian", "uk", &ukrainianHyphenator}}};
   return kEntries;
 }
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
index 3eff96f6..c2d3153d 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-de.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t de_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
index 266578ab..992be031 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-en.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t en_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
index 7b156033..38d6e36e 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-es.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t es_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
index 3345fa2a..2cde6fee 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-fr.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t fr_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
index 4f4e5599..e262bdc6 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-it.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t it_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-pl.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-pl.trie.h
new file mode 100644
index 00000000..7e4068c2
--- /dev/null
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-pl.trie.h
@@ -0,0 +1,987 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
+
+// Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
+alignas(4) constexpr uint8_t pl_trie_data[] = {
+    0x3A, 0x26, 0x30, 0x48, 0x17, 0x3E, 0x0F, 0x52, 0x67, 0x0C, 0x44, 0x16, 0x0C, 0x0D, 0x16, 0x0D,
+    0x22, 0x23, 0x21, 0x35, 0x16, 0x35, 0x0C, 0x21, 0x0C, 0x5C, 0x0D, 0x1C, 0x20, 0x0D, 0x21, 0x0E,
+    0x34, 0x34, 0x0B, 0x3F, 0x16, 0x3F, 0x0C, 0x49, 0x0C, 0x53, 0x16, 0x70, 0x0D, 0x49, 0x16, 0x3E,
+    0x0D, 0x3F, 0x0E, 0x21, 0x0E, 0x0D, 0x21, 0x16, 0x22, 0x17, 0x22, 0x0D, 0x23, 0x0E, 0x0C, 0x34,
+    0x0D, 0x35, 0x0E, 0x7B, 0x16, 0x84, 0x0D, 0x5C, 0x17, 0x16, 0x0D, 0x0C, 0x0F, 0x16, 0x16, 0x0B,
+    0x0C, 0x0B, 0x2C, 0x17, 0x0E, 0x18, 0x0F, 0x0C, 0x2B, 0x0C, 0x52, 0x0D, 0x66, 0x2A, 0x0C, 0x0D,
+    0x2B, 0x18, 0x2B, 0x18, 0x0D, 0x2C, 0x19, 0x0C, 0x53, 0x0C, 0x2A, 0x17, 0x20, 0x0C, 0x21, 0x20,
+    0x21, 0x0E, 0x0C, 0x22, 0x0D, 0x0C, 0x0C, 0x22, 0x0F, 0x5F, 0x2B, 0x16, 0x2D, 0x16, 0x2D, 0x0C,
+    0x36, 0x0D, 0x2B, 0x0C, 0x16, 0x2B, 0x0C, 0x0C, 0x2B, 0x16, 0x0D, 0x41, 0x16, 0x34, 0x0C, 0x2C,
+    0x0D, 0x2C, 0x21, 0x3E, 0x0C, 0x3F, 0x20, 0x40, 0x0D, 0x0C, 0x4B, 0x52, 0x0C, 0x53, 0x20, 0x53,
+    0x0E, 0x53, 0x0E, 0x16, 0x53, 0x0C, 0x0C, 0x0D, 0x54, 0x0F, 0x54, 0x0F, 0x16, 0x54, 0x0F, 0x0C,
+    0x5D, 0x16, 0x5D, 0x0C, 0x7A, 0x17, 0x0E, 0x16, 0x17, 0x10, 0x17, 0x0C, 0x18, 0x11, 0x21, 0x0C,
+    0x0C, 0x2B, 0x0D, 0x23, 0x16, 0x23, 0x0C, 0x2A, 0x0D, 0x20, 0x16, 0x22, 0x0F, 0x0C, 0x2A, 0x16,
+    0x34, 0x0B, 0x20, 0x34, 0x17, 0x21, 0x0C, 0x0C, 0x0D, 0x22, 0x0D, 0x0E, 0x0C, 0x0D, 0x22, 0x0F,
+    0x16, 0x22, 0x17, 0x0C, 0x2B, 0x34, 0x0F, 0x35, 0x20, 0x2C, 0x0B, 0x2C, 0x0C, 0x35, 0x0E, 0x0D,
+    0x35, 0x0E, 0x16, 0x35, 0x0C, 0x0C, 0x0D, 0x36, 0x0F, 0x36, 0x0F, 0x16, 0x36, 0x0F, 0x0E, 0x48,
+    0x0D, 0x49, 0x0E, 0x3F, 0x2B, 0x0C, 0x21, 0x0E, 0x0D, 0x16, 0x21, 0x0E, 0x0D, 0x0C, 0x22, 0x0F,
+    0x0E, 0x0D, 0x36, 0x0F, 0x0C, 0x41, 0x0C, 0x48, 0x0B, 0x66, 0x0D, 0x2A, 0x16, 0x17, 0x20, 0x11,
+    0x4A, 0x0F, 0x18, 0x0D, 0x0C, 0x18, 0x17, 0x22, 0x0D, 0x20, 0x48, 0x21, 0x3E, 0x17, 0x21, 0x0C,
+    0x0D, 0x68, 0x34, 0x2B, 0x2B, 0x0E, 0x22, 0x0D, 0x0C, 0x0B, 0x0C, 0x52, 0x17, 0x36, 0x21, 0x15,
+    0x01, 0x16, 0x02, 0x15, 0x02, 0x0B, 0x02, 0x1F, 0x03, 0x0C, 0x03, 0x0C, 0x16, 0x03, 0x0C, 0x0C,
+    0x04, 0x17, 0x04, 0x0D, 0x08, 0x16, 0x0D, 0x16, 0x16, 0x0D, 0x16, 0x0D, 0x3E, 0x0B, 0x20, 0x0B,
+    0x20, 0x0C, 0x0D, 0x20, 0x17, 0x29, 0x16, 0x11, 0x16, 0x0F, 0x20, 0x0B, 0x0C, 0x2A, 0x0B, 0x16,
+    0x15, 0x18, 0x0E, 0x0D, 0x20, 0x0F, 0x16, 0x11, 0x3F, 0x18, 0x16, 0x0D, 0x16, 0x16, 0x0D, 0x17,
+    0x0C, 0x20, 0x15, 0x17, 0x0C, 0x0D, 0x16, 0x0C, 0x0B, 0xA0, 0x00, 0x41, 0x21, 0x87, 0xFD, 0x25,
+    0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFA, 0xFA, 0xFA, 0xFA, 0xFA, 0xA0, 0x00, 0x61, 0xA0, 0x00, 0x72,
+    0x21, 0x87, 0xFD, 0x21, 0xC4, 0xFD, 0x21, 0x72, 0xFD, 0x21, 0x65, 0xFD, 0xA1, 0x00, 0x61, 0x69,
+    0xFD, 0xB5, 0x00, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D,
+    0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xDB, 0xDE, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9,
+    0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xE9, 0xFB, 0xE9, 0xE9, 0x21, 0x87,
+    0xD3, 0xD5, 0x00, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D,
+    0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xFF, 0xAB, 0xFF, 0xAE, 0xFF, 0xB9, 0xFF,
+    0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF,
+    0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF, 0xB9, 0xFF,
+    0xB9, 0xFF, 0xB9, 0xA0, 0x00, 0xB1, 0xA1, 0x00, 0x92, 0x72, 0xFD, 0x21, 0x64, 0xFB, 0x21, 0xB3,
+    0xFD, 0xA1, 0x00, 0x61, 0xC3, 0xFD, 0xA0, 0x00, 0xC2, 0x21, 0x77, 0xFD, 0x21, 0x6F, 0xFD, 0x21,
+    0x82, 0xFD, 0x21, 0xC5, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x61, 0xFD, 0xA1, 0x00, 0x61, 0x69, 0xFD,
+    0xD5, 0x00, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xFF, 0x3C, 0xFF, 0x3F, 0xFF, 0x4A, 0xFF, 0x4A,
+    0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A,
+    0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0xE1, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0x4A, 0xFF, 0xFB, 0xFF, 0x4A,
+    0xFF, 0x4A, 0xA0, 0x00, 0xE1, 0x21, 0xBA, 0xFD, 0xA1, 0x00, 0x61, 0xC5, 0xFD, 0xD5, 0x00, 0x51,
+    0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73,
+    0x74, 0x76, 0x77, 0x78, 0x7A, 0xFE, 0xEF, 0xFE, 0xF2, 0xFE, 0xFD, 0xFE, 0xFD, 0xFF, 0xFB, 0xFE,
+    0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE,
+    0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0xFE, 0xFD, 0x45,
+    0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFF, 0x02, 0xFF, 0x02, 0xFF, 0x71, 0xFF, 0xBE, 0xFF, 0x02, 0xA0,
+    0x00, 0xF3, 0x21, 0x74, 0xFD, 0x21, 0x73, 0xFD, 0xA0, 0x01, 0x51, 0x21, 0x74, 0xFD, 0xA1, 0x01,
+    0x41, 0x70, 0xFD, 0xA0, 0x01, 0x41, 0xA1, 0x01, 0x41, 0x75, 0xF2, 0xA2, 0x01, 0x41, 0x70, 0x72,
+    0xED, 0xED, 0xA6, 0x01, 0x22, 0x61, 0x65, 0x69, 0x6F, 0x75, 0x79, 0xEC, 0xF1, 0xF4, 0xF9, 0xF1,
+    0xF1, 0xA0, 0x00, 0x91, 0xA5, 0x01, 0x61, 0x61, 0x65, 0x69, 0x6F, 0x75, 0xFD, 0xFD, 0xFD, 0xFD,
+    0xFD, 0x21, 0x6F, 0xF3, 0x21, 0x72, 0xFD, 0x25, 0x61, 0x65, 0x69, 0x6F, 0x75, 0xEA, 0xEA, 0xEA,
+    0xEA, 0xEA, 0x21, 0x79, 0xF5, 0x21, 0x74, 0xFD, 0xA0, 0x01, 0x72, 0x21, 0x82, 0xFD, 0xA1, 0x01,
+    0x92, 0x7A, 0xFA, 0xA0, 0x01, 0x92, 0x29, 0xC5, 0x62, 0x6B, 0x6D, 0x61, 0x65, 0x69, 0x6F, 0x75,
+    0xF5, 0xF8, 0xFD, 0xFD, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0x21, 0x79, 0xED, 0x21, 0x63, 0xFD, 0xA0,
+    0x01, 0xB2, 0x21, 0x68, 0xD6, 0xA0, 0x01, 0xD2, 0x21, 0x73, 0xFD, 0x21, 0x6E, 0xFD, 0x21, 0x61,
+    0xFD, 0x21, 0x72, 0xFD, 0x47, 0x63, 0x61, 0x65, 0x69, 0x6F, 0x74, 0x75, 0xFF, 0xEE, 0xFF, 0x9D,
+    0xFF, 0x9D, 0xFF, 0x9D, 0xFF, 0x9D, 0xFF, 0xFD, 0xFF, 0x9D, 0xA1, 0x01, 0xB2, 0x6F, 0xEA, 0x23,
+    0x67, 0x6B, 0x74, 0xD0, 0xD0, 0xFB, 0x46, 0x62, 0x64, 0x65, 0x6E, 0x72, 0x75, 0xFF, 0x4F, 0xFF,
+    0x6C, 0xFF, 0x8E, 0xFF, 0x9F, 0xFF, 0xC6, 0xFF, 0xF9, 0x41, 0x87, 0xFD, 0xE1, 0x45, 0x82, 0x84,
+    0x9B, 0xBA, 0xBC, 0xFD, 0xDD, 0xFD, 0xDD, 0xFD, 0xDD, 0xFD, 0xDD, 0xFD, 0xDD, 0xA0, 0x00, 0x51,
+    0xA0, 0x02, 0x22, 0x21, 0x6E, 0xFD, 0x21, 0x63, 0xFA, 0x21, 0x6B, 0xF7, 0x41, 0x68, 0xFF, 0x45,
+    0xA0, 0x02, 0x41, 0xA0, 0x02, 0x52, 0x21, 0x6A, 0xFD, 0xA1, 0x02, 0x41, 0x62, 0xFD, 0x41, 0x77,
+    0xFF, 0x33, 0xA8, 0x02, 0x02, 0x61, 0x65, 0x69, 0x63, 0x6D, 0x6F, 0x77, 0x7A, 0xE1, 0xE4, 0xE7,
+    0xEA, 0xEE, 0xF7, 0xEE, 0xFC, 0x21, 0x7A, 0xED, 0xC1, 0x00, 0x51, 0x7A, 0xFD, 0x92, 0xB6, 0x01,
+    0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70,
+    0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xAB, 0xAF, 0xBF, 0xBF, 0xBF, 0xF7, 0xBF, 0xBF, 0xBF,
+    0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xFA, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xA0, 0x02, 0x72,
+    0x21, 0x9B, 0xFD, 0xA0, 0x02, 0x92, 0x22, 0xC5, 0x6B, 0xFA, 0xFD, 0x21, 0x6F, 0xFB, 0x21, 0x82,
+    0xFD, 0x21, 0xC5, 0xFD, 0x41, 0x7A, 0xFD, 0x35, 0xA1, 0x00, 0x51, 0x72, 0xFC, 0xA0, 0x02, 0xB2,
+    0x21, 0x77, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x6B, 0xFD, 0xA0, 0x02, 0xD2, 0x21, 0x72, 0xFD, 0x21,
+    0x6B, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x82, 0xFD, 0x21, 0xC5, 0xFD, 0x22, 0x6E, 0x70, 0xEB, 0xFD,
+    0x21, 0x65, 0xFB, 0x21, 0x6B, 0xDA, 0x21, 0x6F, 0xFD, 0x21, 0x6E, 0xFD, 0x21, 0x72, 0xFD, 0xA0,
+    0x02, 0xF2, 0x21, 0x74, 0xFD, 0x21, 0x65, 0xFD, 0xA1, 0x00, 0x72, 0x73, 0xFD, 0x21, 0x68, 0xFB,
+    0x21, 0x63, 0xFD, 0xA0, 0x03, 0x12, 0x21, 0x9B, 0xFD, 0x21, 0xC5, 0xFD, 0x22, 0x65, 0x6F, 0xF4,
+    0xFD, 0x21, 0x72, 0xFB, 0x21, 0x65, 0xFD, 0xA0, 0x03, 0x52, 0x22, 0x85, 0x99, 0xFD, 0xFD, 0xA4,
+    0x03, 0x32, 0xC4, 0x61, 0x65, 0x6F, 0xFB, 0xF8, 0xF8, 0xF8, 0x21, 0x72, 0xF5, 0x21, 0xB3, 0xFD,
+    0x21, 0xC3, 0xFD, 0xC4, 0x00, 0x51, 0x61, 0x6B, 0x74, 0x77, 0xFF, 0xB9, 0xFC, 0xC7, 0xFF, 0xE1,
+    0xFF, 0xFD, 0xD7, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A,
+    0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xFE, 0xD7, 0xFE, 0xDB,
+    0xFF, 0x6F, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFF, 0x76, 0xFF, 0x9E,
+    0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB,
+    0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFE, 0xEB, 0xFF, 0xF1, 0x41, 0x72, 0xFF, 0x79, 0x42, 0x74,
+    0x77, 0xFF, 0xFC, 0xFF, 0x2F, 0x21, 0x6F, 0xF9, 0x21, 0x67, 0xFD, 0xA1, 0x00, 0x61, 0x75, 0xFD,
+    0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFF, 0xFB, 0xFC, 0x5A, 0xFC, 0x5A, 0xFC, 0x5A, 0xFC, 0x5A,
+    0x41, 0x65, 0xFF, 0x16, 0x21, 0x6C, 0xFC, 0xA0, 0x03, 0x73, 0x21, 0x6C, 0xFD, 0x21, 0x69, 0xFD,
+    0x21, 0x75, 0xF7, 0xA2, 0x02, 0x41, 0x62, 0x77, 0xFA, 0xFD, 0x42, 0x6C, 0x72, 0xFE, 0x66, 0xFE,
+    0x66, 0xC4, 0x02, 0x02, 0x61, 0x65, 0x79, 0x6F, 0xFF, 0xF2, 0xFF, 0xF9, 0xFE, 0x5F, 0xFE, 0x6F,
+    0x21, 0x7A, 0xF1, 0xA0, 0x03, 0xA2, 0x21, 0x87, 0xFD, 0xA0, 0x03, 0xC2, 0xA1, 0x03, 0xA2, 0x6B,
+    0xFD, 0x24, 0x82, 0x9B, 0xBA, 0xBC, 0xFB, 0xF2, 0xF2, 0xF2, 0xC1, 0x02, 0x41, 0x7A, 0xFD, 0x87,
+    0xA1, 0x01, 0xB2, 0x72, 0xFA, 0xC2, 0x01, 0xB2, 0x68, 0x7A, 0xFE, 0x3B, 0xFE, 0x3B, 0x42, 0xBA,
+    0xBC, 0xFD, 0x73, 0xFD, 0x73, 0xC2, 0x01, 0xB2, 0xC5, 0x7A, 0xFF, 0xF9, 0xFE, 0x2B, 0x41, 0x7A,
+    0xFD, 0x63, 0xA1, 0x01, 0xB2, 0x72, 0xFC, 0xA0, 0x03, 0xE2, 0xA1, 0x01, 0xB2, 0x74, 0xFD, 0xA1,
+    0x01, 0xB2, 0x6E, 0xF8, 0xA0, 0x04, 0x03, 0xA1, 0x03, 0xE2, 0x6E, 0xFD, 0xA1, 0x01, 0xB2, 0x6B,
+    0xFB, 0xC2, 0x01, 0xB2, 0x63, 0x72, 0xFD, 0xFB, 0xFF, 0xDD, 0x41, 0xBC, 0xFD, 0x37, 0xC3, 0x01,
+    0xB2, 0x73, 0xC5, 0x7A, 0xFF, 0xD9, 0xFF, 0xFC, 0xFD, 0xF2, 0xC3, 0x01, 0xB2, 0x63, 0x6D, 0x7A,
+    0xFD, 0xE2, 0xFD, 0xE6, 0xFD, 0xE6, 0xC2, 0x01, 0xB2, 0x6B, 0x72, 0xFD, 0xDA, 0xFD, 0xDA, 0xA1,
+    0x01, 0xB2, 0x63, 0xB8, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D,
+    0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0x72, 0xFF, 0x7D, 0xFF, 0x8C, 0xFF, 0x91, 0xFF, 0xA1,
+    0xFD, 0x5B, 0xFF, 0xAE, 0xFD, 0x5B, 0xFF, 0xB6, 0xFF, 0xBB, 0xFF, 0xC8, 0xFF, 0xCD, 0xFF, 0xDA,
+    0xFF, 0xE6, 0xFF, 0xF2, 0xFF, 0xFB, 0xFD, 0x5B, 0x41, 0x77, 0xFD, 0xFB, 0x21, 0x6F, 0xFC, 0x21,
+    0x67, 0xFD, 0xC2, 0x00, 0x51, 0x6F, 0x7A, 0xFF, 0xFD, 0xFB, 0x48, 0xA0, 0x04, 0x52, 0x22, 0x85,
+    0x99, 0xFD, 0xFD, 0xA4, 0x04, 0x32, 0xC4, 0x61, 0x65, 0x6F, 0xFB, 0xF8, 0xF8, 0xF8, 0x21, 0x6A,
+    0xF5, 0x21, 0xB3, 0xFD, 0xA1, 0x00, 0x51, 0xC3, 0xFD, 0x41, 0x61, 0xFD, 0x57, 0xA0, 0x01, 0x61,
+    0xC5, 0x02, 0x02, 0x65, 0x6F, 0x74, 0x79, 0x7A, 0xFD, 0x50, 0xFD, 0x50, 0xFF, 0xF9, 0xFD, 0x50,
+    0xFF, 0xFD, 0xC2, 0x02, 0x02, 0x65, 0x75, 0xFD, 0x3E, 0xFD, 0x4E, 0x22, 0x73, 0x7A, 0xE5, 0xF7,
+    0xA0, 0x04, 0x72, 0x21, 0x9B, 0xFD, 0x21, 0xC5, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x69, 0xFD, 0x21,
+    0x63, 0xFD, 0x21, 0x99, 0xFD, 0x21, 0xC4, 0xFD, 0x21, 0x69, 0xFD, 0xA0, 0x04, 0x92, 0x21, 0x74,
+    0xFD, 0x21, 0x65, 0xFD, 0xA1, 0x04, 0xB2, 0x73, 0xFD, 0x21, 0x87, 0xFB, 0x22, 0xC4, 0x63, 0xFD,
+    0xE0, 0x21, 0x99, 0xFB, 0x21, 0xC4, 0xFD, 0x21, 0x69, 0xFD, 0x22, 0x73, 0x77, 0xDE, 0xFD, 0x21,
+    0x65, 0xFB, 0xA1, 0x00, 0x51, 0x69, 0xFD, 0xD9, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62, 0x63, 0x64,
+    0x65, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77,
+    0x78, 0x79, 0x7A, 0xFC, 0xD2, 0xFE, 0x59, 0xFE, 0x6D, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFE,
+    0x99, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC,
+    0xE6, 0xFF, 0x2D, 0xFC, 0xE6, 0xFF, 0x6B, 0xFC, 0xE6, 0xFC, 0xE6, 0xFC, 0xE6, 0xFF, 0x8D, 0xFC,
+    0xE6, 0xFF, 0xB4, 0xFF, 0xFB, 0xA0, 0x05, 0x61, 0xA1, 0x00, 0xF3, 0x79, 0xFD, 0x21, 0x73, 0xFB,
+    0xA0, 0x04, 0xD5, 0x21, 0x74, 0xFD, 0x21, 0x65, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD, 0x21,
+    0x65, 0xFD, 0xA0, 0x05, 0x24, 0x21, 0x61, 0xFD, 0x21, 0x6D, 0xFD, 0x21, 0x73, 0xFD, 0xA0, 0x05,
+    0x22, 0x21, 0x61, 0xFD, 0x23, 0x65, 0x68, 0x74, 0xF7, 0xFD, 0xFA, 0x45, 0x61, 0x65, 0x69, 0x6F,
+    0x75, 0xFC, 0x75, 0xFC, 0x75, 0xFC, 0x75, 0xFC, 0x75, 0xFC, 0x75, 0x21, 0x6F, 0xF0, 0xA0, 0x01,
+    0xD1, 0x25, 0x61, 0x65, 0x69, 0x6F, 0x75, 0xFD, 0xFD, 0xFD, 0xFD, 0xFD, 0x21, 0x6F, 0xF5, 0x21,
+    0x72, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x65, 0xFD, 0x45, 0x6B, 0x6D, 0x73, 0x67,
+    0x6C, 0xFF, 0xA2, 0xFF, 0xB4, 0xFF, 0xC9, 0xFF, 0xE0, 0xFF, 0xFD, 0xD5, 0x01, 0xF1, 0xC4, 0xC5,
+    0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76,
+    0x77, 0x78, 0x7A, 0xFC, 0x0E, 0xFC, 0x12, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC,
+    0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC,
+    0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xFC, 0x22, 0xA0, 0x02, 0x02,
+    0x21, 0x6F, 0xFD, 0x21, 0x75, 0xFA, 0x41, 0x62, 0xFE, 0x56, 0xC2, 0x00, 0x51, 0x75, 0x7A, 0xFF,
+    0xFC, 0xF9, 0xA0, 0xD7, 0x01, 0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x6A,
+    0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xFB, 0xB6, 0xFB,
+    0xBA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFF, 0xED, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB,
+    0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFF, 0xF0, 0xFB, 0xCA, 0xFF, 0xF7, 0xFB,
+    0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xFB, 0xCA, 0xA0, 0x00, 0x71, 0xC3, 0x04,
+    0x32, 0x6F, 0x61, 0x65, 0xFE, 0x0D, 0xFF, 0xFD, 0xFF, 0xFD, 0x21, 0x72, 0xF4, 0x21, 0x65, 0xFD,
+    0x21, 0x70, 0xFD, 0xD6, 0x01, 0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A,
+    0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xFB, 0x56, 0xFB, 0x5A,
+    0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFF, 0xFD, 0xFB, 0x6A,
+    0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A,
+    0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xFB, 0x6A, 0xA0, 0x05, 0x72, 0x21, 0x63, 0xFD, 0xA0, 0x05,
+    0x93, 0xA0, 0x05, 0xC2, 0xA2, 0x05, 0x72, 0x6B, 0x77, 0xFA, 0xFD, 0x41, 0x6E, 0xFD, 0x0C, 0x21,
+    0x61, 0xFC, 0x21, 0x6C, 0xFD, 0xA4, 0x01, 0x22, 0x69, 0x6F, 0x75, 0x66, 0xE6, 0xEF, 0xE3, 0xFD,
+    0xA0, 0x01, 0x22, 0x21, 0x6C, 0xFD, 0x43, 0x6E, 0x73, 0x7A, 0xFF, 0xEF, 0xFF, 0xFD, 0xFE, 0xA5,
+    0x41, 0x82, 0xFB, 0x83, 0x21, 0xC5, 0xFC, 0x21, 0x64, 0xFD, 0xD6, 0x01, 0xF1, 0xC4, 0xC5, 0x61,
+    0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76,
+    0x77, 0x78, 0x7A, 0xFA, 0xCF, 0xFA, 0xD3, 0xFF, 0xFD, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA,
+    0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA,
+    0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xFA, 0xE3, 0xA0,
+    0x06, 0x01, 0xA1, 0x05, 0xE2, 0x6F, 0xFD, 0x21, 0x74, 0xFB, 0x21, 0x65, 0xFD, 0x21, 0x73, 0xFD,
+    0x21, 0x75, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x6C, 0xFD, 0x41, 0x82, 0xFD, 0x03, 0xA0, 0x06, 0x93,
+    0x21, 0x69, 0xFD, 0x22, 0x65, 0x79, 0xFA, 0xFA, 0x21, 0x61, 0xF5, 0xA0, 0x06, 0x92, 0x21, 0x6D,
+    0xFD, 0x21, 0x63, 0xFA, 0x21, 0x74, 0xF7, 0x21, 0x67, 0xF4, 0xA7, 0x06, 0x42, 0x67, 0x73, 0x74,
+    0x64, 0x6B, 0x6C, 0x72, 0xE6, 0xE9, 0xEE, 0xF4, 0xF7, 0xFA, 0xFD, 0xA0, 0x06, 0x42, 0xA0, 0x06,
+    0x63, 0xA2, 0x00, 0x71, 0x6C, 0x77, 0xFD, 0xFD, 0xC5, 0x06, 0x13, 0x61, 0x65, 0x6F, 0x79, 0x75,
+    0xFF, 0xE2, 0xFF, 0xF3, 0xFF, 0xF9, 0xFF, 0xF3, 0xFE, 0xC3, 0x21, 0x72, 0xEE, 0x21, 0x74, 0xFD,
+    0x42, 0xC5, 0x6E, 0xFF, 0xA9, 0xFF, 0xFD, 0xA0, 0x06, 0xC2, 0x42, 0x74, 0x77, 0xFA, 0xC2, 0xFF,
+    0xFD, 0x21, 0x6F, 0xF9, 0x21, 0x6B, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0xB3, 0xFD, 0xA0, 0x06, 0xE2,
+    0x21, 0x87, 0xFD, 0x21, 0xC4, 0xFD, 0xC3, 0x00, 0x51, 0xC3, 0x6F, 0x7A, 0xFF, 0xF4, 0xFF, 0xFD,
+    0xF7, 0xD4, 0xD7, 0x01, 0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
+    0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xF9, 0xE7, 0xF9, 0xEB,
+    0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xFF, 0x74, 0xF9, 0xFB,
+    0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xFF, 0xCE, 0xF9, 0xFB, 0xFF, 0xF4, 0xF9, 0xFB,
+    0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0xF9, 0xFB, 0x41, 0x77, 0xF9, 0x39, 0x21, 0x6F,
+    0xFC, 0x21, 0x64, 0xFD, 0xD6, 0x01, 0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A,
+    0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x7A, 0xF9, 0x95, 0xF9,
+    0x99, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9,
+    0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xFF,
+    0xFD, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xF9, 0xA9, 0xA0, 0x01, 0x71, 0x21, 0x70, 0xFD, 0x21,
+    0x6D, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x69, 0xFD, 0x21, 0x6C, 0xFD, 0x41, 0x6E, 0xF9, 0xE8, 0x21,
+    0xBC, 0xFC, 0x21, 0xC5, 0xFD, 0xD7, 0x01, 0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68,
+    0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xF9,
+    0x34, 0xF9, 0x38, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xFF,
+    0xF3, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xFF, 0xFD, 0xF9, 0x48, 0xF9,
+    0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xF9, 0x48, 0xA0, 0x07, 0xE2,
+    0x43, 0x85, 0x99, 0x87, 0xFB, 0xAD, 0xFB, 0xAD, 0xFF, 0xFD, 0xA0, 0x07, 0x22, 0x41, 0x62, 0xF8,
+    0xF3, 0xA1, 0x07, 0xE2, 0x75, 0xFC, 0xA0, 0x07, 0xD1, 0x21, 0x6D, 0xFD, 0x21, 0x65, 0xFD, 0x21,
+    0x69, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x64, 0xFD, 0x21, 0x6F, 0xFD, 0xA1, 0x07, 0xE2, 0x72, 0xFD,
+    0xA0, 0x08, 0x02, 0x24, 0xBA, 0x82, 0x9B, 0xBC, 0xD7, 0xDE, 0xF8, 0xFD, 0xC1, 0x05, 0xC2, 0x72,
+    0xF8, 0xC4, 0x41, 0x68, 0xF8, 0xBE, 0x21, 0x63, 0xFC, 0xA1, 0x05, 0xC2, 0x75, 0xFD, 0x41, 0x7A,
+    0xF8, 0xB2, 0x21, 0x63, 0xFC, 0x21, 0x99, 0xFD, 0xA0, 0x07, 0x43, 0x42, 0x63, 0x74, 0xFF, 0xF3,
+    0xF8, 0xA5, 0x21, 0x70, 0xF9, 0xA0, 0x07, 0xB2, 0x22, 0x85, 0x99, 0xFD, 0xFD, 0x21, 0x7A, 0xF8,
+    0x21, 0x63, 0xFD, 0xA3, 0x02, 0x22, 0xC4, 0x65, 0x79, 0xF5, 0xFD, 0xF2, 0xC5, 0x05, 0xC2, 0xC4,
+    0x77, 0x65, 0x75, 0x7A, 0xFF, 0xD9, 0xFF, 0xDC, 0xFF, 0xE6, 0xF8, 0x8D, 0xFF, 0xF7, 0x41, 0x72,
+    0xF8, 0x75, 0xA1, 0x05, 0xC2, 0x6F, 0xFC, 0x41, 0x6A, 0xFB, 0x16, 0x41, 0x74, 0xFD, 0x46, 0xA1,
+    0x01, 0x92, 0x61, 0xFC, 0x41, 0x87, 0xF7, 0xD4, 0x44, 0x82, 0x9B, 0xBA, 0xBC, 0xF7, 0xD0, 0xF7,
+    0xD0, 0xF7, 0xD0, 0xF7, 0xD0, 0xC2, 0x01, 0x92, 0x68, 0x7A, 0xFC, 0xC6, 0xFC, 0xC6, 0x42, 0xBA,
+    0xBC, 0xF6, 0x95, 0xF6, 0x95, 0xC2, 0x01, 0x92, 0xC5, 0x7A, 0xFF, 0xF9, 0xFC, 0xB6, 0xA0, 0x08,
+    0x42, 0xA3, 0x01, 0x92, 0x63, 0x6E, 0x74, 0xFD, 0xFD, 0xFD, 0x41, 0xBC, 0xF6, 0x79, 0xC2, 0x01,
+    0x92, 0xC5, 0x7A, 0xFF, 0xFC, 0xFC, 0x9D, 0xC1, 0x01, 0x92, 0x7A, 0xFC, 0x94, 0xD1, 0x01, 0x61,
+    0x74, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x77,
+    0x7A, 0xFF, 0xB2, 0xFF, 0xB7, 0xFF, 0xBB, 0xF7, 0x96, 0xFF, 0xC8, 0xFF, 0xD8, 0xF7, 0x96, 0xF7,
+    0x96, 0xF7, 0x96, 0xF7, 0x96, 0xF7, 0x96, 0xF7, 0x96, 0xFF, 0xE4, 0xFF, 0xF1, 0xFF, 0xFA, 0xF7,
+    0x96, 0xF7, 0x96, 0xA0, 0x07, 0x74, 0x21, 0x82, 0xFD, 0xA0, 0x07, 0x73, 0x21, 0x7A, 0xFD, 0x21,
+    0x63, 0xFD, 0x21, 0x69, 0xF7, 0x22, 0x6A, 0x77, 0xFA, 0xFD, 0x21, 0x74, 0xEF, 0x21, 0x6F, 0xFD,
+    0x23, 0xC5, 0x6F, 0x72, 0xE6, 0xF5, 0xFD, 0x21, 0x72, 0xE5, 0x21, 0x6E, 0xDF, 0x21, 0x65, 0xFD,
+    0x21, 0x69, 0xFD, 0x41, 0x7A, 0xF9, 0xA4, 0x21, 0x72, 0xFC, 0x21, 0x62, 0xFD, 0xA4, 0x01, 0x61,
+    0x62, 0x64, 0x6B, 0x6C, 0xE3, 0xEA, 0xF3, 0xFD, 0x41, 0x6D, 0xFE, 0xFD, 0xA1, 0x01, 0x61, 0x65,
+    0xFC, 0xA0, 0x08, 0x01, 0x21, 0xB3, 0xFD, 0xA0, 0x08, 0x22, 0x21, 0x73, 0xFD, 0x21, 0x79, 0xFD,
+    0x21, 0x7A, 0xF1, 0x21, 0x63, 0xFD, 0x21, 0x79, 0xFD, 0xA5, 0x02, 0x41, 0x69, 0xC3, 0x6D, 0x6F,
+    0x77, 0xE3, 0xEB, 0xF4, 0xE8, 0xFD, 0xC2, 0x05, 0xC2, 0x68, 0x7A, 0xF6, 0xBB, 0xF6, 0xBB, 0x41,
+    0xBA, 0xFB, 0xDC, 0xA1, 0x05, 0xC2, 0xC5, 0xFC, 0xC1, 0x05, 0xC2, 0x7A, 0xF6, 0xA9, 0xC1, 0x05,
+    0xC2, 0x72, 0xF6, 0xA3, 0xD9, 0x07, 0x02, 0xC4, 0xC5, 0x69, 0x6D, 0x72, 0x77, 0x61, 0x65, 0x6F,
+    0x79, 0x7A, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6E, 0x70, 0x73, 0x74, 0x75,
+    0xFE, 0x4C, 0xFE, 0x7F, 0xFE, 0x88, 0xFE, 0x95, 0xFE, 0xC8, 0xFE, 0xDE, 0xFE, 0xE3, 0xFF, 0x39,
+    0xFF, 0xA9, 0xF9, 0xF9, 0xFF, 0xD5, 0xFC, 0x2D, 0xFF, 0xE2, 0xFF, 0xEF, 0xFC, 0x2D, 0xFC, 0x2D,
+    0xFC, 0x2D, 0xFC, 0x2D, 0xFC, 0x2D, 0xFC, 0x2D, 0xFC, 0x2D, 0xFC, 0x2D, 0xFF, 0xF4, 0xFF, 0xFA,
+    0xFC, 0x2D, 0x41, 0x64, 0xF9, 0xAB, 0xA0, 0x05, 0xC1, 0x21, 0x74, 0xFD, 0x23, 0x7A, 0x6B, 0x75,
+    0xF6, 0xFD, 0xFA, 0x42, 0x73, 0x6F, 0xFF, 0x10, 0xFF, 0x16, 0x41, 0x66, 0xF8, 0xDD, 0xC9, 0x01,
+    0x61, 0x66, 0x67, 0x6B, 0x6E, 0x72, 0x73, 0x77, 0x6D, 0x75, 0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0xF5,
+    0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0xFC, 0xF8, 0xD9, 0x44, 0x82, 0x9B, 0xBA,
+    0xBC, 0xFD, 0xC1, 0xFD, 0xC1, 0xFD, 0xC1, 0xFD, 0xC1, 0xC1, 0x03, 0x32, 0x77, 0xF5, 0x0A, 0x21,
+    0x7A, 0xFA, 0xA1, 0x05, 0xC2, 0x65, 0xFD, 0x42, 0xBA, 0xBC, 0xFB, 0x24, 0xFB, 0x24, 0x41, 0x87,
+    0xF7, 0x0F, 0x44, 0x82, 0x9B, 0xBA, 0xBC, 0xF7, 0x0B, 0xF7, 0x0B, 0xF7, 0x0B, 0xF7, 0x0B, 0xC2,
+    0x02, 0x92, 0x68, 0x7A, 0xF4, 0xE4, 0xF4, 0xE4, 0x42, 0xBA, 0xBC, 0xFA, 0x36, 0xFA, 0x36, 0xC2,
+    0x02, 0x92, 0xC5, 0x7A, 0xFF, 0xF9, 0xF4, 0xD4, 0xC1, 0x02, 0x92, 0x7A, 0xF4, 0xCB, 0xC1, 0x02,
+    0x92, 0x6B, 0xF4, 0xC5, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D,
+    0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xCA, 0xFF, 0xCE, 0xF6, 0xDF, 0xFF, 0xDB, 0xFF, 0xEB,
+    0xF6, 0xDF, 0xF6, 0xDF, 0xF6, 0xDF, 0xF6, 0xDF, 0xF6, 0xDF, 0xF6, 0xDF, 0xF6, 0xDF, 0xFF, 0xF4,
+    0xFF, 0xF4, 0xFF, 0xFA, 0xF6, 0xDF, 0xF6, 0xDF, 0xC3, 0x05, 0xC2, 0xC5, 0x6F, 0x7A, 0xFF, 0x8F,
+    0xFF, 0xCC, 0xF5, 0x89, 0xA0, 0x08, 0x63, 0x21, 0x87, 0xFD, 0x24, 0x82, 0x9B, 0xBA, 0xBC, 0xFA,
+    0xFA, 0xFA, 0xFA, 0x41, 0x7A, 0xF4, 0x70, 0xD1, 0x08, 0x93, 0xC4, 0xC5, 0x63, 0x64, 0x66, 0x67,
+    0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x72, 0xFF, 0x77, 0xFF, 0x7B, 0xFF,
+    0x88, 0xFF, 0x98, 0xF6, 0x8C, 0xF6, 0x8C, 0xF6, 0x8C, 0xF6, 0x8C, 0xF6, 0x8C, 0xF6, 0x8C, 0xF6,
+    0x8C, 0xF6, 0x8C, 0xF6, 0x8C, 0xFF, 0xA1, 0xF6, 0x8C, 0xF6, 0x8C, 0xFF, 0xFC, 0xC2, 0x08, 0x93,
+    0x68, 0x7A, 0xFA, 0x5E, 0xFA, 0x5E, 0xA0, 0x08, 0xF2, 0x43, 0xBA, 0x9B, 0xBC, 0xF4, 0x2A, 0xF6,
+    0x44, 0xFF, 0xFD, 0xD1, 0x08, 0x93, 0xC5, 0xC4, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C,
+    0x6D, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xF6, 0xFF, 0x2B, 0xFF, 0x3C, 0xFF, 0x4C, 0xF6,
+    0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6, 0x40, 0xF6,
+    0x40, 0xFF, 0x55, 0xF6, 0x40, 0xF6, 0x40, 0xFA, 0x48, 0xA0, 0x08, 0x93, 0xC1, 0x08, 0x93, 0x7A,
+    0xFA, 0x0F, 0xD1, 0x05, 0xC2, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D,
+    0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0x65, 0xFF, 0x68, 0xFF, 0x75, 0xFF, 0xAB, 0xFF, 0xC1,
+    0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xFA,
+    0xFF, 0xFA, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xC1, 0x08, 0xC3, 0x75, 0xF6, 0x3F, 0x21, 0x7A,
+    0xFA, 0xC2, 0x05, 0xC2, 0x6F, 0x7A, 0xFF, 0xFD, 0xF4, 0xA0, 0xC2, 0x05, 0xC2, 0x6D, 0x7A, 0xF4,
+    0x97, 0xF4, 0x97, 0xC2, 0x05, 0xC2, 0x6B, 0x72, 0xF4, 0x8E, 0xF4, 0x8E, 0x41, 0x7A, 0xF9, 0xAF,
+    0xA1, 0x05, 0xC2, 0x63, 0xFC, 0xC1, 0x05, 0xC2, 0x77, 0xF4, 0x7C, 0xD6, 0x02, 0x01, 0xC4, 0x61,
+    0x65, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6B, 0x6C, 0x6D, 0x6F, 0x70, 0x72, 0x73,
+    0x74, 0x75, 0x77, 0x7A, 0xFC, 0x25, 0xFE, 0x31, 0xFE, 0x43, 0xFE, 0x61, 0xFE, 0x77, 0xFD, 0xBB,
+    0xFE, 0xED, 0xFA, 0x06, 0xFA, 0x06, 0xFA, 0x06, 0xFA, 0x06, 0xFD, 0xD3, 0xFA, 0x06, 0xFA, 0x06,
+    0xFF, 0x97, 0xFA, 0x06, 0xFF, 0xD6, 0xFF, 0xDF, 0xFF, 0xE8, 0xFF, 0xF5, 0xFA, 0x06, 0xFF, 0xFA,
+    0x44, 0x82, 0x9B, 0xBA, 0xBC, 0xF6, 0x93, 0xF6, 0x93, 0xF6, 0x93, 0xF6, 0x93, 0xC2, 0x01, 0xB2,
+    0x63, 0x74, 0xF6, 0xCA, 0xF6, 0xCA, 0xC1, 0x01, 0xB2, 0x72, 0xF4, 0xDA, 0xA0, 0x02, 0x71, 0xC2,
+    0x09, 0x12, 0xC5, 0x64, 0xFC, 0x7F, 0xFF, 0xFD, 0xC2, 0x01, 0x92, 0x70, 0x6B, 0xFC, 0x86, 0xF9,
+    0x33, 0x51, 0x64, 0xC4, 0xC5, 0x62, 0x63, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73,
+    0x74, 0x77, 0x7A, 0xFF, 0xEE, 0xFC, 0x53, 0xFC, 0x57, 0xF4, 0x32, 0xFC, 0x64, 0xF4, 0x32, 0xF4,
+    0x32, 0xF4, 0x32, 0xF4, 0x32, 0xF4, 0x32, 0xFF, 0xF7, 0xF4, 0x32, 0xFC, 0x96, 0xFC, 0x96, 0xF4,
+    0x32, 0xF4, 0x32, 0xF4, 0x32, 0xC2, 0x01, 0xB2, 0x6F, 0x72, 0xFF, 0xCC, 0xF6, 0x69, 0xA0, 0x04,
+    0x32, 0x21, 0x7A, 0xFD, 0xC8, 0x01, 0xB2, 0x63, 0x64, 0x6B, 0x72, 0x74, 0xC5, 0x6F, 0x7A, 0xF6,
+    0x63, 0xF6, 0x63, 0xF6, 0x63, 0xF6, 0x63, 0xF6, 0x63, 0xF6, 0x86, 0xFF, 0xFD, 0xF4, 0x7C, 0xC2,
+    0x01, 0xB2, 0x6D, 0x7A, 0xF4, 0x61, 0xF4, 0x61, 0xC2, 0x01, 0xB2, 0x63, 0x6B, 0xF4, 0x54, 0xF4,
+    0x58, 0xC2, 0x01, 0xB2, 0x6D, 0x77, 0xF9, 0x20, 0xF4, 0x4F, 0x53, 0x64, 0x6A, 0xC4, 0xC5, 0x62,
+    0x63, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x75, 0x77, 0x7A, 0xFC, 0xEA,
+    0xFF, 0x11, 0xF5, 0xEC, 0xFF, 0x56, 0xF6, 0x28, 0xF6, 0x0B, 0xFF, 0x63, 0xF6, 0x28, 0xF3, 0xD5,
+    0xFF, 0x6C, 0xF3, 0xD5, 0xF3, 0xD5, 0xFF, 0xBB, 0xFF, 0xCA, 0xFF, 0xE5, 0xFF, 0xEE, 0xF3, 0xD5,
+    0xF3, 0xD5, 0xFF, 0xF7, 0x41, 0x87, 0xFA, 0xF9, 0xA0, 0x09, 0x32, 0xC4, 0x05, 0xC2, 0x63, 0x6B,
+    0x68, 0x7A, 0xFF, 0xFD, 0xFF, 0xFD, 0xF3, 0x46, 0xF3, 0x46, 0xA0, 0x09, 0x52, 0x42, 0xBA, 0xBC,
+    0xFF, 0xFD, 0xF8, 0x5E, 0x41, 0x7A, 0xF7, 0x8A, 0xA1, 0x02, 0x92, 0x72, 0xFC, 0xC1, 0x02, 0x92,
+    0x72, 0xF2, 0x26, 0x41, 0x68, 0xF7, 0x7B, 0xA1, 0x02, 0x92, 0x63, 0xFC, 0x51, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFD, 0x22,
+    0xFD, 0x26, 0xFF, 0xEC, 0xFD, 0x33, 0xFD, 0x43, 0xF4, 0x37, 0xF4, 0x37, 0xF4, 0x37, 0xFF, 0xF1,
+    0xF4, 0x37, 0xFD, 0x52, 0xFF, 0xFB, 0xFD, 0x4C, 0xFD, 0x4C, 0xFD, 0x52, 0xF4, 0x37, 0xF4, 0x37,
+    0xC3, 0x05, 0xC2, 0xC5, 0x6F, 0x7A, 0xFF, 0xAD, 0xFF, 0xCC, 0xF2, 0xE1, 0xC2, 0x05, 0xC2, 0x63,
+    0x6B, 0xFF, 0x8C, 0xFF, 0x8C, 0xA0, 0x09, 0x92, 0xC1, 0x03, 0x12, 0x75, 0xF4, 0x5F, 0xA0, 0x09,
+    0xE1, 0x44, 0xBA, 0x82, 0x9B, 0xBC, 0xFF, 0xF4, 0xFF, 0xF7, 0xF4, 0x42, 0xFF, 0xFD, 0x41, 0x68,
+    0xF4, 0x49, 0x21, 0x63, 0xFC, 0xA1, 0x02, 0xB2, 0x75, 0xFD, 0x41, 0x7A, 0xF4, 0x3D, 0x21, 0x63,
+    0xFC, 0x21, 0x99, 0xFD, 0x41, 0xBC, 0xF4, 0x33, 0x42, 0xC5, 0x70, 0xFF, 0xFC, 0xF4, 0x2F, 0x42,
+    0x63, 0x74, 0xFF, 0xEB, 0xF4, 0x28, 0x21, 0x70, 0xF9, 0xA3, 0x02, 0xB2, 0xC4, 0x61, 0x65, 0xE8,
+    0xEF, 0xFD, 0x41, 0x6A, 0xF4, 0x15, 0xA2, 0x02, 0xB2, 0x61, 0x6F, 0xFC, 0xFC, 0xA0, 0x09, 0xB3,
+    0x21, 0x63, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x68, 0xFD, 0x21, 0x7A, 0xF4, 0x21, 0x72, 0xFD, 0x21,
+    0x74, 0xFD, 0xA2, 0x02, 0x71, 0x63, 0x73, 0xF4, 0xFD, 0x41, 0x87, 0xF3, 0xDA, 0xC2, 0x02, 0xB2,
+    0x68, 0x7A, 0xF6, 0xB1, 0xF6, 0xB1, 0x42, 0xBA, 0xBC, 0xF8, 0x59, 0xF8, 0x59, 0xA1, 0x02, 0xB2,
+    0xC5, 0xF9, 0xC2, 0x02, 0xB2, 0x6D, 0x7A, 0xF6, 0x9C, 0xF6, 0x9C, 0xD5, 0x09, 0x72, 0xC5, 0x6D,
+    0x72, 0x77, 0x6F, 0x75, 0x7A, 0xC4, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6E,
+    0x70, 0x73, 0x74, 0xFF, 0x76, 0xFF, 0x8A, 0xFF, 0xAE, 0xFF, 0xBB, 0xFF, 0xD7, 0xFE, 0x21, 0xF3,
+    0x52, 0xFF, 0xDE, 0xF3, 0x72, 0xFF, 0xE2, 0xFF, 0xF2, 0xF3, 0x72, 0xF3, 0x72, 0xF3, 0x72, 0xF3,
+    0x72, 0xF3, 0x72, 0xF3, 0x72, 0xF3, 0x72, 0xF3, 0x72, 0xFF, 0xF7, 0xF3, 0x72, 0xC2, 0x02, 0x92,
+    0x6D, 0x7A, 0xF0, 0xF6, 0xF0, 0xF6, 0x51, 0x64, 0xC4, 0xC5, 0x62, 0x63, 0x66, 0x67, 0x68, 0x6B,
+    0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xB5, 0xFB, 0xF8, 0xFB, 0xFC, 0xF3, 0x0D,
+    0xFC, 0x09, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D,
+    0xFC, 0x22, 0xFF, 0xF7, 0xF3, 0x0D, 0xF3, 0x0D, 0xF3, 0x0D, 0xA0, 0x02, 0xF1, 0xA1, 0x02, 0xD2,
+    0x6B, 0xFD, 0x44, 0x82, 0x9B, 0xBA, 0xBC, 0xFF, 0xFB, 0xF2, 0xF7, 0xF2, 0xF7, 0xF2, 0xF7, 0xA0,
+    0x0A, 0x12, 0xA0, 0x0A, 0xC2, 0x21, 0x63, 0xFD, 0xA1, 0x0A, 0x32, 0x79, 0xFD, 0x21, 0xBC, 0xFB,
+    0x21, 0xC5, 0xFD, 0xA1, 0x0B, 0x42, 0x75, 0xFD, 0xA0, 0x0A, 0xE3, 0xA0, 0x0B, 0x42, 0x24, 0xBA,
+    0x82, 0xBC, 0x9B, 0xE1, 0xF5, 0xFA, 0xFD, 0xA0, 0x0A, 0x32, 0x21, 0x68, 0xFD, 0x21, 0x63, 0xFD,
+    0xA1, 0x0B, 0x62, 0x75, 0xFD, 0x21, 0x74, 0xF2, 0x21, 0x61, 0xFD, 0x21, 0x6D, 0xFD, 0x21, 0x6B,
+    0xE9, 0x21, 0x6C, 0xE6, 0xA0, 0x0A, 0x53, 0xA4, 0x0B, 0x62, 0x61, 0x75, 0x79, 0x7A, 0xF4, 0xF7,
+    0xFA, 0xFD, 0xA1, 0x0B, 0x62, 0x6D, 0xD5, 0xA0, 0x02, 0xD1, 0xA0, 0x0B, 0x13, 0x41, 0x6D, 0xFF,
+    0xA5, 0x41, 0x6A, 0xFF, 0xA1, 0x22, 0x72, 0x6F, 0xB3, 0xFC, 0xC6, 0x02, 0xD2, 0x61, 0x67, 0x69,
+    0x6A, 0x6C, 0x77, 0xFF, 0xF0, 0xFF, 0xAE, 0xFF, 0xF3, 0xFF, 0x98, 0xFF, 0x98, 0xFF, 0xFB, 0x41,
+    0x87, 0xFF, 0x9C, 0xC2, 0x0B, 0x62, 0x68, 0x7A, 0xFF, 0x67, 0xFF, 0x67, 0xA0, 0x0B, 0x81, 0x22,
+    0xBA, 0xBC, 0xFD, 0xFD, 0xC2, 0x0B, 0x62, 0xC5, 0x7A, 0xFF, 0xFB, 0xFF, 0x56, 0xA0, 0x0B, 0x62,
+    0xC1, 0x0B, 0x62, 0x7A, 0xFF, 0x7B, 0xD5, 0x09, 0xF2, 0xC5, 0x6D, 0x72, 0x75, 0x79, 0x7A, 0xC4,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6E, 0x70, 0x73, 0x74, 0x77, 0xFF, 0x78,
+    0xFF, 0x8A, 0xFF, 0xA1, 0xFF, 0xAC, 0xFF, 0xB1, 0xFF, 0xC4, 0xFF, 0xD9, 0xFF, 0xDD, 0xFF, 0xEE,
+    0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7,
+    0xFF, 0xF7, 0xFF, 0xFA, 0xFF, 0xF7, 0xFF, 0xF7, 0x41, 0x87, 0xF2, 0x01, 0x41, 0x7A, 0xFF, 0x13,
+    0xA1, 0x06, 0xC2, 0x72, 0xFC, 0xC2, 0x06, 0xC2, 0x68, 0x7A, 0xF6, 0xBA, 0xF6, 0xBA, 0xA0, 0x0A,
+    0x84, 0x21, 0x73, 0xFD, 0x21, 0x6B, 0xFD, 0x41, 0x7A, 0xFE, 0xE3, 0xA1, 0x06, 0xC2, 0x72, 0xFC,
+    0xC2, 0x06, 0xC2, 0x6C, 0x72, 0xF6, 0x9F, 0xF6, 0x9F, 0x41, 0x68, 0xFE, 0xD1, 0xA1, 0x06, 0xC2,
+    0x63, 0xFC, 0x41, 0xBC, 0xFE, 0xC8, 0xC2, 0x06, 0xC2, 0xC5, 0x7A, 0xFF, 0xFC, 0xF6, 0x89, 0xC3,
+    0x06, 0xC2, 0x63, 0x6D, 0x7A, 0xFF, 0xEA, 0xF6, 0x80, 0xF6, 0x80, 0xC2, 0x06, 0xC2, 0x6B, 0x72,
+    0xF6, 0x74, 0xF6, 0x74, 0x53, 0xC5, 0x64, 0xC4, 0x62, 0x63, 0x65, 0x66, 0x67, 0x68, 0x6B, 0x6C,
+    0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFE, 0xAE, 0xFF, 0x62, 0xFF, 0xA4, 0xFF, 0xAC,
+    0xFF, 0xB1, 0xFF, 0xC0, 0xF6, 0xE3, 0xFF, 0xC7, 0xF6, 0xE3, 0xFF, 0xCC, 0xF6, 0xE3, 0xF6, 0xE3,
+    0xF6, 0xE3, 0xFF, 0xD9, 0xFF, 0xE2, 0xFF, 0xEB, 0xFF, 0xF7, 0xF6, 0xE3, 0xF6, 0xE3, 0x21, 0x65,
+    0xC6, 0x21, 0x7A, 0xFD, 0xC2, 0x05, 0xC2, 0x6F, 0x72, 0xFE, 0x32, 0xFF, 0xFD, 0xC1, 0x03, 0x52,
+    0x72, 0xF6, 0x9A, 0x41, 0x9B, 0xF4, 0x6B, 0x41, 0x7A, 0xF6, 0x18, 0x21, 0x72, 0xFC, 0x41, 0x72,
+    0xF4, 0x60, 0xC6, 0x03, 0x32, 0x65, 0x75, 0xC5, 0x62, 0x6D, 0x74, 0xFF, 0xEB, 0xF1, 0x95, 0xFF,
+    0xF1, 0xFF, 0xF9, 0xEF, 0x01, 0xFF, 0xFC, 0x21, 0x7A, 0xEB, 0xC2, 0x05, 0xC2, 0x6F, 0x7A, 0xFF,
+    0xFD, 0xEF, 0xE7, 0x41, 0x65, 0xF1, 0x74, 0xA1, 0x03, 0x32, 0x69, 0xFC, 0x21, 0x62, 0xFB, 0xC2,
+    0x05, 0xC2, 0x75, 0x7A, 0xFF, 0xFD, 0xEF, 0xD2, 0xC2, 0x05, 0xC2, 0x63, 0x77, 0xFB, 0x44, 0xEF,
+    0xC9, 0xC2, 0x02, 0x92, 0x6B, 0x72, 0xEE, 0xC2, 0xEE, 0xC2, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64,
+    0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xF9, 0xC4, 0xF9, 0xC8,
+    0xFC, 0x8E, 0xF9, 0xD5, 0xF9, 0xE5, 0xF0, 0xD9, 0xF0, 0xD9, 0xF0, 0xD9, 0xF0, 0xD9, 0xF0, 0xD9,
+    0xF0, 0xD9, 0xF0, 0xD9, 0xF9, 0xEE, 0xF9, 0xEE, 0xFF, 0xF7, 0xF0, 0xD9, 0xF0, 0xD9, 0xA1, 0x05,
+    0xC2, 0x79, 0xCC, 0x41, 0x87, 0xF4, 0xA8, 0x44, 0x82, 0x9B, 0xBA, 0xBC, 0xF4, 0xA4, 0xF4, 0xA4,
+    0xF4, 0xA4, 0xF4, 0xA4, 0x43, 0x9B, 0xBA, 0xBC, 0xF0, 0x89, 0xF0, 0x89, 0xF0, 0x89, 0xCD, 0x00,
+    0x91, 0xC4, 0xC5, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6D, 0x70, 0x73, 0x77, 0xF9, 0x70,
+    0xFF, 0xF6, 0xF9, 0x81, 0xF9, 0x91, 0xF0, 0x85, 0xF0, 0x85, 0xF0, 0x85, 0xF0, 0x85, 0xF0, 0x85,
+    0xF0, 0x85, 0xF0, 0x85, 0xF9, 0x9A, 0xF0, 0x85, 0xC2, 0x00, 0x91, 0x68, 0x7A, 0xF4, 0x63, 0xF4,
+    0x63, 0x44, 0xBA, 0x82, 0x9B, 0xBC, 0xEE, 0x32, 0xF0, 0x4C, 0xF0, 0x4C, 0xFA, 0x05, 0xC1, 0x00,
+    0x71, 0x72, 0xFB, 0x0E, 0xD0, 0x00, 0x91, 0xC5, 0xC4, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B,
+    0x6C, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xED, 0xF9, 0x2A, 0xF9, 0x3B, 0xF9, 0x4B, 0xF0,
+    0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF9,
+    0x54, 0xF0, 0x3F, 0xFF, 0xFA, 0xF4, 0x47, 0xC1, 0x00, 0x91, 0x7A, 0xF4, 0x14, 0xD1, 0x02, 0x41,
+    0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77,
+    0x7A, 0xFF, 0x66, 0xFF, 0x6A, 0xFF, 0x81, 0xFF, 0xAB, 0xFF, 0xC7, 0xEE, 0xE4, 0xEE, 0xE4, 0xEE,
+    0xE4, 0xEE, 0xE4, 0xEE, 0xE4, 0xEE, 0xE4, 0xEE, 0xE4, 0xFF, 0xFA, 0xFF, 0xFA, 0xEE, 0xE4, 0xEE,
+    0xE4, 0xEE, 0xE4, 0x53, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70,
+    0x72, 0x73, 0x74, 0x75, 0x77, 0x7A, 0x6F, 0xFB, 0x61, 0xF8, 0x99, 0xF4, 0x3E, 0xFB, 0x68, 0xFB,
+    0xCD, 0xF4, 0x3E, 0xF4, 0x3E, 0xF4, 0x3E, 0xF4, 0x3E, 0xF4, 0x3E, 0xFB, 0xD9, 0xFE, 0x91, 0xFE,
+    0xC7, 0xFE, 0xDC, 0xFA, 0x20, 0xFE, 0xE5, 0xFF, 0x2B, 0xFA, 0x32, 0xFF, 0xCA, 0x21, 0x65, 0xC6,
+    0xD8, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B,
+    0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0xEF, 0x09, 0xEF, 0x0D, 0xFA,
+    0xEA, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xF3, 0x40, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xFF,
+    0xFD, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF,
+    0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xEF, 0x1D, 0xA0, 0x06, 0x11, 0x21, 0x87,
+    0xFD, 0x41, 0x6F, 0xEF, 0xA8, 0x21, 0x69, 0xFC, 0xA1, 0x06, 0x11, 0x6D, 0xFD, 0x23, 0x9B, 0xBA,
+    0xBC, 0xFB, 0xEE, 0xEE, 0x42, 0x85, 0x99, 0xF3, 0x94, 0xF3, 0x94, 0xA0, 0x05, 0x92, 0xA1, 0x05,
+    0x72, 0x7A, 0xFD, 0x21, 0x63, 0xFB, 0xA2, 0x03, 0xA2, 0xC4, 0x6F, 0xEE, 0xFD, 0x44, 0x82, 0x9B,
+    0xBA, 0xBC, 0xFF, 0xF9, 0xF0, 0x56, 0xF0, 0x56, 0xF0, 0x56, 0x41, 0x67, 0xF3, 0x6E, 0x21, 0x7A,
+    0xFC, 0xA1, 0x01, 0xB2, 0x75, 0xFD, 0x41, 0x87, 0xF3, 0x62, 0x41, 0x6F, 0xF3, 0x5E, 0x22, 0xC4,
+    0x73, 0xF8, 0xFC, 0x41, 0x84, 0xF3, 0x55, 0x42, 0xC5, 0x6E, 0xFF, 0xFC, 0xF3, 0x51, 0x41, 0xBA,
+    0xF3, 0x4A, 0x42, 0xC5, 0x7A, 0xFF, 0xFC, 0xF3, 0x46, 0x21, 0x64, 0xB2, 0x22, 0x85, 0x99, 0xAF,
+    0xFD, 0x21, 0x7A, 0xAA, 0x22, 0x63, 0x74, 0xA7, 0xA7, 0x41, 0x6E, 0xFF, 0xA2, 0xA4, 0x0B, 0x93,
+    0xC4, 0x65, 0x75, 0x79, 0xEF, 0xF4, 0xF7, 0xFC, 0xA4, 0x01, 0x61, 0x61, 0x6F, 0x79, 0x7A, 0xC6,
+    0xCF, 0xDA, 0xF5, 0xC3, 0x05, 0xC2, 0x6E, 0x68, 0x7A, 0xFA, 0x45, 0xED, 0x8E, 0xED, 0x8E, 0xC2,
+    0x05, 0xC2, 0xC5, 0x7A, 0xF7, 0x88, 0xED, 0x82, 0xA0, 0x0C, 0x52, 0x41, 0xBC, 0xF2, 0xA0, 0xC4,
+    0x05, 0xC2, 0x74, 0xC5, 0x6D, 0x7A, 0xFF, 0xF9, 0xFF, 0xFC, 0xF4, 0xBA, 0xED, 0x72, 0x41, 0x68,
+    0xF2, 0x8D, 0xC2, 0x05, 0xC2, 0x63, 0x7A, 0xFF, 0xFC, 0xED, 0x5F, 0xC1, 0x05, 0xC2, 0x6B, 0xED,
+    0x56, 0xC1, 0x05, 0xC2, 0x77, 0xFA, 0x07, 0xD1, 0x00, 0x81, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66,
+    0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xF9, 0xFD, 0xF7, 0x35, 0xF2,
+    0xDA, 0xFF, 0xBC, 0xFF, 0xC8, 0xF2, 0xDA, 0xF2, 0xDA, 0xF2, 0xDA, 0xF2, 0xDA, 0xF2, 0xDA, 0xF2,
+    0xDA, 0xF2, 0xDA, 0xFF, 0xD8, 0xFF, 0xEB, 0xFF, 0xF4, 0xF2, 0xDA, 0xFF, 0xFA, 0xC1, 0x00, 0x81,
+    0x62, 0xF2, 0xA4, 0x41, 0x7A, 0xED, 0x5C, 0x21, 0x72, 0xFC, 0x21, 0x74, 0xFD, 0x21, 0x73, 0xFD,
+    0xC1, 0x01, 0xB2, 0x7A, 0xED, 0xC0, 0xA0, 0x0C, 0x23, 0x21, 0x6D, 0xFD, 0xD5, 0x00, 0xF2, 0xC5,
+    0x6C, 0x72, 0x65, 0x69, 0xC4, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6D, 0x6E, 0x6F, 0x70,
+    0x73, 0x74, 0x75, 0x77, 0xFF, 0x01, 0xFF, 0x15, 0xFF, 0x5C, 0xFF, 0xAB, 0xFF, 0xE1, 0xEF, 0x5A,
+    0xEF, 0x79, 0xEF, 0x89, 0xED, 0x43, 0xED, 0x43, 0xED, 0x43, 0xED, 0x43, 0xED, 0x43, 0xED, 0x43,
+    0xED, 0x43, 0xFF, 0xF1, 0xED, 0x43, 0xFF, 0xF4, 0xED, 0x43, 0xFF, 0xFD, 0xED, 0x43, 0x41, 0x6F,
+    0xED, 0x01, 0xC2, 0x01, 0xB2, 0x75, 0x7A, 0xF2, 0x36, 0xFF, 0xFC, 0x41, 0x74, 0xF2, 0x2D, 0x21,
+    0x99, 0xFC, 0x41, 0x70, 0xF2, 0x26, 0x41, 0x6E, 0xF2, 0x22, 0x21, 0x69, 0xFC, 0x21, 0x62, 0xFD,
+    0x41, 0x69, 0xF2, 0x18, 0x41, 0xC4, 0xFE, 0xB2, 0xC2, 0x02, 0x41, 0x65, 0x77, 0xFF, 0xFC, 0xF2,
+    0x10, 0xA6, 0x01, 0xB2, 0xC4, 0x61, 0x6F, 0x75, 0x77, 0x7A, 0xDE, 0xE1, 0xEC, 0xDA, 0xEF, 0xF7,
+    0xA0, 0x0C, 0x02, 0xA1, 0x0B, 0xC2, 0x72, 0xFD, 0xA1, 0x0B, 0xC2, 0x6D, 0xF8, 0x22, 0x61, 0x65,
+    0xF6, 0xFB, 0xA1, 0x0C, 0x92, 0x69, 0xFB, 0xC1, 0x05, 0xC2, 0x6B, 0xF4, 0x06, 0xC1, 0x05, 0xC2,
+    0x63, 0xFE, 0xF1, 0xC2, 0x05, 0xC2, 0xC5, 0x7A, 0xFE, 0xD8, 0xEC, 0x4E, 0xC2, 0x05, 0xC2, 0x63,
+    0x6B, 0xFE, 0xE2, 0xEC, 0x45, 0xD1, 0x00, 0x81, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68,
+    0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xF8, 0xEF, 0xF6, 0x27, 0xF1, 0xCC, 0xF5,
+    0x81, 0xFE, 0xBA, 0xF1, 0xCC, 0xF1, 0xCC, 0xF1, 0xCC, 0xF1, 0xCC, 0xF1, 0xCC, 0xFF, 0xE2, 0xFF,
+    0xE8, 0xFF, 0xEE, 0xF5, 0x93, 0xFF, 0xF7, 0xF1, 0xCC, 0xF1, 0xCC, 0xA0, 0x0C, 0x72, 0x43, 0xBA,
+    0x9B, 0xBC, 0xEC, 0xC2, 0xEE, 0x65, 0xFF, 0xFD, 0x41, 0x75, 0xEF, 0x55, 0xC1, 0x01, 0xB2, 0x65,
+    0xF8, 0x35, 0x41, 0x73, 0xEC, 0x3D, 0x42, 0x63, 0x6D, 0xFE, 0xDD, 0xFE, 0xF0, 0xD8, 0x00, 0xF2,
+    0x69, 0x72, 0x7A, 0x65, 0xC5, 0xC4, 0x61, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C,
+    0x6D, 0x6E, 0x6F, 0x70, 0x73, 0x74, 0x75, 0x77, 0xFF, 0x35, 0xFF, 0x64, 0xFF, 0x85, 0xFF, 0xA8,
+    0xFF, 0xE1, 0xEE, 0x49, 0xFF, 0xEB, 0xFF, 0xEF, 0xEE, 0x68, 0xEE, 0x78, 0xEC, 0x32, 0xEC, 0x32,
+    0xEC, 0x32, 0xEC, 0x32, 0xEE, 0x85, 0xEC, 0x32, 0xEC, 0x32, 0xEC, 0x32, 0xFF, 0xF5, 0xEC, 0x32,
+    0xFE, 0xE3, 0xEC, 0x32, 0xFF, 0xF9, 0xEC, 0x32, 0x41, 0x82, 0xF1, 0x48, 0x21, 0xC5, 0xFC, 0x21,
+    0x68, 0xFD, 0xA1, 0x02, 0x01, 0x63, 0xFD, 0xA0, 0x0B, 0xE2, 0x21, 0x6E, 0xFD, 0x21, 0x9B, 0xFD,
+    0xA0, 0x0C, 0xB2, 0x21, 0x6F, 0xFD, 0x22, 0xC5, 0x65, 0xF7, 0xFD, 0x41, 0x7A, 0xEE, 0xD2, 0xC1,
+    0x06, 0x11, 0x72, 0xEE, 0x0F, 0xC2, 0x02, 0x01, 0x68, 0x7A, 0xFF, 0xFA, 0xFD, 0x46, 0xA0, 0x02,
+    0x01, 0x41, 0x6B, 0xF1, 0xE6, 0x21, 0x6F, 0xFC, 0x21, 0x6E, 0xFD, 0x21, 0x6C, 0xFD, 0x21, 0xB3,
+    0xFD, 0x41, 0x72, 0xEC, 0x6C, 0x21, 0x74, 0xFC, 0x21, 0x6F, 0xFD, 0x21, 0x69, 0xFD, 0xA2, 0x02,
+    0x01, 0xC3, 0x6E, 0xF0, 0xFD, 0x41, 0x6D, 0xF0, 0xCC, 0xC2, 0x02, 0x01, 0x61, 0x72, 0xFF, 0xFC,
+    0xFD, 0x12, 0x41, 0x68, 0xEB, 0xEE, 0xA1, 0x02, 0x01, 0x63, 0xFC, 0xA0, 0x0C, 0xD2, 0x21, 0xBC,
+    0xFD, 0x21, 0x99, 0xBD, 0x21, 0xC4, 0xFD, 0xA0, 0x07, 0x02, 0x23, 0xC5, 0x74, 0x7A, 0xF4, 0xFA,
+    0xFD, 0xA0, 0x05, 0xE2, 0x21, 0x74, 0xFD, 0x21, 0x65, 0xFD, 0xA1, 0x04, 0x32, 0x73, 0xFD, 0x21,
+    0x6D, 0xFB, 0x21, 0x65, 0xFD, 0xC2, 0x02, 0x01, 0x69, 0x7A, 0xFF, 0xFD, 0xFC, 0xD6, 0x52, 0xC4,
+    0xC5, 0x62, 0x64, 0x74, 0x6C, 0x61, 0x63, 0x66, 0x67, 0x68, 0x6B, 0x6D, 0x70, 0x72, 0x73, 0x77,
+    0x7A, 0xFC, 0xD0, 0xFC, 0xDF, 0xFD, 0xFE, 0xFF, 0x0F, 0xFF, 0x64, 0xFF, 0x78, 0xFF, 0x7D, 0xFF,
+    0x87, 0xFF, 0x90, 0xFF, 0xB0, 0xFF, 0x90, 0xFF, 0xBB, 0xFF, 0x90, 0xFF, 0xC8, 0xFF, 0xDC, 0xFF,
+    0xF7, 0xFF, 0x90, 0xFF, 0x90, 0x41, 0x77, 0xF1, 0x42, 0x21, 0x6F, 0xFC, 0x21, 0x6B, 0xFD, 0x21,
+    0x73, 0xFD, 0xA1, 0x00, 0x61, 0x61, 0xFD, 0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFF, 0xFB, 0xE9,
+    0x23, 0xE9, 0x23, 0xE9, 0x23, 0xE9, 0x23, 0xC1, 0x00, 0x71, 0x72, 0xE9, 0x9C, 0x41, 0x72, 0xF9,
+    0x4A, 0x41, 0x64, 0xE9, 0x92, 0xA2, 0x00, 0x71, 0x62, 0x6D, 0xF8, 0xFC, 0x41, 0x6B, 0xE9, 0x9A,
+    0x21, 0x6D, 0xFC, 0x21, 0x79, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x72, 0xFD, 0x42, 0x85, 0x99, 0xF0,
+    0xCF, 0xF0, 0xCF, 0x41, 0x7A, 0xF0, 0xC8, 0x21, 0x63, 0xFC, 0xC7, 0x06, 0xE2, 0x6B, 0x6D, 0x6F,
+    0x70, 0xC4, 0x65, 0x79, 0xFF, 0xCD, 0xEF, 0x91, 0xFF, 0xDB, 0xFF, 0xEF, 0xFF, 0xF2, 0xFF, 0xFD,
+    0xF0, 0xC1, 0x21, 0x82, 0xE8, 0x21, 0xC5, 0xFD, 0x21, 0xB3, 0xFD, 0xC1, 0x00, 0x51, 0x68, 0xE8,
+    0xBF, 0x41, 0x6B, 0xEC, 0x49, 0x21, 0x6F, 0xFC, 0x21, 0x6E, 0xFD, 0x21, 0x82, 0xFD, 0xA0, 0x0C,
+    0xF3, 0xA1, 0x02, 0x22, 0x6E, 0xFD, 0xC5, 0x02, 0x02, 0x65, 0x69, 0x6F, 0x75, 0x79, 0xEA, 0xDA,
+    0xFF, 0xFB, 0xEA, 0xDA, 0xEA, 0xDA, 0xEA, 0xDA, 0x41, 0x6B, 0xEA, 0x67, 0xA0, 0x0D, 0x22, 0x21,
+    0x6C, 0xFD, 0x21, 0x65, 0xFD, 0x21, 0x73, 0xFD, 0x42, 0x72, 0x73, 0xEA, 0x09, 0xEA, 0x09, 0x21,
+    0x65, 0xF9, 0x21, 0x65, 0xFD, 0xA0, 0x0D, 0x43, 0x21, 0x72, 0xFD, 0x21, 0x65, 0xFD, 0x21, 0x65,
+    0xFD, 0x21, 0x70, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x65, 0xFD, 0x26, 0xC5, 0x72, 0x63, 0x65, 0x70,
+    0x7A, 0xB1, 0xBC, 0xCE, 0xDB, 0xE8, 0xFD, 0x41, 0x74, 0xEA, 0x2E, 0x21, 0x65, 0xFC, 0xA1, 0x0D,
+    0x72, 0x73, 0xFD, 0x21, 0x87, 0xFB, 0x41, 0x9B, 0xEB, 0x13, 0x21, 0xC5, 0xFC, 0x21, 0x6F, 0xFD,
+    0x21, 0x69, 0xFD, 0x22, 0xC4, 0x63, 0xF0, 0xFD, 0x21, 0x99, 0xFB, 0x41, 0x77, 0xEA, 0xF8, 0x21,
+    0x72, 0xFC, 0x41, 0x6E, 0xEC, 0xDA, 0x23, 0xC4, 0x65, 0x6F, 0xF2, 0xF9, 0xFC, 0xC1, 0x03, 0xA2,
+    0x6B, 0xE9, 0xA4, 0x41, 0x63, 0xEC, 0x06, 0x45, 0x82, 0x9B, 0xBA, 0xBC, 0x84, 0xFF, 0xF6, 0xEB,
+    0xFC, 0xEB, 0xFC, 0xEB, 0xFC, 0xFF, 0xFC, 0xC1, 0x07, 0xE2, 0x75, 0xEA, 0x39, 0xA0, 0x0E, 0x83,
+    0x21, 0x64, 0xFD, 0x21, 0xB3, 0xFD, 0x21, 0xC3, 0xFD, 0xA1, 0x07, 0xE2, 0x72, 0xFD, 0x44, 0xBA,
+    0x82, 0x9B, 0xBC, 0xF1, 0x2C, 0xFF, 0xE9, 0xFF, 0xFB, 0xF1, 0x52, 0x41, 0x77, 0xEA, 0x15, 0xA1,
+    0x05, 0xC2, 0x61, 0xFC, 0xC1, 0x02, 0x22, 0x6E, 0xF1, 0x71, 0x21, 0x7A, 0xFA, 0x22, 0x63, 0x74,
+    0xFD, 0xEE, 0x21, 0x99, 0xFB, 0x41, 0xBC, 0xE9, 0xFB, 0x21, 0xC5, 0xFC, 0x21, 0xB3, 0xFD, 0x41,
+    0x69, 0xF1, 0x49, 0x42, 0xC5, 0x70, 0xFF, 0xF2, 0xE9, 0xED, 0x41, 0xB3, 0xE9, 0xE6, 0x44, 0xC3,
+    0x61, 0x6F, 0x79, 0xFF, 0xFC, 0xE9, 0xE2, 0xE9, 0xE2, 0xE9, 0xE2, 0xA0, 0x03, 0x32, 0x44, 0xC5,
+    0x62, 0x63, 0x7A, 0xFF, 0xD7, 0xFF, 0xF0, 0xF1, 0x20, 0xFF, 0xFD, 0x41, 0x67, 0xE9, 0xC5, 0x21,
+    0x7A, 0xFC, 0x41, 0x65, 0xE9, 0xBE, 0xC9, 0x05, 0xC2, 0xC4, 0xC3, 0x77, 0x61, 0x65, 0x6F, 0x75,
+    0x79, 0x7A, 0xFF, 0xBC, 0xFF, 0xC6, 0xFF, 0xC9, 0xFF, 0xCD, 0xF1, 0x1C, 0xFF, 0xE8, 0xFF, 0xF9,
+    0xFF, 0xF5, 0xFF, 0xFC, 0x42, 0x6A, 0x72, 0xE9, 0x9F, 0xE9, 0x9C, 0x21, 0xB3, 0xF9, 0x41, 0x6A,
+    0xE9, 0x92, 0x43, 0x69, 0x6A, 0x72, 0xE9, 0x8E, 0xE9, 0x8E, 0xF0, 0xDC, 0xA3, 0x05, 0xC2, 0xC3,
+    0x61, 0x6F, 0xEF, 0xF2, 0xF6, 0x41, 0x70, 0xF2, 0x81, 0xA1, 0x01, 0x61, 0x6C, 0xFC, 0xA0, 0x0D,
+    0xD5, 0xA1, 0x01, 0x92, 0x73, 0xFD, 0x41, 0x68, 0xE7, 0xBD, 0xA1, 0x01, 0x92, 0x63, 0xFC, 0xC2,
+    0x01, 0x92, 0x63, 0x7A, 0xFF, 0xF7, 0xED, 0xDC, 0xC1, 0x01, 0x92, 0x6B, 0xE8, 0xD0, 0xD2, 0x01,
+    0x61, 0x6A, 0x6B, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6C, 0x6D, 0x70, 0x72, 0x73,
+    0x74, 0x77, 0x7A, 0xEB, 0xFF, 0xFF, 0xE3, 0xF0, 0xF6, 0xF0, 0xFA, 0xE8, 0xD5, 0xF1, 0x07, 0xF1,
+    0x17, 0xE8, 0xD5, 0xE8, 0xD5, 0xE8, 0xD5, 0xE8, 0xD5, 0xE8, 0xD5, 0xFF, 0xEC, 0xF1, 0x30, 0xFF,
+    0xF1, 0xFF, 0xFA, 0xE8, 0xD5, 0xE8, 0xD5, 0x42, 0x75, 0x6E, 0xEB, 0xC6, 0xED, 0xFA, 0x41, 0xB3,
+    0xF1, 0x3E, 0x41, 0x64, 0xF1, 0x37, 0x21, 0x61, 0xFC, 0x41, 0x6A, 0xF1, 0x36, 0x41, 0x61, 0xF1,
+    0x2F, 0x45, 0xC3, 0x69, 0x6F, 0x72, 0x73, 0xFF, 0xED, 0xFF, 0xF5, 0xFF, 0xF8, 0xFF, 0xFC, 0xF1,
+    0x52, 0x41, 0x63, 0xF1, 0x18, 0x21, 0x6F, 0xFC, 0x21, 0x68, 0xFD, 0x42, 0x6D, 0x64, 0xF1, 0x0E,
+    0xEA, 0xDC, 0x41, 0x67, 0xF1, 0x07, 0x21, 0x99, 0xFC, 0x41, 0x73, 0xF1, 0x00, 0x22, 0xC4, 0x65,
+    0xF9, 0xFC, 0x43, 0x69, 0x6E, 0x72, 0xF1, 0x1B, 0xF0, 0xF7, 0xFF, 0xFB, 0x41, 0x65, 0xF0, 0xF3,
+    0x21, 0x69, 0xFC, 0x41, 0x77, 0xF0, 0xE6, 0x21, 0x79, 0xFC, 0x41, 0x6B, 0xF0, 0xDF, 0x21, 0x61,
+    0xFC, 0x21, 0x69, 0xFD, 0x21, 0x6E, 0xFD, 0x42, 0x69, 0x74, 0xFF, 0xFD, 0xF0, 0xF0, 0xCA, 0x01,
+    0x61, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x70, 0x72, 0x73, 0x6C, 0xFF, 0xA3, 0xFF, 0xBA, 0xFF,
+    0xBD, 0xF0, 0xCB, 0xF0, 0xCB, 0xFF, 0xD4, 0xFF, 0xE2, 0xFF, 0xE9, 0xFF, 0xF9, 0xF0, 0xFC, 0x41,
+    0x61, 0xF0, 0xAA, 0x41, 0x6C, 0xF0, 0xA6, 0x21, 0x61, 0xFC, 0xA0, 0x04, 0x02, 0x21, 0x6E, 0xFD,
+    0xA1, 0x07, 0x73, 0x79, 0xFD, 0x21, 0x7A, 0xFB, 0x21, 0x63, 0xFD, 0x22, 0x74, 0x7A, 0xE4, 0xFD,
+    0xC5, 0x01, 0x61, 0x63, 0x64, 0x70, 0x72, 0x73, 0xF0, 0x8C, 0xF0, 0x8C, 0xFF, 0xDF, 0xFF, 0xE7,
+    0xFF, 0xFB, 0x41, 0x72, 0xEF, 0xB3, 0x41, 0x74, 0xEF, 0xAF, 0x43, 0x6B, 0x6D, 0x73, 0xFF, 0xF8,
+    0xEF, 0xAB, 0xFF, 0xFC, 0x41, 0x69, 0xEF, 0xA1, 0x43, 0x85, 0x87, 0x99, 0xEF, 0x9D, 0xEF, 0x9D,
+    0xEF, 0x9D, 0x41, 0x82, 0xEF, 0x93, 0x41, 0x6E, 0xEF, 0x8F, 0x48, 0xC4, 0xC5, 0x63, 0x65, 0x6C,
+    0x6D, 0x6F, 0x73, 0xFF, 0xEE, 0xFF, 0xF8, 0xEF, 0x8B, 0xFF, 0xFC, 0xEF, 0x8B, 0xEF, 0x8B, 0xEF,
+    0x8B, 0xEF, 0x8B, 0x21, 0x69, 0xE7, 0x21, 0x6E, 0xFD, 0x21, 0x65, 0xFD, 0x42, 0x6C, 0x6D, 0xFF,
+    0xFD, 0xEF, 0x69, 0x42, 0x65, 0x6F, 0xFF, 0xF9, 0xF0, 0x65, 0xA0, 0x0E, 0x23, 0x21, 0x72, 0xFD,
+    0xC5, 0x03, 0xA2, 0x61, 0x62, 0x65, 0x69, 0x77, 0xFF, 0xAA, 0xFF, 0xB4, 0xEF, 0x55, 0xFF, 0xF3,
+    0xFF, 0xFD, 0x41, 0x77, 0xE9, 0xD5, 0x21, 0xB3, 0xFC, 0xC1, 0x05, 0xC2, 0xC5, 0xF1, 0x2E, 0xDA,
+    0x07, 0x02, 0xC4, 0xC5, 0x6D, 0x6E, 0x72, 0x77, 0x61, 0x65, 0x69, 0x6F, 0x75, 0x79, 0x7A, 0xC3,
+    0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x70, 0x73, 0x74, 0xEE, 0xD1, 0xFD, 0xAF,
+    0xEF, 0x1A, 0xFD, 0xC0, 0xFE, 0x17, 0xFE, 0x4D, 0xFE, 0x5A, 0xFE, 0x7F, 0xFE, 0xB8, 0xFF, 0x2F,
+    0xFF, 0x71, 0xEA, 0x7E, 0xFF, 0xE1, 0xFF, 0xF7, 0xEC, 0xB2, 0xF0, 0x67, 0xFF, 0xFA, 0xEC, 0xB2,
+    0xEC, 0xB2, 0xEC, 0xB2, 0xEC, 0xB2, 0xEC, 0xB2, 0xEC, 0xB2, 0xEC, 0xB2, 0xF2, 0x8B, 0xEC, 0xB2,
+    0xC2, 0x02, 0x41, 0x64, 0x74, 0xE9, 0x39, 0xE9, 0x39, 0xC1, 0x02, 0x41, 0x72, 0xF2, 0x43, 0xA2,
+    0x01, 0xB2, 0x7A, 0x68, 0xF1, 0xFA, 0xA0, 0x0D, 0x94, 0x21, 0x73, 0xFD, 0x21, 0x6B, 0xFD, 0xC2,
+    0x01, 0xB2, 0x6C, 0x72, 0xE7, 0x71, 0xE7, 0x71, 0xC1, 0x01, 0xB2, 0x73, 0xE9, 0x4F, 0xC1, 0x03,
+    0xE2, 0x6B, 0xEA, 0xB7, 0xC2, 0x01, 0xB2, 0x70, 0x6B, 0xFF, 0xFA, 0xE7, 0x5C, 0xC3, 0x01, 0xB2,
+    0x63, 0x6F, 0x72, 0xE7, 0x4F, 0xED, 0x8D, 0xE9, 0x31, 0x41, 0xBC, 0xE9, 0xE4, 0x41, 0x99, 0xFE,
+    0xBD, 0xA0, 0x0E, 0xD2, 0xC4, 0x03, 0xE2, 0xC4, 0x77, 0x66, 0x6D, 0xFF, 0xF9, 0xFF, 0xFD, 0xEA,
+    0x91, 0xEA, 0x91, 0xC1, 0x04, 0x32, 0x75, 0xE9, 0xA8, 0x21, 0x7A, 0xFA, 0xC7, 0x01, 0xB2, 0xC5,
+    0x63, 0x66, 0x6E, 0x74, 0x6F, 0x7A, 0xFF, 0xDD, 0xE9, 0x0B, 0xE9, 0x0B, 0xE9, 0x0B, 0xFF, 0xE8,
+    0xFF, 0xFD, 0xE7, 0x24, 0xA0, 0x0E, 0x53, 0x41, 0x6D, 0xE8, 0xB2, 0x21, 0x6F, 0xFC, 0x4B, 0x64,
+    0x66, 0x67, 0x68, 0x69, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0xE8, 0xAB, 0xE8, 0xAB, 0xE8, 0xAB,
+    0xE8, 0xAB, 0xFF, 0xF6, 0xE8, 0xAB, 0xE8, 0xAB, 0xE8, 0xAB, 0xE8, 0xAB, 0xFF, 0xFD, 0xE8, 0xAB,
+    0xC4, 0x01, 0xB2, 0x74, 0x63, 0x6D, 0x7A, 0xFF, 0xDE, 0xE6, 0xDC, 0xE6, 0xE0, 0xE6, 0xE0, 0xA0,
+    0x0E, 0xF2, 0x41, 0x75, 0xE6, 0x41, 0xC3, 0x01, 0xB2, 0x6D, 0x61, 0x77, 0xFF, 0xF9, 0xFF, 0xFC,
+    0xE6, 0xCA, 0xA0, 0x0E, 0xB2, 0x42, 0xBA, 0x9B, 0xFF, 0xFD, 0xE7, 0x18, 0xC2, 0x02, 0x92, 0x68,
+    0x7A, 0xE7, 0x11, 0xE7, 0x11, 0x41, 0xBA, 0xF3, 0x20, 0x21, 0xC5, 0xFC, 0xCF, 0x09, 0x12, 0xC5,
+    0x6F, 0xC4, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x70, 0x73, 0x74, 0x7A, 0xFF, 0xE9,
+    0xED, 0x2D, 0xEF, 0xF2, 0xFF, 0xF0, 0xFF, 0xFD, 0xE7, 0x07, 0xE7, 0x07, 0xE7, 0x07, 0xE7, 0x07,
+    0xE7, 0x07, 0xE7, 0x07, 0xE7, 0x07, 0xE7, 0x07, 0xE7, 0x07, 0xEB, 0x0F, 0xC1, 0x01, 0x92, 0x72,
+    0xF0, 0x47, 0xC2, 0x01, 0x92, 0x7A, 0x68, 0xE5, 0xD6, 0xEA, 0xD9, 0xC1, 0x01, 0x92, 0x74, 0xEE,
+    0x23, 0xC2, 0x01, 0x92, 0x6D, 0x7A, 0xEA, 0xCA, 0xEA, 0xCA, 0xC2, 0x01, 0x92, 0x6D, 0x77, 0xE6,
+    0xB9, 0xEA, 0xC1, 0x51, 0x64, 0xC4, 0xC5, 0x62, 0x63, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70,
+    0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xA9, 0xED, 0xE1, 0xED, 0xE5, 0xFF, 0xD9, 0xFF, 0xDF, 0xFF,
+    0xE8, 0xE5, 0xC0, 0xE5, 0xC0, 0xE5, 0xC0, 0xE5, 0xC0, 0xE5, 0xC0, 0xE5, 0xC0, 0xEE, 0x24, 0xFF,
+    0xEE, 0xE5, 0xC0, 0xE5, 0xC0, 0xFF, 0xF7, 0x42, 0x6B, 0x77, 0xE6, 0x7C, 0xE6, 0x7C, 0x21, 0x65,
+    0xF9, 0x22, 0x61, 0x69, 0xC2, 0xFD, 0x53, 0xC5, 0x64, 0xC4, 0x62, 0x63, 0x65, 0x66, 0x67, 0x68,
+    0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6E, 0xFB, 0xB1, 0xFE, 0x29, 0xE7, 0xB0,
+    0xE7, 0xCA, 0xFE, 0x89, 0xFE, 0x96, 0xE5, 0x99, 0xE7, 0xEC, 0xE5, 0x99, 0xFE, 0x99, 0xFE, 0xA2,
+    0xFE, 0xAE, 0xFE, 0xB7, 0xFE, 0xE6, 0xFF, 0x2A, 0xE8, 0x30, 0xE5, 0x99, 0xFF, 0x40, 0xFF, 0xFB,
+    0x41, 0x75, 0xEA, 0xA1, 0x42, 0x6E, 0x7A, 0xFF, 0xFC, 0xEA, 0x9D, 0x41, 0x75, 0xE6, 0x42, 0x21,
+    0x6E, 0xFC, 0x21, 0x77, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x72, 0xFD, 0x43, 0x73, 0x77, 0x70, 0xEA,
+    0x86, 0xFF, 0xE9, 0xFF, 0xFD, 0x41, 0x6F, 0xFB, 0xC6, 0x21, 0x70, 0xFC, 0x21, 0x73, 0xFD, 0x21,
+    0x79, 0xFD, 0x21, 0x64, 0xFD, 0xC1, 0x01, 0x72, 0x6B, 0xE3, 0xDE, 0x44, 0x82, 0x9B, 0xBA, 0xBC,
+    0xFF, 0xFA, 0xE4, 0xFD, 0xE4, 0xFD, 0xE4, 0xFD, 0x43, 0x85, 0x99, 0x87, 0xEC, 0x11, 0xEC, 0x11,
+    0xE5, 0xE5, 0xA0, 0x0F, 0xB2, 0x21, 0x63, 0xFD, 0xA1, 0x04, 0x52, 0x79, 0xFD, 0x21, 0xBC, 0xFB,
+    0x21, 0xC5, 0xFD, 0xA1, 0x02, 0x72, 0x75, 0xFD, 0xA0, 0x0F, 0xD3, 0x44, 0xBA, 0x82, 0xBC, 0x9B,
+    0xFE, 0xA7, 0xFF, 0xF8, 0xFF, 0xFD, 0xE5, 0xC2, 0x41, 0x68, 0xE7, 0xD3, 0x21, 0x63, 0xFC, 0xA1,
+    0x02, 0x92, 0x75, 0xFD, 0xA0, 0x0F, 0x13, 0x21, 0x72, 0xFD, 0xA0, 0x10, 0x03, 0x21, 0x74, 0xFD,
+    0xA1, 0x0F, 0x13, 0x61, 0xFD, 0x21, 0x74, 0xFB, 0x21, 0x6F, 0xEC, 0xA3, 0x02, 0x92, 0x62, 0x73,
+    0x7A, 0xEC, 0xFA, 0xFD, 0x41, 0x74, 0xE7, 0xA7, 0x21, 0x61, 0xFC, 0x21, 0x6D, 0xFD, 0x41, 0x6B,
+    0xE7, 0x9D, 0x41, 0x6C, 0xE7, 0x99, 0xA0, 0x0F, 0x43, 0xA4, 0x02, 0x92, 0x61, 0x75, 0x79, 0x7A,
+    0xF2, 0xF5, 0xF9, 0xFD, 0xC1, 0x02, 0x92, 0x6D, 0xE7, 0x87, 0xA0, 0x10, 0x32, 0x21, 0x75, 0xFD,
+    0x21, 0x6B, 0xFD, 0xA1, 0x01, 0x71, 0x73, 0xFD, 0x41, 0x6D, 0xFF, 0x7A, 0x41, 0x6A, 0xFF, 0x76,
+    0x42, 0x72, 0x6F, 0xFF, 0x88, 0xFF, 0xFC, 0xC6, 0x01, 0x72, 0x61, 0x67, 0x69, 0x6A, 0x6C, 0x77,
+    0xFF, 0x6B, 0xFF, 0x81, 0xFF, 0xF1, 0xFF, 0x6B, 0xFF, 0x6B, 0xFF, 0xF9, 0x41, 0x6E, 0xE5, 0x37,
+    0x21, 0x6F, 0xFC, 0x41, 0x63, 0xE5, 0x30, 0x41, 0x70, 0xEF, 0xF5, 0x23, 0x67, 0x6B, 0x6C, 0xF5,
+    0xF8, 0xFC, 0x41, 0x7A, 0xE5, 0x21, 0x41, 0x72, 0xE5, 0x1D, 0x21, 0x65, 0xFC, 0x22, 0x67, 0x6D,
+    0xF5, 0xFD, 0xA0, 0x10, 0x73, 0x21, 0x77, 0xFD, 0x21, 0x99, 0xFD, 0x21, 0xC4, 0xFD, 0xC2, 0x02,
+    0x92, 0x69, 0x7A, 0xFF, 0xFD, 0xE4, 0xFF, 0xD9, 0x09, 0x12, 0xC4, 0xC5, 0x6D, 0x6F, 0x72, 0x75,
+    0x79, 0x7A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6E, 0x70,
+    0x73, 0x74, 0x77, 0xFF, 0x11, 0xFF, 0x34, 0xFF, 0x48, 0xFF, 0x64, 0xFF, 0x82, 0xFF, 0x8D, 0xFF,
+    0x9C, 0xFF, 0xB0, 0xFF, 0xD4, 0xE4, 0xFC, 0xED, 0xF8, 0xEE, 0x08, 0xFF, 0xE6, 0xE4, 0xFC, 0xF0,
+    0xB1, 0xE4, 0xFC, 0xE4, 0xFC, 0xE4, 0xFC, 0xE4, 0xFC, 0xE4, 0xFC, 0xE4, 0xFC, 0xE4, 0xFC, 0xFF,
+    0xF7, 0xE4, 0xFC, 0xE4, 0xFC, 0xC1, 0x00, 0x71, 0x7A, 0xE2, 0x8E, 0xA1, 0x01, 0x92, 0x72, 0xFA,
+    0xC1, 0x00, 0x71, 0x72, 0xF0, 0x54, 0xA0, 0x10, 0x52, 0x21, 0x65, 0xFD, 0xC3, 0x10, 0x32, 0x69,
+    0x61, 0x77, 0xFF, 0xFD, 0xE7, 0xD2, 0xE7, 0xD2, 0x21, 0x77, 0xF4, 0xC3, 0x01, 0x92, 0x68, 0x69,
+    0x7A, 0xFF, 0xE5, 0xFF, 0xFD, 0xE8, 0x90, 0xA0, 0x0F, 0x74, 0x21, 0x73, 0xFD, 0x21, 0x6B, 0xFD,
+    0xC2, 0x01, 0x92, 0x6C, 0x72, 0xE8, 0x7B, 0xE8, 0x7B, 0xC1, 0x01, 0x92, 0x6B, 0xE8, 0x72, 0xC3,
+    0x01, 0x92, 0x63, 0x6D, 0x7A, 0xFA, 0x87, 0xE8, 0x6C, 0xE8, 0x6C, 0xC1, 0x00, 0x71, 0x61, 0xE3,
+    0x90, 0xC2, 0x01, 0x92, 0x6B, 0x72, 0xE8, 0x5A, 0xFF, 0xFA, 0x54, 0xC5, 0x64, 0xC4, 0x62, 0x63,
+    0x65, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x75, 0x77, 0x7A, 0xFE,
+    0x51, 0xFF, 0x4D, 0xEB, 0x7A, 0xFF, 0xA1, 0xFF, 0xC1, 0xFF, 0xD3, 0xE3, 0x59, 0xFD, 0x72, 0xE3,
+    0x59, 0xFF, 0xD6, 0xE3, 0x59, 0xFF, 0xDF, 0xE3, 0x59, 0xFA, 0x70, 0xEB, 0xB4, 0xFF, 0xE5, 0xFF,
+    0xF7, 0xE3, 0x59, 0xE3, 0x59, 0xE3, 0x59, 0xC1, 0x01, 0x92, 0x72, 0xE8, 0x14, 0x52, 0xC4, 0xC5,
+    0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6F,
+    0xEB, 0x37, 0xEB, 0x3B, 0xFF, 0xFA, 0xEB, 0x48, 0xEB, 0x58, 0xE3, 0x16, 0xFD, 0x2F, 0xE3, 0x16,
+    0xE3, 0x16, 0xE3, 0x16, 0xFF, 0x9C, 0xFA, 0x2D, 0xEB, 0x71, 0xFA, 0x32, 0xFF, 0x9C, 0xE3, 0x16,
+    0xE3, 0x16, 0xEE, 0x5F, 0xC2, 0x00, 0x61, 0x65, 0x79, 0xFF, 0x86, 0xFF, 0xC9, 0xC3, 0x00, 0x51,
+    0x61, 0x65, 0x7A, 0xFD, 0xAE, 0xFD, 0xC5, 0xFF, 0xF7, 0xD9, 0x01, 0xF1, 0xC4, 0xC5, 0xC3, 0x62,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73,
+    0x74, 0x76, 0x77, 0x78, 0x7A, 0xE3, 0x30, 0xF7, 0xEE, 0xF8, 0x4F, 0xE3, 0x44, 0xF8, 0x52, 0xE3,
+    0x44, 0xF8, 0xB1, 0xE3, 0x44, 0xE3, 0x44, 0xE3, 0x44, 0xF8, 0xED, 0xE3, 0x44, 0xE3, 0x44, 0xE3,
+    0x44, 0xE3, 0x44, 0xE3, 0x44, 0xFD, 0x4D, 0xE3, 0x44, 0xFF, 0xF4, 0xE3, 0x44, 0xE3, 0x44, 0xE3,
+    0x44, 0xE3, 0x44, 0xE3, 0x44, 0xE3, 0x44, 0x41, 0x73, 0xFE, 0x03, 0x21, 0x6E, 0xFC, 0x21, 0x61,
+    0xFD, 0x21, 0x72, 0xFD, 0x21, 0x74, 0xFD, 0x41, 0x69, 0xF8, 0x07, 0x41, 0x65, 0xF8, 0x03, 0x21,
+    0x69, 0xFC, 0xA2, 0x02, 0x22, 0x67, 0x6E, 0xF5, 0xFD, 0xA0, 0x10, 0xA4, 0x21, 0x87, 0xFD, 0x24,
+    0x82, 0x9B, 0xBA, 0xBC, 0xFA, 0xFA, 0xFA, 0xFA, 0xA0, 0x10, 0xE4, 0xC2, 0x10, 0xE4, 0x68, 0x7A,
+    0xE7, 0x40, 0xE7, 0x40, 0xC2, 0x10, 0xE4, 0xC5, 0x7A, 0xEA, 0x7A, 0xE7, 0x37, 0xA0, 0x11, 0x24,
+    0xA1, 0x10, 0xE4, 0x7A, 0xFD, 0xC1, 0x10, 0xE4, 0x6F, 0xF7, 0xC9, 0xC1, 0x10, 0xE4, 0x63, 0xF9,
+    0x3B, 0xC2, 0x10, 0xE4, 0xC5, 0x7A, 0xEA, 0x79, 0xE7, 0x1A, 0xC2, 0x10, 0xE4, 0x63, 0x7A, 0xF9,
+    0x2C, 0xE7, 0x11, 0x21, 0x74, 0xDA, 0xD3, 0x02, 0x22, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67,
+    0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6A, 0x6E, 0xFF, 0xB6, 0xFF, 0xB9,
+    0xFF, 0xC2, 0xFF, 0xC5, 0xFF, 0xCE, 0xFF, 0xC2, 0xFF, 0xDA, 0xFF, 0xC2, 0xFF, 0xC2, 0xFF, 0xC2,
+    0xFF, 0xDF, 0xFF, 0xE5, 0xFF, 0xEB, 0xFF, 0xF4, 0xFF, 0xC2, 0xFF, 0xC2, 0xFF, 0xC2, 0xE2, 0x8A,
+    0xFF, 0xFD, 0x41, 0x9B, 0xE1, 0x9F, 0x41, 0x72, 0xED, 0x16, 0xC1, 0x02, 0x41, 0x72, 0xE1, 0x97,
+    0xCC, 0x02, 0x02, 0x61, 0x65, 0x75, 0xC5, 0x62, 0x64, 0x69, 0x6D, 0x6F, 0x70, 0x74, 0x77, 0xFF,
+    0x62, 0xFF, 0xB6, 0xE2, 0x40, 0xFF, 0xF2, 0xFF, 0xF6, 0xE2, 0x50, 0xE2, 0x50, 0xE2, 0x50, 0xE2,
+    0x50, 0xE4, 0xBC, 0xFF, 0xFA, 0xE2, 0x50, 0x21, 0x7A, 0xD9, 0xD7, 0x01, 0xF1, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74,
+    0x76, 0x77, 0x78, 0x7A, 0xE1, 0xFF, 0xE2, 0x03, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xFF, 0x2A,
+    0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13,
+    0xFF, 0xFD, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13, 0xE2, 0x13,
+    0xE2, 0x13, 0x41, 0x7A, 0xFC, 0xD8, 0x21, 0x6F, 0xFC, 0x45, 0x63, 0x6B, 0x70, 0x77, 0x72, 0xE1,
+    0x69, 0xE1, 0x4A, 0xE1, 0x4A, 0xE1, 0x4A, 0xFF, 0xFD, 0x21, 0x6F, 0xF0, 0x21, 0x6D, 0xFD, 0xC1,
+    0x03, 0x32, 0x73, 0xF7, 0x2C, 0x21, 0x6D, 0xFA, 0x42, 0x65, 0x6D, 0xFF, 0xFD, 0xF7, 0x38, 0x21,
+    0x64, 0xF9, 0x21, 0x65, 0xFD, 0xA0, 0x0E, 0x92, 0x21, 0x65, 0xFD, 0x21, 0xBC, 0xFD, 0x21, 0xC5,
+    0xFD, 0x21, 0x64, 0xFD, 0x21, 0x85, 0xFD, 0xC3, 0x00, 0x51, 0xC4, 0x6C, 0x72, 0xFF, 0xFD, 0xDF,
+    0x53, 0xDF, 0x53, 0x41, 0x62, 0xE7, 0xCB, 0xA0, 0x0D, 0x72, 0x21, 0x82, 0xFD, 0x21, 0xC5, 0xFD,
+    0x21, 0xB3, 0xFD, 0xC3, 0x06, 0x12, 0x7A, 0xC5, 0x64, 0xE8, 0x6A, 0xEA, 0xC4, 0xE8, 0x06, 0xC3,
+    0x05, 0xC2, 0x6E, 0x74, 0x7A, 0xED, 0x69, 0xED, 0x69, 0xE0, 0xB2, 0x51, 0x64, 0xC4, 0xC5, 0x62,
+    0x63, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xE8, 0xED,
+    0x59, 0xEA, 0x91, 0xE6, 0x36, 0xE9, 0xEB, 0xE6, 0x36, 0xE6, 0x36, 0xE6, 0x36, 0xE6, 0x36, 0xE6,
+    0x36, 0xE6, 0x36, 0xE6, 0x36, 0xFF, 0xF4, 0xE9, 0xFD, 0xE6, 0x36, 0xE6, 0x36, 0xE6, 0x36, 0xA2,
+    0x00, 0x51, 0xC3, 0x6F, 0xB1, 0xCC, 0xC5, 0x03, 0x32, 0x61, 0x65, 0x69, 0x6F, 0x75, 0xDF, 0x6D,
+    0xDF, 0x6D, 0xDF, 0x6D, 0xDF, 0x6D, 0xDF, 0x6D, 0x21, 0x6F, 0xEE, 0x21, 0x65, 0xFD, 0x21, 0x72,
+    0xFD, 0xA1, 0x00, 0x51, 0x65, 0xFD, 0x41, 0x74, 0xE0, 0xFD, 0xC2, 0x02, 0x02, 0x69, 0x6F, 0xF7,
+    0x38, 0xFF, 0xFC, 0xA0, 0x11, 0x63, 0xA1, 0x04, 0x52, 0x72, 0xFD, 0x21, 0x74, 0xFB, 0x41, 0x6F,
+    0xE3, 0x6D, 0xA0, 0x11, 0x92, 0x21, 0x62, 0xFD, 0xA0, 0x11, 0xB2, 0x21, 0x74, 0xFD, 0x21, 0x75,
+    0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x72, 0xFD, 0x21, 0x64, 0xFD, 0xC5, 0x04, 0x32, 0x61, 0x69, 0x7A,
+    0x65, 0x6F, 0xFF, 0xE1, 0xFF, 0xE4, 0xFF, 0xEB, 0xE5, 0x41, 0xFF, 0xFD, 0x21, 0x72, 0xEE, 0x21,
+    0x65, 0xFD, 0x22, 0x62, 0x70, 0xB8, 0xFD, 0xA0, 0x11, 0xD2, 0x21, 0x74, 0xFD, 0x21, 0x65, 0xFD,
+    0xA1, 0x11, 0xF3, 0x73, 0xFD, 0x21, 0x87, 0xFB, 0x41, 0x9B, 0xEE, 0x63, 0x21, 0xC5, 0xFC, 0x21,
+    0x6F, 0xFD, 0x21, 0x69, 0xFD, 0x22, 0xC4, 0x63, 0xF0, 0xFD, 0x21, 0x9B, 0xFB, 0x42, 0xC5, 0x73,
+    0xFF, 0xFD, 0xF4, 0x53, 0xA1, 0x00, 0x51, 0x65, 0xF9, 0xD9, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74,
+    0x75, 0x76, 0x77, 0x78, 0x7A, 0xE0, 0x60, 0xE0, 0x64, 0xFE, 0xC3, 0xE0, 0x74, 0xF5, 0x82, 0xE0,
+    0x74, 0xE0, 0x74, 0xE0, 0x74, 0xE0, 0x74, 0xFE, 0xD9, 0xE0, 0x74, 0xFE, 0xEE, 0xE0, 0x74, 0xE0,
+    0x74, 0xE0, 0x74, 0xFE, 0xFA, 0xFF, 0x56, 0xE0, 0x74, 0xE0, 0x74, 0xFF, 0x78, 0xFF, 0xC9, 0xE0,
+    0x74, 0xE0, 0x74, 0xE0, 0x74, 0xFF, 0xFB, 0xA0, 0x12, 0x22, 0x21, 0x6E, 0xFD, 0x21, 0x61, 0xFD,
+    0x21, 0x7A, 0xFD, 0x42, 0x6F, 0x72, 0xE4, 0x3A, 0xFF, 0xFD, 0x41, 0x61, 0xE9, 0x1C, 0x41, 0x7A,
+    0xE2, 0x9D, 0x21, 0x63, 0xFC, 0xC2, 0x04, 0x32, 0xC4, 0x65, 0xE2, 0x99, 0xFF, 0xFD, 0x21, 0x6A,
+    0xF7, 0x21, 0xB3, 0xFD, 0xC1, 0x04, 0x52, 0x75, 0xFA, 0x8E, 0x41, 0x65, 0xE2, 0x81, 0xC6, 0x04,
+    0x32, 0x65, 0x69, 0x79, 0x7A, 0x61, 0x6F, 0xFF, 0xF6, 0xFF, 0xFC, 0xE2, 0x7D, 0xE6, 0x8B, 0xE4,
+    0x6D, 0xE4, 0x6D, 0x21, 0x73, 0xEB, 0x21, 0x6E, 0xFD, 0x41, 0x68, 0xF5, 0x55, 0x21, 0x63, 0xFC,
+    0xA1, 0x00, 0x61, 0x65, 0xFD, 0xA3, 0x00, 0x51, 0xC3, 0x61, 0x7A, 0xCC, 0xF1, 0xFB, 0xA0, 0x12,
+    0x42, 0x21, 0x82, 0xFD, 0xA1, 0x02, 0xB1, 0xC5, 0xFD, 0xC3, 0x10, 0x32, 0x61, 0x65, 0x7A, 0xFB,
+    0x8D, 0xFB, 0x8D, 0xFF, 0xFB, 0x21, 0x63, 0xF4, 0x21, 0x85, 0xFD, 0x21, 0xC4, 0xFD, 0x21, 0x69,
+    0xFD, 0x21, 0x73, 0xFD, 0xD9, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+    0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x79, 0x7A,
+    0xDF, 0x85, 0xDF, 0x89, 0xFF, 0x7F, 0xDF, 0x99, 0xF4, 0xA7, 0xDF, 0x99, 0xE3, 0xBC, 0xDF, 0x99,
+    0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xFF, 0x86,
+    0xDF, 0x99, 0xFF, 0xD1, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xDF, 0x99, 0xFF, 0xFD,
+    0xDF, 0x99, 0xA0, 0x04, 0xC2, 0x44, 0x9B, 0x82, 0xBA, 0xBC, 0xF0, 0x76, 0xFF, 0xFD, 0xFF, 0xFD,
+    0xFF, 0xFD, 0xC1, 0x0C, 0xB2, 0x77, 0xDE, 0x8F, 0x21, 0x7A, 0xFA, 0xC2, 0x0B, 0xE2, 0x65, 0x72,
+    0xFF, 0xFD, 0xF0, 0x60, 0xC2, 0x0B, 0xE2, 0x68, 0x7A, 0xF0, 0x57, 0xF0, 0x57, 0xA0, 0x06, 0x72,
+    0x42, 0xBA, 0xBC, 0xDF, 0x30, 0xDF, 0x30, 0xC3, 0x0B, 0xE2, 0x6B, 0xC5, 0x7A, 0xFF, 0xF6, 0xFF,
+    0xF9, 0xF0, 0x44, 0xA1, 0x0B, 0xE2, 0x6E, 0xEA, 0x21, 0x6A, 0xE5, 0x21, 0x65, 0xFD, 0xC2, 0x0B,
+    0xE2, 0x6C, 0x72, 0xFF, 0xFD, 0xF0, 0x2D, 0xA2, 0x0B, 0xE2, 0x73, 0x74, 0xD6, 0xD6, 0x21, 0x72,
+    0xCF, 0xC2, 0x0B, 0xE2, 0x62, 0x6B, 0xFF, 0xFD, 0xF0, 0x1A, 0xA2, 0x0B, 0xE2, 0x63, 0x64, 0xC3,
+    0xC3, 0xA0, 0x12, 0x63, 0x21, 0x73, 0xFD, 0xC3, 0x06, 0x12, 0x61, 0xC5, 0x64, 0xE7, 0xDF, 0xE8,
+    0x30, 0xE5, 0x72, 0x51, 0x64, 0xC4, 0xC5, 0x62, 0x63, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x70,
+    0x72, 0x73, 0x74, 0x77, 0x7A, 0xFF, 0xF4, 0xEA, 0xD1, 0xE8, 0x09, 0xE3, 0xAE, 0xE7, 0x63, 0xE3,
+    0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xE7, 0x75, 0xE7,
+    0x75, 0xE3, 0xAE, 0xE3, 0xAE, 0xE3, 0xAE, 0xC3, 0x0B, 0xE2, 0x70, 0x63, 0x6F, 0xFF, 0xBD, 0xF2,
+    0xBB, 0xFF, 0xCC, 0x41, 0xBC, 0xDE, 0x9D, 0x41, 0x7A, 0xF2, 0x59, 0xC4, 0x0B, 0xE2, 0x73, 0xC5,
+    0x6F, 0x7A, 0xFF, 0x62, 0xFF, 0xF8, 0xFF, 0xFC, 0xEF, 0xB0, 0xA0, 0x12, 0x92, 0xA0, 0x05, 0x91,
+    0x23, 0x6E, 0x63, 0x6B, 0xFA, 0xFD, 0xFD, 0xC3, 0x0B, 0xE2, 0x74, 0x63, 0x7A, 0xFF, 0xF9, 0xF2,
+    0x8B, 0xEF, 0x94, 0xC2, 0x0B, 0xE2, 0x6B, 0x72, 0xEF, 0x88, 0xEF, 0x88, 0x41, 0x65, 0xFF, 0x31,
+    0x41, 0x77, 0xE3, 0x31, 0xA2, 0x0B, 0xE2, 0x62, 0x65, 0xF8, 0xFC, 0x52, 0xC4, 0xC5, 0x62, 0x63,
+    0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xEF, 0x73,
+    0xFE, 0xFA, 0xFF, 0x10, 0xFF, 0x19, 0xFF, 0x2C, 0xFF, 0x38, 0xF2, 0x0C, 0xF2, 0x0C, 0xFF, 0x43,
+    0xFF, 0x4C, 0xFF, 0x56, 0xFF, 0x5F, 0xFF, 0xAC, 0xFF, 0xC0, 0xFF, 0xDC, 0xFF, 0xE8, 0xF2, 0x0C,
+    0xFF, 0xF9, 0xC1, 0x03, 0xA2, 0x6E, 0xDF, 0xC7, 0x43, 0x82, 0x9B, 0xBC, 0xFF, 0xFA, 0xDF, 0xBB,
+    0xDF, 0xBB, 0xC1, 0x01, 0xB2, 0x77, 0xDF, 0xF5, 0xC1, 0x01, 0xB2, 0x6B, 0xDE, 0x08, 0xC2, 0x01,
+    0xB2, 0x64, 0x74, 0xDF, 0xE9, 0xDF, 0xE9, 0xC1, 0x01, 0xB2, 0x63, 0xDD, 0xF5, 0xC6, 0x01, 0xB2,
+    0x62, 0x64, 0x6E, 0x73, 0x74, 0x7A, 0xDF, 0xDA, 0xDF, 0xDA, 0xDF, 0xDA, 0xDF, 0xDA, 0xDF, 0xDA,
+    0xDD, 0xF3, 0xA0, 0x12, 0xB3, 0x21, 0x68, 0xFD, 0x21, 0x63, 0xFD, 0xC3, 0x01, 0xB2, 0x70, 0x74,
+    0x7A, 0xE6, 0x1C, 0xFF, 0xFD, 0xDD, 0xD5, 0xA0, 0x12, 0xE2, 0x21, 0x7A, 0xFD, 0x21, 0x72, 0xFD,
+    0x21, 0x74, 0xFD, 0x21, 0x85, 0xFD, 0x21, 0xC4, 0xFD, 0xA1, 0x01, 0xB2, 0x6E, 0xFD, 0x41, 0x72,
+    0xDF, 0x99, 0x41, 0x82, 0xDF, 0x95, 0x21, 0xC5, 0xFC, 0xA2, 0x01, 0xB2, 0x62, 0x67, 0xF5, 0xFD,
+    0x52, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73,
+    0x74, 0x77, 0x7A, 0xDF, 0x46, 0xFF, 0x88, 0xDD, 0x2F, 0xDF, 0x65, 0xDF, 0x75, 0xDD, 0x2F, 0xDD,
+    0x2F, 0xDD, 0x2F, 0xDF, 0x8A, 0xFF, 0x92, 0xFF, 0x98, 0xFF, 0x9E, 0xFF, 0xA7, 0xFF, 0xAD, 0xFF,
+    0xCB, 0xFF, 0x98, 0xFF, 0xE9, 0xFF, 0xF9, 0x43, 0xC5, 0x64, 0x6B, 0xDD, 0xC9, 0xDD, 0xCC, 0xDD,
+    0xCC, 0x41, 0x73, 0xF1, 0x96, 0x22, 0x6F, 0x75, 0xF2, 0xFC, 0x21, 0x6C, 0xFB, 0x41, 0x6D, 0xDD,
+    0xD0, 0x21, 0x6F, 0xFC, 0x21, 0x7A, 0xFD, 0x21, 0x63, 0xFD, 0x22, 0x65, 0x6C, 0xF0, 0xFD, 0x41,
+    0x62, 0xDD, 0xC4, 0x21, 0x65, 0xFC, 0xA1, 0x00, 0x51, 0x69, 0xFD, 0x41, 0x77, 0xDC, 0xCA, 0x21,
+    0x62, 0xFC, 0xC4, 0x13, 0x02, 0x69, 0x6F, 0x75, 0x77, 0xE0, 0xCC, 0xFF, 0xFD, 0xE0, 0xCC, 0xE0,
+    0xCC, 0x21, 0x82, 0xF1, 0x21, 0xC5, 0xFD, 0x21, 0xB3, 0xFD, 0x21, 0xC3, 0xFD, 0xC2, 0x0D, 0x72,
+    0x6F, 0x77, 0xDB, 0x56, 0xDB, 0x56, 0x21, 0x68, 0xF7, 0x21, 0x63, 0xFD, 0x21, 0x65, 0xFD, 0xA2,
+    0x00, 0x51, 0x70, 0x7A, 0xEB, 0xFD, 0x41, 0x7A, 0xDE, 0xA3, 0xA1, 0x03, 0xA2, 0x73, 0xFC, 0x44,
+    0x82, 0x9B, 0xBA, 0xBC, 0xDE, 0x94, 0xDE, 0x94, 0xDE, 0x94, 0xFF, 0xFB, 0x41, 0x61, 0xDE, 0x8D,
+    0xA1, 0x02, 0x41, 0x68, 0xFC, 0xC2, 0x01, 0xB2, 0x7A, 0x68, 0xFF, 0xFB, 0xDC, 0xDB, 0xC3, 0x01,
+    0xB2, 0xC5, 0x72, 0x7A, 0xDE, 0xA0, 0xDC, 0xD2, 0xDC, 0xD2, 0xC2, 0x01, 0xB2, 0x6C, 0x72, 0xDC,
+    0xC6, 0xDE, 0x80, 0xA0, 0x13, 0x23, 0x21, 0x72, 0xFD, 0x21, 0x64, 0xFD, 0xC2, 0x01, 0xB2, 0xC5,
+    0x7A, 0xDE, 0xBE, 0xDC, 0xB4, 0xC3, 0x01, 0xB2, 0x63, 0x6B, 0x72, 0xDC, 0xA7, 0xDC, 0xAB, 0xDC,
+    0xAB, 0xA0, 0x06, 0x13, 0x21, 0x73, 0xFD, 0x21, 0x6B, 0xFD, 0x41, 0x6F, 0xED, 0xB1, 0x21, 0x7A,
+    0xFC, 0x54, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6F, 0x70, 0x72,
+    0x73, 0x74, 0x77, 0x7A, 0x65, 0x69, 0xDE, 0x35, 0xFF, 0x9E, 0xDE, 0x4F, 0xFF, 0xB4, 0xFF, 0xBD,
+    0xDC, 0x1E, 0xDE, 0x71, 0xDC, 0x1E, 0xFF, 0xC9, 0xDC, 0x1E, 0xFE, 0x87, 0xFF, 0xD8, 0xDE, 0x90,
+    0xFF, 0xDB, 0xDE, 0xA9, 0xFF, 0xE4, 0xDC, 0x1E, 0xDC, 0x1E, 0xFF, 0xF6, 0xFF, 0xFD, 0xD9, 0x01,
+    0xF1, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x6F, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x79, 0x7A, 0xDC, 0x2B, 0xDC, 0x2F, 0xDC, 0x3F,
+    0xDC, 0x3F, 0xDC, 0x3F, 0xFE, 0xB2, 0xDC, 0x3F, 0xDC, 0x3F, 0xDC, 0x3F, 0xFF, 0x0C, 0xDC, 0x3F,
+    0xDC, 0x3F, 0xDC, 0x3F, 0xDC, 0x3F, 0xFF, 0x18, 0xE2, 0x93, 0xDC, 0x3F, 0xDC, 0x3F, 0xFF, 0x51,
+    0xDC, 0x3F, 0xDC, 0x3F, 0xDC, 0x3F, 0xDC, 0x3F, 0xFF, 0xC3, 0xDC, 0x3F, 0xC1, 0x00, 0x61, 0x6F,
+    0xE2, 0x3E, 0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFF, 0xFA, 0xD9, 0xB8, 0xD9, 0xB8, 0xD9, 0xB8,
+    0xD9, 0xB8, 0xA0, 0x13, 0x51, 0xA1, 0x13, 0x62, 0x75, 0xFD, 0x21, 0x87, 0xFB, 0x21, 0xC4, 0xFD,
+    0x21, 0x9B, 0xFD, 0x21, 0xC5, 0xFD, 0x41, 0x6F, 0xE7, 0x58, 0x21, 0x70, 0xFC, 0x21, 0x73, 0xFD,
+    0xC5, 0x01, 0xB2, 0xC5, 0x6F, 0x72, 0x79, 0x7A, 0xDD, 0x9E, 0xFF, 0xF3, 0xDB, 0xD0, 0xFF, 0xFD,
+    0xDB, 0xD0, 0xC3, 0x01, 0xB2, 0x74, 0x6C, 0x72, 0xDD, 0xA5, 0xDB, 0xBE, 0xDD, 0x78, 0xC3, 0x01,
+    0xB2, 0x67, 0x6B, 0x74, 0xDD, 0x99, 0xDD, 0x99, 0xDD, 0x99, 0x42, 0x72, 0x73, 0xFE, 0xE9, 0xFE,
+    0xE9, 0x21, 0x62, 0xF9, 0x41, 0x68, 0xDD, 0x83, 0xC3, 0x01, 0xB2, 0x63, 0xC5, 0x7A, 0xFF, 0xFC,
+    0xDD, 0xA2, 0xDB, 0x98, 0x41, 0x6F, 0xDA, 0xAF, 0xA1, 0x01, 0xB2, 0x74, 0xFC, 0xA0, 0x08, 0x41,
+    0x21, 0x63, 0xFD, 0xA1, 0x0C, 0xB2, 0x69, 0xFD, 0x42, 0x6E, 0x7A, 0xFF, 0xFB, 0xFE, 0xE2, 0x41,
+    0x64, 0xDB, 0xD4, 0x21, 0x65, 0xFC, 0x21, 0x69, 0xFD, 0x55, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66,
+    0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x75, 0x77, 0x7A, 0x69, 0x6E, 0xDD,
+    0x0D, 0xE6, 0x77, 0xDD, 0x27, 0xDD, 0x2C, 0xFF, 0x97, 0xDA, 0xF6, 0xDD, 0x49, 0xDA, 0xF6, 0xFF,
+    0xA9, 0xFF, 0xB5, 0xDD, 0x63, 0xFF, 0xC8, 0xDA, 0xF6, 0xFF, 0xCF, 0xDD, 0x81, 0xDD, 0x8D, 0xFF,
+    0xDF, 0xDA, 0xF6, 0xDA, 0xF6, 0xFF, 0xEF, 0xFF, 0xFD, 0xA0, 0x13, 0x82, 0x21, 0x75, 0xFD, 0x21,
+    0x77, 0xFD, 0x22, 0x6C, 0x72, 0xF7, 0xF7, 0xA3, 0x0C, 0xB2, 0x61, 0x65, 0x79, 0xF8, 0xFB, 0xF2,
+    0x21, 0x7A, 0xF7, 0x41, 0x74, 0xEE, 0xCD, 0x21, 0x6E, 0xFC, 0x41, 0x64, 0xEE, 0xC6, 0x21, 0x65,
+    0xFC, 0x41, 0x6C, 0xEE, 0xBF, 0x21, 0x61, 0xFC, 0x23, 0x6F, 0x72, 0x77, 0xEF, 0xF6, 0xFD, 0x21,
+    0x6B, 0xF9, 0x21, 0x73, 0xFD, 0xA2, 0x00, 0x51, 0x65, 0x79, 0xDB, 0xFD, 0xC1, 0x01, 0xB2, 0x6C,
+    0xDA, 0xE4, 0xC3, 0x01, 0xB2, 0x6B, 0xC5, 0x7A, 0xDC, 0xC5, 0xDC, 0xE8, 0xDA, 0xDE, 0xC3, 0x01,
+    0xB2, 0x63, 0x6D, 0x7A, 0xDA, 0xCE, 0xFF, 0x4F, 0xDA, 0xD2, 0xA0, 0x13, 0xA5, 0x21, 0x73, 0xFD,
+    0x42, 0x65, 0x70, 0xFF, 0xFD, 0xDC, 0xA7, 0x21, 0x6C, 0xF3, 0x21, 0x65, 0xFD, 0x22, 0x6D, 0x73,
+    0xF3, 0xFD, 0x41, 0x70, 0xDC, 0x95, 0x21, 0x61, 0xFC, 0xC3, 0x01, 0xB2, 0x6B, 0x65, 0x68, 0xDC,
+    0x4A, 0xFF, 0xF4, 0xFF, 0xFD, 0x51, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C,
+    0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xDC, 0x41, 0xE5, 0xAB, 0xDA, 0x2A, 0xDC, 0x60, 0xDC,
+    0x70, 0xDA, 0x2A, 0xDA, 0x2A, 0xDA, 0x2A, 0xFF, 0xB7, 0xDA, 0x2A, 0xDA, 0x2A, 0xFC, 0xA2, 0xFF,
+    0xBD, 0xFF, 0xC9, 0xFF, 0xF4, 0xDA, 0x2A, 0xDA, 0x2A, 0x41, 0x6B, 0xEE, 0x58, 0x21, 0x6F, 0xFC,
+    0x21, 0x6E, 0xFD, 0x21, 0x6D, 0xFD, 0xC1, 0x13, 0xF2, 0x77, 0xE7, 0xE4, 0x21, 0x68, 0xFA, 0x21,
+    0x63, 0xFD, 0x21, 0x79, 0xFD, 0x21, 0x77, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x72, 0xFD, 0xA1, 0x00,
+    0x51, 0x61, 0xFD, 0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xD9, 0xA5, 0xD9, 0xA5, 0xD9, 0xA5, 0xD9,
+    0xA5, 0xD9, 0xA5, 0xA0, 0x14, 0x12, 0x42, 0xBA, 0xBC, 0xFF, 0xFD, 0xD8, 0x6D, 0xC2, 0x01, 0x92,
+    0xC5, 0x7A, 0xFF, 0xF9, 0xDE, 0x8E, 0xC1, 0x01, 0x92, 0x63, 0xE1, 0xD8, 0x52, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0xE1,
+    0xA8, 0xFF, 0xD7, 0xD9, 0x87, 0xE1, 0xB9, 0xFF, 0xF1, 0xD9, 0x87, 0xD9, 0x87, 0xD9, 0x87, 0xD9,
+    0x87, 0xD9, 0x87, 0xFF, 0xFA, 0xD9, 0x87, 0xD9, 0x87, 0xE1, 0xEB, 0xE1, 0xEB, 0xD9, 0x87, 0xD9,
+    0x87, 0xD9, 0x87, 0x21, 0x65, 0xC9, 0xA1, 0x00, 0x51, 0x69, 0xFD, 0xC1, 0x0C, 0xB2, 0x75, 0xFE,
+    0xAE, 0x21, 0x7A, 0xFA, 0xA1, 0x00, 0x51, 0x6F, 0xFD, 0xD9, 0x01, 0xF1, 0xC4, 0xC5, 0x61, 0x62,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73,
+    0x74, 0x76, 0x77, 0x78, 0x7A, 0xD9, 0xA0, 0xFD, 0xC9, 0xFE, 0x60, 0xD9, 0xB4, 0xD9, 0xB4, 0xFE,
+    0xDC, 0xFF, 0x2C, 0xD9, 0xB4, 0xD9, 0xB4, 0xD9, 0xB4, 0xFF, 0x6A, 0xD9, 0xB4, 0xD9, 0xB4, 0xD9,
+    0xB4, 0xFF, 0x85, 0xFF, 0xED, 0xDD, 0xD7, 0xD9, 0xB4, 0xFF, 0xFB, 0xD9, 0xB4, 0xD9, 0xB4, 0xD9,
+    0xB4, 0xD9, 0xB4, 0xD9, 0xB4, 0xD9, 0xB4, 0x5A, 0xC4, 0xC5, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+    0x78, 0x7A, 0xD7, 0x77, 0xD8, 0x78, 0xD9, 0x3F, 0xD9, 0xA7, 0xDA, 0x7B, 0xDC, 0x80, 0xDD, 0x34,
+    0xDD, 0x44, 0xDD, 0x9C, 0xDD, 0xFC, 0xDE, 0x6F, 0xDE, 0x83, 0xDF, 0x6B, 0xDF, 0xBD, 0xE0, 0x1E,
+    0xEA, 0x49, 0xED, 0xC7, 0xF6, 0x22, 0xF7, 0x53, 0xF8, 0xF2, 0xF9, 0xCD, 0xFB, 0x24, 0xDD, 0x44,
+    0xFD, 0x27, 0xDD, 0x44, 0xFF, 0xB2, 0xA0, 0x14, 0x31, 0xA0, 0x15, 0x81, 0xA1, 0x14, 0x62, 0x2E,
+    0xFD, 0x21, 0x2E, 0xF8, 0x25, 0x84, 0x9B, 0xBA, 0xBC, 0x82, 0xF8, 0xF8, 0xF8, 0xF8, 0xFD, 0xA1,
+    0x15, 0x42, 0x2E, 0xEA, 0x21, 0x87, 0xFB, 0x36, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x6D,
+    0x6E, 0x70, 0x73, 0x74, 0x7A, 0xC4, 0x2E, 0x68, 0x6A, 0x6C, 0x72, 0x76, 0x77, 0x78, 0xED, 0xE5,
+    0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xE5, 0xFD, 0xE2, 0xEA, 0xEA, 0xEA,
+    0xEA, 0xEA, 0xEA, 0xEA, 0x43, 0x85, 0x99, 0x87, 0xFF, 0xB2, 0xFF, 0xB2, 0xFF, 0xD3, 0x41, 0x7A,
+    0xF9, 0x9F, 0x21, 0x63, 0xFC, 0xA1, 0x14, 0x31, 0x77, 0xFD, 0x21, 0xB3, 0xFB, 0xA0, 0x14, 0x42,
+    0xC2, 0x14, 0x31, 0x69, 0x2E, 0xFF, 0xFD, 0xFF, 0x99, 0xA0, 0x14, 0x61, 0x42, 0x63, 0x2E, 0xFF,
+    0xFD, 0xFF, 0x8D, 0x21, 0x87, 0xF9, 0x45, 0x9B, 0xBA, 0xBC, 0x82, 0x84, 0xFF, 0x86, 0xFF, 0x86,
+    0xFF, 0x86, 0xFF, 0x8B, 0xFF, 0x8B, 0x43, 0x6D, 0x6E, 0x2E, 0xFF, 0xE3, 0xFF, 0xE3, 0xFF, 0x73,
+    0x56, 0x63, 0xC4, 0xC5, 0x62, 0x64, 0x66, 0x67, 0x6B, 0x70, 0x73, 0x74, 0x7A, 0x6C, 0x2E, 0x68,
+    0x6A, 0x6D, 0x6E, 0x72, 0x76, 0x77, 0x78, 0xFF, 0xD0, 0xFF, 0xE3, 0xFF, 0xE6, 0xFF, 0x6C, 0xFF,
+    0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF, 0x6C, 0xFF,
+    0xF6, 0xFF, 0x69, 0xFF, 0x71, 0xFF, 0x71, 0xFF, 0x71, 0xFF, 0x71, 0xFF, 0x71, 0xFF, 0x71, 0xFF,
+    0x71, 0xFF, 0x71, 0xA0, 0x00, 0xF1, 0x21, 0xBA, 0xFD, 0xC2, 0x14, 0x62, 0xC5, 0x2E, 0xFF, 0xFD,
+    0xFF, 0x20, 0x41, 0x87, 0xFF, 0x1A, 0x45, 0x9B, 0xBC, 0xBA, 0x82, 0x84, 0xFF, 0x16, 0xFF, 0x16,
+    0xFF, 0x29, 0xFF, 0x1B, 0xFF, 0x1B, 0x56, 0x64, 0xC4, 0xC5, 0x62, 0x63, 0x66, 0x67, 0x6B, 0x6C,
+    0x6D, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x7A, 0x2E, 0x68, 0x6A, 0x72, 0x76, 0x78, 0xFF, 0xE3, 0xFF,
+    0xEC, 0xFF, 0xF0, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF,
+    0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x06, 0xFF, 0x03, 0xFF,
+    0x0B, 0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0x0B, 0xFF, 0x0B, 0x45, 0x84, 0x9B, 0xBA, 0xBC, 0x82, 0xFE,
+    0xC3, 0xFE, 0xC3, 0xFE, 0xC3, 0xFE, 0xC3, 0xFE, 0xD6, 0x56, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66,
+    0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x2E, 0x76, 0x78,
+    0xFF, 0x99, 0xFF, 0xF0, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3,
+    0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3,
+    0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB3, 0xFE, 0xB0, 0xFE, 0xB8, 0xFE, 0xB8, 0x45, 0x82, 0x84, 0x9B,
+    0xBA, 0xBC, 0xFE, 0x70, 0xFE, 0x70, 0xFE, 0x70, 0xFE, 0x70, 0xFE, 0x70, 0x56, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A,
+    0x2E, 0x76, 0x78, 0xFF, 0x46, 0xFF, 0xF0, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE,
+    0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE,
+    0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x60, 0xFE, 0x5D, 0xFE, 0x65, 0xFE, 0x65, 0x45,
+    0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xFE, 0x1D, 0xFE, 0x1D, 0xFE, 0x1D, 0xFE, 0x1D, 0xFE, 0x30, 0x56,
+    0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74,
+    0x77, 0x7A, 0x2E, 0x68, 0x76, 0x78, 0xFE, 0xF3, 0xFF, 0xF0, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D,
+    0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D,
+    0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0D, 0xFE, 0x0A, 0xFE, 0x12, 0xFE, 0x12,
+    0xFE, 0x12, 0x45, 0x9B, 0xBA, 0x82, 0x84, 0xBC, 0xFE, 0x5E, 0xFE, 0xC4, 0xFF, 0x17, 0xFF, 0x6A,
+    0xFF, 0xBD, 0x42, 0x6B, 0x2E, 0xFE, 0x27, 0xFD, 0xB7, 0xC1, 0x14, 0x82, 0x2E, 0xFD, 0xB0, 0x25,
+    0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xF3, 0xFA, 0xFA, 0xFA, 0xFA, 0x21, 0x87, 0xEF, 0xA0, 0x16, 0x43,
+    0x21, 0x79, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x77, 0xFD, 0x21, 0x64, 0xFD, 0x21, 0x61, 0xFD, 0x45,
+    0x6E, 0x2E, 0x7A, 0x64, 0x6F, 0xFD, 0xFA, 0xFD, 0x8A, 0xFD, 0x92, 0xFE, 0x64, 0xFF, 0xFD, 0xC1,
+    0x15, 0x62, 0x2E, 0xFD, 0x7A, 0xA0, 0x16, 0x22, 0x21, 0x7A, 0xFD, 0x21, 0x75, 0xFD, 0x21, 0x61,
+    0xFD, 0x21, 0x68, 0xFD, 0x21, 0x6B, 0xFD, 0x42, 0x2E, 0x6F, 0xFD, 0x62, 0xFF, 0xFD, 0x41, 0x68,
+    0xFE, 0x35, 0x21, 0x74, 0xFC, 0xA0, 0x15, 0x93, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD, 0x41, 0x64,
+    0xD9, 0xF0, 0x21, 0x6E, 0xFC, 0x21, 0x65, 0xFD, 0x21, 0x68, 0xFD, 0x23, 0x65, 0x66, 0x6B, 0xE7,
+    0xF0, 0xFD, 0xA0, 0x04, 0xD3, 0x21, 0x75, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x6F, 0xFD, 0xA0, 0x0B,
+    0xB2, 0x21, 0x70, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x7A, 0xFD, 0xA0, 0x15, 0xC4,
+    0xA1, 0x01, 0x22, 0x6D, 0xFD, 0x21, 0x73, 0xFB, 0x21, 0x65, 0xFD, 0x21, 0x6E, 0xFD, 0xA0, 0x16,
+    0x02, 0x21, 0x6D, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x68, 0xFD, 0x21, 0x67, 0xFD, 0x21, 0x6E, 0xFD,
+    0x21, 0x69, 0xFD, 0x21, 0x6D, 0xFD, 0x24, 0x6E, 0x73, 0x7A, 0x72, 0xC5, 0xD4, 0xE5, 0xFD, 0x41,
+    0x61, 0xDB, 0x01, 0x21, 0x6D, 0xFC, 0x21, 0x73, 0xFD, 0x21, 0x65, 0xB5, 0x21, 0x6D, 0xFD, 0xA0,
+    0x13, 0x02, 0xA1, 0x00, 0x71, 0x6D, 0xFD, 0x21, 0x73, 0xFB, 0x21, 0x73, 0xFD, 0x21, 0x65, 0xFD,
+    0x21, 0x6E, 0xFD, 0x22, 0x7A, 0x69, 0xE9, 0xFD, 0xA0, 0x16, 0x72, 0x21, 0x6E, 0xFD, 0x21, 0x61,
+    0xFD, 0x21, 0x70, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD, 0x22, 0x73, 0x6B, 0xE9, 0xFD, 0x5A,
+    0xC5, 0xC4, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x7A, 0x72, 0x62, 0x2E,
+    0x68, 0x6A, 0x6C, 0x76, 0x77, 0x78, 0x65, 0x69, 0x6F, 0x75, 0xFF, 0x00, 0xFF, 0x0B, 0xFE, 0xFA,
+    0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA, 0xFE, 0xFA,
+    0xFE, 0xFA, 0xFE, 0xFA, 0xFF, 0x20, 0xFF, 0x30, 0xFC, 0xAA, 0xFC, 0xB2, 0xFC, 0xB2, 0xFF, 0x48,
+    0xFC, 0xB2, 0xFC, 0xB2, 0xFC, 0xB2, 0xFF, 0x6C, 0xFF, 0xB7, 0xFF, 0xC7, 0xFF, 0xFB, 0x45, 0x84,
+    0x9B, 0xBA, 0xBC, 0x82, 0xFE, 0xAB, 0xFE, 0xAB, 0xFE, 0xAB, 0xFE, 0xAB, 0xFC, 0x63, 0xA0, 0x14,
+    0x62, 0x21, 0x87, 0xFD, 0xC1, 0x00, 0xF1, 0x2E, 0xFC, 0x45, 0x25, 0x84, 0x9B, 0xBA, 0xBC, 0x82,
+    0xF4, 0xF4, 0xF4, 0xF4, 0xFA, 0xC1, 0x00, 0xF1, 0x7A, 0xFC, 0x3C, 0xA0, 0x16, 0x91, 0x21, 0x74,
+    0xFD, 0x21, 0x73, 0xFD, 0xD4, 0x02, 0x31, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x6D,
+    0x6E, 0x70, 0x73, 0x74, 0x7A, 0x2E, 0x72, 0x77, 0x6A, 0x6C, 0x75, 0xFF, 0xDD, 0xFF, 0xE6, 0xFF,
+    0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF,
+    0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFF, 0xDA, 0xFC, 0x25, 0xFF, 0xF1, 0xFF, 0xE0, 0xFC, 0xFF, 0xFC,
+    0xFF, 0xFF, 0xFD, 0x44, 0x84, 0x9B, 0xBA, 0xBC, 0xFF, 0x9B, 0xFF, 0x9B, 0xFF, 0x9B, 0xFF, 0x9B,
+    0xD0, 0x02, 0x31, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x73,
+    0x74, 0x7A, 0x2E, 0xFF, 0x91, 0xFF, 0xF3, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF,
+    0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFF, 0x8E, 0xFB, 0xDC, 0xFF,
+    0x8E, 0xFB, 0xD9, 0x41, 0x6C, 0xFE, 0x32, 0x21, 0x6C, 0xFC, 0x21, 0x65, 0xFD, 0x21, 0x77, 0xFD,
+    0x21, 0x64, 0xFD, 0x21, 0x6C, 0xFD, 0xA0, 0x16, 0xA2, 0x21, 0x6E, 0xFD, 0x21, 0x6F, 0xFD, 0x21,
+    0x7A, 0xFD, 0x21, 0x72, 0xFD, 0x58, 0xC4, 0xC5, 0x62, 0x64, 0x66, 0x67, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x70, 0x73, 0x74, 0x68, 0x7A, 0x63, 0x2E, 0x6A, 0x72, 0x76, 0x77, 0x78, 0x61, 0x75, 0xFD, 0xE5,
+    0xFF, 0x29, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4,
+    0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFD, 0xD4, 0xFF, 0x5F, 0xFF, 0xAB, 0xFE, 0x0A, 0xFB, 0x84,
+    0xFB, 0x8C, 0xFB, 0x8C, 0xFB, 0x8C, 0xFB, 0x8C, 0xFB, 0x8C, 0xFF, 0xEE, 0xFF, 0xFD, 0x41, 0x7A,
+    0xFB, 0xAB, 0x43, 0x62, 0x73, 0x2E, 0xFB, 0xA7, 0xFF, 0xFC, 0xFB, 0x37, 0xA0, 0x14, 0xA2, 0x21,
+    0x87, 0xFD, 0x24, 0x84, 0x9B, 0xBA, 0xBC, 0xFA, 0xFA, 0xFA, 0xFA, 0xCF, 0x02, 0x31, 0xC4, 0xC5,
+    0x62, 0x63, 0x64, 0x66, 0x67, 0x6B, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x7A, 0x2E, 0xFF, 0xF4, 0xFF,
+    0xF7, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF,
+    0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFF, 0xF1, 0xFB, 0x1E, 0x45, 0x84, 0x9B, 0xBA, 0xBC,
+    0x82, 0xFF, 0xC1, 0xFF, 0xC1, 0xFF, 0xC1, 0xFF, 0xC1, 0xE7, 0xF3, 0x42, 0x62, 0x6D, 0xDF, 0xFD,
+    0xDF, 0xFD, 0x21, 0x7A, 0xF9, 0xD4, 0x02, 0x31, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6B,
+    0x6D, 0x6E, 0x70, 0x73, 0x74, 0x7A, 0x2E, 0x6A, 0x6C, 0x72, 0x77, 0x65, 0xFF, 0xAA, 0xFF, 0xE6,
+    0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7,
+    0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFF, 0xA7, 0xFA, 0xD4, 0xE7, 0xD9, 0xE7, 0xD9, 0xE7, 0xD9,
+    0xE7, 0xD9, 0xFF, 0xFD, 0x45, 0x82, 0xBA, 0xBC, 0x84, 0x9B, 0xFF, 0x5E, 0xFF, 0x77, 0xFF, 0xC1,
+    0xFC, 0xE5, 0xFC, 0xE5, 0xA0, 0x14, 0xC2, 0x21, 0x77, 0xFD, 0x21, 0x6F, 0xFD, 0xC2, 0x14, 0x82,
+    0x69, 0x2E, 0xFF, 0xFD, 0xFA, 0x7C, 0x42, 0x2E, 0x77, 0xFA, 0x73, 0xE7, 0x78, 0x43, 0x6E, 0x2E,
+    0x7A, 0xFA, 0xDC, 0xFA, 0x6C, 0xFF, 0xF9, 0xD0, 0x02, 0x31, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66,
+    0x67, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x7A, 0x2E, 0xFE, 0x1A, 0xFE, 0x7C, 0xFE, 0x17,
+    0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17,
+    0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFE, 0x17, 0xFA, 0x62, 0x41, 0x64, 0xDF, 0x60, 0x21, 0x6E,
+    0xFC, 0x21, 0x61, 0xFD, 0x21, 0x6C, 0xFD, 0x21, 0x68, 0xFD, 0x21, 0x63, 0xFD, 0x21, 0x73, 0xFD,
+    0x21, 0x74, 0xFD, 0x21, 0x75, 0xFD, 0x41, 0x74, 0xFC, 0xE8, 0x21, 0x73, 0xFC, 0x21, 0x61, 0xFD,
+    0x21, 0x70, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD, 0x58, 0xC5, 0xC4, 0x62, 0x63, 0x66, 0x67,
+    0x6B, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x72, 0x7A, 0x64, 0x2E, 0x68, 0x6A, 0x6C, 0x76, 0x77, 0x78,
+    0x65, 0x75, 0xFF, 0x6B, 0xFC, 0x61, 0xFC, 0x50, 0xFC, 0x50, 0xFC, 0x50, 0xFC, 0x50, 0xFC, 0x50,
+    0xFC, 0x50, 0xFF, 0x84, 0xFC, 0x50, 0xFC, 0x50, 0xFC, 0x50, 0xFF, 0x94, 0xFF, 0x9E, 0xFC, 0x86,
+    0xFA, 0x00, 0xFA, 0x08, 0xFA, 0x08, 0xFA, 0x08, 0xFA, 0x08, 0xFA, 0x08, 0xFA, 0x08, 0xFF, 0xEA,
+    0xFF, 0xFD, 0x41, 0x87, 0xF9, 0xBF, 0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC, 0xF9, 0xBB, 0xF9, 0xBB,
+    0xF9, 0xBB, 0xF9, 0xBB, 0xF9, 0xBB, 0x41, 0x6D, 0xD7, 0xBA, 0x21, 0x72, 0xFC, 0x21, 0x61, 0xFD,
+    0x41, 0x6E, 0xFC, 0x6E, 0x21, 0x69, 0xFC, 0x21, 0x62, 0xFD, 0x22, 0x68, 0x7A, 0xF3, 0xFD, 0x21,
+    0x73, 0xFB, 0xA0, 0x16, 0xC2, 0x21, 0x63, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x7A, 0xFD, 0x41, 0x72,
+    0xFC, 0x07, 0x21, 0x6F, 0xFC, 0x21, 0x6C, 0xFD, 0x21, 0x6B, 0xFD, 0xA0, 0x16, 0xE3, 0x21, 0x74,
+    0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x66, 0xFD, 0x44, 0x6B, 0x72,
+    0x6C, 0x73, 0xD1, 0x98, 0xFF, 0xDE, 0xFF, 0xEB, 0xFF, 0xFD, 0x58, 0x63, 0x6B, 0x6D, 0x6E, 0x66,
+    0x2E, 0xC4, 0xC5, 0x62, 0x64, 0x67, 0x68, 0x6A, 0x6C, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78,
+    0x7A, 0x69, 0x6F, 0xFB, 0x9F, 0xFB, 0x9F, 0xFB, 0x9F, 0xFB, 0x9F, 0xFB, 0xD5, 0xF9, 0x4F, 0xFF,
+    0x98, 0xFF, 0x9C, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9,
+    0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xF9, 0x57, 0xFF,
+    0xC5, 0xFF, 0xF3, 0x42, 0x62, 0x2E, 0xF9, 0x76, 0xF9, 0x06, 0x45, 0x82, 0x84, 0x9B, 0xBA, 0xBC,
+    0xFF, 0xF9, 0xFB, 0x4F, 0xFB, 0x4F, 0xFB, 0x4F, 0xFB, 0x4F, 0xA0, 0x17, 0x12, 0x21, 0x6F, 0xFD,
+    0x21, 0x6C, 0xFD, 0x21, 0x69, 0xFD, 0x21, 0x64, 0xFD, 0x21, 0x6E, 0xFD, 0x41, 0x74, 0xF4, 0x52,
+    0x43, 0x2E, 0x61, 0x6F, 0xF8, 0xD9, 0xFF, 0xF9, 0xFF, 0xFC, 0x41, 0x74, 0xE5, 0xAD, 0x21, 0x65,
+    0xFC, 0x41, 0x61, 0xD6, 0xC0, 0x21, 0x74, 0xFC, 0x21, 0x70, 0xFD, 0x22, 0x67, 0x6F, 0xF3, 0xFD,
+    0x21, 0x64, 0xFB, 0xC1, 0x02, 0x02, 0x7A, 0xD1, 0x1E, 0x21, 0x73, 0xFA, 0x21, 0x66, 0xFD, 0x21,
+    0x6C, 0xFD, 0x58, 0xC5, 0xC4, 0x62, 0x63, 0x64, 0x66, 0x6B, 0x6D, 0x70, 0x73, 0x74, 0x7A, 0x67,
+    0x2E, 0x68, 0x6A, 0x6C, 0x6E, 0x72, 0x76, 0x77, 0x78, 0x61, 0x6F, 0xFF, 0xA8, 0xFB, 0x08, 0xFA,
+    0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA, 0xF7, 0xFA,
+    0xF7, 0xFA, 0xF7, 0xFB, 0x2D, 0xF8, 0xA7, 0xF8, 0xAF, 0xF8, 0xAF, 0xF8, 0xAF, 0xF8, 0xAF, 0xFF,
+    0xCE, 0xF8, 0xAF, 0xF8, 0xAF, 0xF8, 0xAF, 0xFF, 0xEE, 0xFF, 0xFD, 0x45, 0x82, 0x84, 0x9B, 0xBA,
+    0xBC, 0xFA, 0xAE, 0xFA, 0xAE, 0xFA, 0xAE, 0xFA, 0xAE, 0xFA, 0xAE, 0x41, 0x7A, 0xFB, 0x26, 0x21,
+    0x73, 0xFC, 0xA0, 0x17, 0x32, 0x21, 0x77, 0xFD, 0x21, 0x7A, 0xFD, 0x41, 0x79, 0xD6, 0x55, 0x21,
+    0x65, 0xFC, 0x21, 0x6C, 0xFD, 0x22, 0x63, 0x78, 0xF3, 0xFD, 0x58, 0xC4, 0xC5, 0x62, 0x63, 0x64,
+    0x66, 0x67, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x68, 0x2E, 0x76,
+    0x78, 0x69, 0x75, 0xFA, 0x90, 0xFF, 0xD1, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA,
+    0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA,
+    0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0x7F, 0xFA, 0xB5, 0xF8, 0x2F, 0xF8, 0x37, 0xF8, 0x37, 0xFF,
+    0xE5, 0xFF, 0xFB, 0xA0, 0x05, 0x42, 0x21, 0x82, 0xFD, 0xC3, 0x14, 0x82, 0x2E, 0xC5, 0x72, 0xF7,
+    0xE0, 0xFF, 0xFD, 0xFF, 0xFA, 0xA0, 0x17, 0x53, 0x22, 0x62, 0x6D, 0xFD, 0xFD, 0x21, 0x7A, 0xFB,
+    0x21, 0x7A, 0xFD, 0x57, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6B, 0x6C, 0x6D, 0x6E,
+    0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6A, 0x2E, 0x76, 0x78, 0x61, 0xFA, 0x27, 0xFF, 0x68, 0xFA,
+    0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA,
+    0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFA, 0x16, 0xFF, 0xE6, 0xFA, 0x16, 0xFA, 0x16, 0xFA,
+    0x4C, 0xF7, 0xC6, 0xF7, 0xCE, 0xF7, 0xCE, 0xFF, 0xFD, 0xA0, 0x14, 0xE3, 0xA1, 0x14, 0x82, 0x74,
+    0xFD, 0xC3, 0x14, 0x82, 0x7A, 0x2E, 0x74, 0xFF, 0xFB, 0xF7, 0x78, 0xF7, 0x80, 0x41, 0x6E, 0xFE,
+    0x7D, 0x21, 0x6F, 0xFC, 0x21, 0x72, 0xFD, 0x41, 0x65, 0xFE, 0x73, 0x21, 0x68, 0xFC, 0x21, 0x75,
+    0xFD, 0x22, 0x6B, 0x72, 0xF3, 0xFD, 0x21, 0x73, 0xFB, 0x21, 0x6C, 0xFD, 0x21, 0x72, 0xFD, 0x41,
+    0x66, 0xE4, 0x4F, 0x21, 0x66, 0xFC, 0x21, 0x6F, 0xFD, 0x21, 0x68, 0xFD, 0x21, 0x68, 0xFD, 0x21,
+    0x63, 0xFD, 0x21, 0x72, 0xFD, 0x41, 0x6D, 0xE6, 0x76, 0x21, 0x73, 0xFC, 0x21, 0x65, 0xFD, 0x21,
+    0x72, 0xFD, 0x21, 0x67, 0xFD, 0x21, 0x6E, 0xFD, 0x59, 0xC5, 0xC4, 0x62, 0x63, 0x64, 0x66, 0x67,
+    0x6D, 0x6E, 0x70, 0x73, 0x74, 0x7A, 0x6B, 0x2E, 0x68, 0x6A, 0x6C, 0x72, 0x76, 0x77, 0x78, 0x61,
+    0x69, 0x6F, 0xFE, 0x22, 0xF9, 0x82, 0xF9, 0x71, 0xF9, 0x71, 0xF9, 0x71, 0xF9, 0x71, 0xF9, 0x71,
+    0xF9, 0x71, 0xF9, 0x71, 0xF9, 0x71, 0xFF, 0xA9, 0xF9, 0x71, 0xF9, 0x71, 0xF9, 0xA7, 0xF7, 0x21,
+    0xF7, 0x29, 0xF7, 0x29, 0xF7, 0x29, 0xF7, 0x29, 0xF7, 0x29, 0xF7, 0x29, 0xF7, 0x29, 0xFF, 0xD4,
+    0xFF, 0xEA, 0xFF, 0xFD, 0xA0, 0x14, 0xB1, 0x21, 0x77, 0xFD, 0x21, 0x64, 0xFD, 0x41, 0x66, 0xF9,
+    0xEC, 0x21, 0x66, 0xFC, 0x21, 0x61, 0xFD, 0x21, 0x77, 0xFD, 0x21, 0x74, 0xFD, 0x41, 0x72, 0xFE,
+    0x75, 0x21, 0x65, 0xFC, 0x21, 0x66, 0xFD, 0x21, 0x73, 0xFD, 0x22, 0x66, 0x6B, 0xF0, 0xFD, 0x41,
+    0x6F, 0xF7, 0x84, 0x59, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6D, 0x6E,
+    0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6C, 0x2E, 0x76, 0x78, 0x65, 0x75, 0x79, 0xF9, 0x07, 0xFE,
+    0x48, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8,
+    0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8, 0xF6, 0xF8,
+    0xF6, 0xF9, 0x2C, 0xF6, 0xA6, 0xF6, 0xAE, 0xF6, 0xAE, 0xFF, 0xD7, 0xFF, 0xF7, 0xFF, 0xFC, 0xA0,
+    0x15, 0x13, 0xC2, 0x14, 0x82, 0x6E, 0x2E, 0xFF, 0xFD, 0xF6, 0x57, 0x41, 0x74, 0xFB, 0xC9, 0x41,
+    0x6A, 0xFB, 0xC5, 0x22, 0x73, 0x7A, 0xF8, 0xFC, 0xC2, 0x14, 0x82, 0x65, 0x2E, 0xFF, 0xFB, 0xF6,
+    0x41, 0x41, 0x6E, 0xFE, 0xB8, 0xC3, 0x14, 0x82, 0x6B, 0x2E, 0x74, 0xFF, 0xFC, 0xF6, 0x34, 0xF6,
+    0x3C, 0x41, 0x82, 0xFC, 0xA1, 0x43, 0xC5, 0x6C, 0x6E, 0xFF, 0xFC, 0xFC, 0x9D, 0xFC, 0x9D, 0x21,
+    0x7A, 0xF6, 0x21, 0x72, 0xFD, 0x41, 0x7A, 0xFD, 0xCD, 0x21, 0x73, 0xFC, 0x21, 0x61, 0xFD, 0x21,
+    0x6D, 0xFD, 0x21, 0x7A, 0xFD, 0xA0, 0x17, 0x82, 0x21, 0x82, 0xFD, 0x22, 0xC5, 0x69, 0xFD, 0xFA,
+    0x21, 0x7A, 0xFB, 0x21, 0x72, 0xFD, 0x22, 0x73, 0x65, 0xEC, 0xFD, 0x41, 0x6C, 0xD3, 0x22, 0x21,
+    0x61, 0xFC, 0x21, 0x65, 0xFD, 0x21, 0x72, 0xFD, 0x21, 0x74, 0xFD, 0x41, 0x6B, 0xE2, 0xC5, 0x21,
+    0x69, 0xFC, 0x21, 0x61, 0xFD, 0x22, 0x6E, 0x7A, 0xF3, 0xFD, 0xA0, 0x17, 0xA3, 0x21, 0x6C, 0xFD,
+    0x21, 0x68, 0xFD, 0x21, 0x63, 0xFD, 0x21, 0x69, 0xFD, 0x21, 0x73, 0xFD, 0x21, 0x61, 0xFD, 0x21,
+    0x7A, 0xFD, 0x21, 0x72, 0xFD, 0x5A, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B,
+    0x6C, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6D, 0x2E, 0x76, 0x78, 0x61, 0x69, 0x6F, 0x75,
+    0xF8, 0x15, 0xFD, 0x56, 0xF8, 0x04, 0xF8, 0x04, 0xF8, 0x04, 0xF8, 0x04, 0xF8, 0x04, 0xF8, 0x04,
+    0xF8, 0x04, 0xFF, 0x5D, 0xF8, 0x04, 0xFF, 0x73, 0xF8, 0x04, 0xF8, 0x04, 0xFF, 0x80, 0xF8, 0x04,
+    0xF8, 0x04, 0xF8, 0x04, 0xF8, 0x3A, 0xF5, 0xB4, 0xF5, 0xBC, 0xF5, 0xBC, 0xFF, 0x9D, 0xFF, 0xC1,
+    0xFF, 0xE0, 0xFF, 0xFD, 0xC2, 0x14, 0x82, 0x6E, 0x2E, 0xF5, 0xD5, 0xF5, 0x65, 0x41, 0x73, 0xEF,
+    0xFD, 0x21, 0x77, 0xFC, 0x21, 0x6F, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x82, 0xFD, 0x41, 0x76, 0xEF,
+    0x40, 0x22, 0xC5, 0x72, 0xF9, 0xFC, 0x57, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A,
+    0x6B, 0x6C, 0x6D, 0x70, 0x72, 0x73, 0x74, 0x77, 0x7A, 0x6E, 0x2E, 0x76, 0x78, 0x61, 0xF7, 0xA4,
+    0xFC, 0xE5, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93,
+    0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xF7, 0x93, 0xFF, 0xDE, 0xF7, 0x93,
+    0xF7, 0x93, 0xF7, 0xC9, 0xF5, 0x43, 0xF5, 0x4B, 0xF5, 0x4B, 0xFF, 0xFB, 0x41, 0x75, 0xFA, 0x78,
+    0xC2, 0x14, 0x82, 0x65, 0x2E, 0xFF, 0xFC, 0xF4, 0xF9, 0xA0, 0x14, 0x82, 0xC2, 0x14, 0x82, 0x7A,
+    0x2E, 0xFF, 0xFD, 0xF4, 0xED, 0x42, 0x6E, 0x2E, 0xF5, 0x54, 0xF4, 0xE4, 0x41, 0x6C, 0xF5, 0xB7,
+    0x21, 0x61, 0xFC, 0x21, 0x68, 0xFD, 0x41, 0x61, 0xF8, 0x12, 0x21, 0x70, 0xFC, 0x21, 0x7A, 0xFD,
+    0x21, 0x73, 0xFD, 0x44, 0x2E, 0x7A, 0x63, 0x65, 0xF4, 0xC6, 0xF4, 0xCE, 0xFF, 0xF0, 0xFF, 0xFD,
+    0x41, 0x72, 0xF7, 0x82, 0x21, 0x65, 0xFC, 0x21, 0x6D, 0xFD, 0x21, 0x61, 0xFD, 0x42, 0x61, 0x68,
+    0xD2, 0xC6, 0xD2, 0xC3, 0x21, 0x63, 0xF9, 0x22, 0x6E, 0x73, 0xF3, 0xFD, 0x41, 0x69, 0xCD, 0x37,
+    0x21, 0x6E, 0xFC, 0x21, 0x64, 0xFD, 0x21, 0x75, 0xFD, 0x21, 0x82, 0xFD, 0x41, 0x7A, 0xD2, 0x7C,
+    0x21, 0x72, 0xFC, 0x21, 0x70, 0xFD, 0x21, 0x65, 0xFD, 0x21, 0x69, 0xFD, 0x21, 0x6E, 0xFD, 0x42,
+    0x85, 0x99, 0xE1, 0x58, 0xE1, 0x58, 0x42, 0xC4, 0x69, 0xFF, 0xF9, 0xE1, 0x51, 0x21, 0x6E, 0xF9,
+    0xA0, 0x17, 0xD4, 0x21, 0x68, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x75, 0xFD, 0x21, 0x6F, 0xFD, 0x21,
+    0x6D, 0xFD, 0x41, 0x64, 0xEE, 0xF8, 0x21, 0x6E, 0xFC, 0x21, 0x61, 0xFD, 0x22, 0x73, 0x6C, 0xF3,
+    0xFD, 0x21, 0x74, 0xFB, 0x41, 0x65, 0xD2, 0x3D, 0x21, 0x72, 0xFC, 0x42, 0x65, 0x75, 0xD4, 0xF0,
+    0xFF, 0xFD, 0x21, 0x69, 0xF9, 0x41, 0x69, 0xCD, 0xBE, 0x21, 0x6E, 0xFC, 0x21, 0x64, 0xFD, 0x21,
+    0x65, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD, 0x46, 0xC5, 0x64, 0x6D, 0x72, 0x6C, 0x77, 0xFF,
+    0x91, 0xFF, 0xA4, 0xFF, 0xB5, 0xFF, 0xD9, 0xFF, 0xEA, 0xFF, 0xFD, 0x58, 0xC4, 0xC5, 0x62, 0x63,
+    0x64, 0x66, 0x67, 0x6B, 0x6D, 0x6E, 0x73, 0x74, 0x7A, 0x6C, 0x70, 0x2E, 0x68, 0x6A, 0x72, 0x76,
+    0x77, 0x78, 0x61, 0x6F, 0xF6, 0x6F, 0xF7, 0xB3, 0xF6, 0x5E, 0xF6, 0x5E, 0xF6, 0x5E, 0xF6, 0x5E,
+    0xF6, 0x5E, 0xF6, 0x5E, 0xF6, 0x5E, 0xFF, 0x15, 0xFF, 0x21, 0xF6, 0x5E, 0xF6, 0x5E, 0xFF, 0x2A,
+    0xF6, 0x94, 0xF4, 0x0E, 0xF4, 0x16, 0xF4, 0x16, 0xFF, 0x48, 0xF4, 0x16, 0xF4, 0x16, 0xF4, 0x16,
+    0xFF, 0x6C, 0xFF, 0xED, 0xC2, 0x14, 0x82, 0x2E, 0x7A, 0xF3, 0xC5, 0xF3, 0xCD, 0x45, 0x82, 0x84,
+    0x9B, 0xBA, 0xBC, 0xF3, 0xBF, 0xF7, 0x71, 0xF7, 0x71, 0xF7, 0x71, 0xF7, 0x71, 0xD3, 0x02, 0x31,
+    0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73,
+    0x74, 0x77, 0x2E, 0xF7, 0x64, 0xFF, 0xF0, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7,
+    0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7,
+    0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF7, 0x61, 0xF3, 0xAC, 0x41, 0x6E, 0xF6, 0x1C, 0x21, 0x65, 0xFC,
+    0x21, 0x67, 0xFD, 0x21, 0x74, 0xFD, 0x21, 0x6E, 0xFD, 0x41, 0x7A, 0xD1, 0x77, 0x21, 0x63, 0xFC,
+    0x21, 0x6F, 0xFD, 0x21, 0x72, 0xFD, 0xA0, 0x18, 0x14, 0x21, 0x6B, 0xFD, 0x21, 0x63, 0xFD, 0x21,
+    0x6F, 0xFD, 0x21, 0x74, 0xFD, 0x23, 0x65, 0x6B, 0x73, 0xE1, 0xEE, 0xFD, 0x57, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x7A, 0x72,
+    0x2E, 0x76, 0x78, 0x6F, 0xF5, 0x9E, 0xFA, 0xDF, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D,
+    0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D, 0xF5, 0x8D,
+    0xFF, 0x78, 0xF5, 0x8D, 0xF5, 0x8D, 0xFF, 0x91, 0xF5, 0xC3, 0xF3, 0x3D, 0xF3, 0x45, 0xF3, 0x45,
+    0xFF, 0xF9, 0x45, 0x82, 0xBA, 0xBC, 0x84, 0x9B, 0xF9, 0xF1, 0xF5, 0x47, 0xF5, 0x47, 0xF2, 0xFF,
+    0xF2, 0xFF, 0x42, 0x2E, 0x7A, 0xF2, 0xE7, 0xF2, 0xEF, 0x46, 0x6B, 0x6E, 0x73, 0x2E, 0x72, 0x77,
+    0xF3, 0x50, 0xF3, 0x50, 0xF7, 0xA5, 0xF2, 0xE0, 0xFF, 0xF9, 0xF2, 0xE8, 0x41, 0x9B, 0xF6, 0x82,
+    0x42, 0x2E, 0x62, 0xF2, 0xC9, 0xF2, 0xD1, 0xA1, 0x14, 0x62, 0x7A, 0xF9, 0xC1, 0x14, 0x62, 0x6E,
+    0xF3, 0x2D, 0x41, 0x6D, 0xF9, 0xC8, 0x21, 0x6C, 0xFC, 0x21, 0x6F, 0xFD, 0x21, 0x68, 0xFD, 0x21,
+    0x6B, 0xFD, 0xC3, 0x14, 0x62, 0x2E, 0x72, 0x6F, 0xF2, 0xA7, 0xF2, 0xAF, 0xFF, 0xFD, 0xA0, 0x18,
+    0x52, 0x21, 0x79, 0xFD, 0x21, 0x82, 0xFD, 0x21, 0xC5, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x73, 0xFD,
+    0x41, 0x67, 0xF5, 0x15, 0x21, 0x6E, 0xFC, 0x21, 0x6F, 0xFD, 0x21, 0x6C, 0xFD, 0x41, 0x87, 0xCA,
+    0xC6, 0x21, 0xC4, 0xFC, 0x21, 0x9B, 0xFD, 0x22, 0x7A, 0xC5, 0xF3, 0xFD, 0x41, 0x73, 0xF9, 0x7E,
+    0x21, 0x61, 0xFC, 0x21, 0x77, 0xFD, 0x21, 0x6B, 0xFD, 0x21, 0x6E, 0xFD, 0xD1, 0x02, 0x31, 0xC4,
+    0xC5, 0x63, 0x66, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x73, 0x74, 0x77, 0x7A, 0x2E, 0x61, 0x65, 0x79,
+    0xF6, 0x15, 0xFF, 0x90, 0xFF, 0x9B, 0xF6, 0x12, 0xF2, 0x60, 0xFF, 0xA0, 0xF6, 0x12, 0xF2, 0x60,
+    0xF6, 0x12, 0xF6, 0x12, 0xFF, 0xB6, 0xF6, 0x12, 0xF6, 0x12, 0xF2, 0x5D, 0xFF, 0xD1, 0xFF, 0xEB,
+    0xFF, 0xFD, 0x42, 0x2E, 0x68, 0xF2, 0x27, 0xF2, 0x2F, 0x41, 0x7A, 0xF2, 0x28, 0x41, 0x72, 0xFC,
+    0x18, 0x21, 0x65, 0xFC, 0x21, 0x6E, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x7A, 0xFD, 0x21, 0x72, 0xFD,
+    0x43, 0x2E, 0x72, 0x6F, 0xF2, 0x09, 0xFF, 0xE9, 0xFF, 0xFD, 0x42, 0x2E, 0x72, 0xF1, 0xFF, 0xF2,
+    0xD9, 0x41, 0x65, 0xD0, 0x0F, 0x21, 0x6C, 0xFC, 0x21, 0x74, 0xFD, 0x41, 0x7A, 0xCF, 0xE6, 0x21,
+    0x69, 0xFC, 0x21, 0x77, 0xFD, 0x41, 0x74, 0xCF, 0xFB, 0x21, 0x70, 0xFC, 0x21, 0x6F, 0xFD, 0x41,
+    0x6D, 0xCE, 0x7F, 0x21, 0x65, 0xFC, 0x21, 0x74, 0xFD, 0x22, 0x6E, 0x73, 0xF3, 0xFD, 0x59, 0xC5,
+    0x62, 0x64, 0x66, 0x67, 0x73, 0x6E, 0x74, 0x7A, 0x2E, 0xC4, 0x63, 0x68, 0x6A, 0x6B, 0x6C, 0x6D,
+    0x70, 0x72, 0x76, 0x77, 0x78, 0x65, 0x6F, 0x79, 0xFE, 0xD4, 0xF4, 0x1B, 0xF4, 0x1B, 0xF4, 0x1B,
+    0xF4, 0x1B, 0xF4, 0x1B, 0xF4, 0x14, 0xFE, 0xEB, 0xFF, 0x6E, 0xF1, 0xCB, 0xF8, 0x14, 0xFF, 0xA4,
+    0xF1, 0xD3, 0xF1, 0xD3, 0xFF, 0xC2, 0xF1, 0xD3, 0xFF, 0xCC, 0xF1, 0xD3, 0xF1, 0xD3, 0xF1, 0xD3,
+    0xF1, 0xD3, 0xF1, 0xD3, 0xFF, 0xDA, 0xFF, 0xE4, 0xFF, 0xFB, 0x43, 0x6B, 0x7A, 0x2E, 0xF1, 0xEF,
+    0xFC, 0x9B, 0xF1, 0x7F, 0xA0, 0x18, 0x73, 0x21, 0x74, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x79, 0xFD,
+    0x41, 0x74, 0xE0, 0xAB, 0x21, 0x75, 0xFC, 0x21, 0x7A, 0xFD, 0x21, 0x72, 0xFD, 0x21, 0x64, 0xFD,
+    0x21, 0x6F, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x62, 0xFD, 0x21, 0x72, 0xFD, 0x41, 0x69, 0xCF, 0x45,
+    0x21, 0x6E, 0xFC, 0x21, 0x64, 0xFD, 0x21, 0x6F, 0xFD, 0x21, 0x67, 0xFD, 0x59, 0xC4, 0xC5, 0x62,
+    0x63, 0x64, 0x66, 0x67, 0x6B, 0x6D, 0x6E, 0x70, 0x73, 0x7A, 0x6C, 0x72, 0x74, 0x2E, 0x68, 0x6A,
+    0x76, 0x77, 0x78, 0x6F, 0x75, 0x79, 0xF3, 0x9E, 0xF4, 0xE2, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D,
+    0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D, 0xF3, 0x8D,
+    0xFC, 0x59, 0xFF, 0xBE, 0xF3, 0xC3, 0xF1, 0x3D, 0xF1, 0x45, 0xF1, 0x45, 0xF1, 0x45, 0xF1, 0x45,
+    0xF1, 0x45, 0xFF, 0xD1, 0xFF, 0xED, 0xFF, 0xFD, 0x41, 0x64, 0xF6, 0x6C, 0x41, 0x73, 0xF6, 0x68,
+    0xC3, 0x14, 0x82, 0x61, 0x6F, 0x2E, 0xFF, 0xF8, 0xFF, 0xFC, 0xF0, 0xE9, 0x45, 0x82, 0x84, 0x9B,
+    0xBA, 0xBC, 0xFF, 0xF4, 0xF3, 0x2D, 0xF3, 0x2D, 0xF3, 0x2D, 0xF3, 0x2D, 0x21, 0x61, 0xE0, 0xC2,
+    0x14, 0x82, 0x7A, 0x2E, 0xFF, 0xFD, 0xF0, 0xCA, 0xA0, 0x18, 0xA3, 0x21, 0x64, 0xFD, 0x21, 0x6E,
+    0xFD, 0x21, 0x65, 0xFD, 0x21, 0x6B, 0xFD, 0x42, 0x66, 0x6D, 0xEB, 0x53, 0xEB, 0x53, 0x21, 0x74,
+    0xF9, 0x22, 0x65, 0x73, 0xF3, 0xFD, 0x57, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x6A, 0x6B,
+    0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x7A, 0x77, 0x2E, 0x68, 0x76, 0x78, 0x65, 0xF3, 0x04,
+    0xFF, 0xC6, 0xF2, 0xF3, 0xFF, 0xD9, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3,
+    0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3, 0xF2, 0xF3,
+    0xF3, 0x29, 0xF0, 0xA3, 0xF0, 0xAB, 0xF0, 0xAB, 0xF0, 0xAB, 0xFF, 0xFB, 0x45, 0x9B, 0x82, 0x84,
+    0xBA, 0xBC, 0xF2, 0xAD, 0xF0, 0x65, 0xF0, 0x65, 0xF0, 0x65, 0xF0, 0x65, 0xC4, 0x14, 0x82, 0x6B,
+    0x6E, 0x2E, 0x72, 0xF0, 0xBD, 0xF0, 0xBD, 0xF0, 0x4D, 0xFD, 0x66, 0x41, 0x70, 0xEA, 0x32, 0x21,
+    0x70, 0xFC, 0x57, 0xC4, 0xC5, 0x63, 0x64, 0x66, 0x6B, 0x70, 0x73, 0x74, 0x7A, 0x2E, 0x62, 0x67,
+    0x68, 0x6A, 0x6C, 0x6D, 0x6E, 0x72, 0x76, 0x77, 0x78, 0x65, 0xF2, 0x98, 0xFF, 0xDA, 0xF2, 0x87,
+    0xFF, 0xEA, 0xF2, 0x87, 0xF2, 0x87, 0xF2, 0x87, 0xF2, 0x87, 0xF2, 0x87, 0xF2, 0xBD, 0xF0, 0x37,
+    0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F,
+    0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xFF, 0xFD, 0xA0, 0x15, 0xB3, 0x21, 0x73, 0xFD, 0x21, 0x6B,
+    0xFD, 0x21, 0x6C, 0xFD, 0x57, 0x2E, 0xC4, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B,
+    0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78, 0x7A, 0x6F, 0xEF, 0xE5, 0xF6, 0x2E,
+    0xF6, 0x32, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED,
+    0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED,
+    0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xEF, 0xED, 0xFF, 0xFD, 0x56, 0x2E, 0xC4, 0xC5, 0x62, 0x63,
+    0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72, 0x73, 0x74, 0x76, 0x77, 0x78,
+    0x7A, 0xEF, 0x9F, 0xF5, 0xE8, 0xF5, 0xEC, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF,
+    0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF,
+    0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xEF, 0xA7, 0xA0, 0x00, 0xD1,
+    0xC6, 0x02, 0x61, 0x75, 0x79, 0x61, 0x65, 0x69, 0x6F, 0xFF, 0xFD, 0xFF, 0xFD, 0xF0, 0x33, 0xF0,
+    0x33, 0xF0, 0x33, 0xF0, 0x33, 0xA0, 0x04, 0xF2, 0x21, 0x63, 0xFD, 0x21, 0x61, 0xFD, 0x21, 0x7A,
+    0xFD, 0xA0, 0x04, 0xE2, 0x21, 0x7A, 0xFD, 0xA1, 0x00, 0xD1, 0x73, 0xFD, 0xC7, 0x02, 0x61, 0x72,
+    0x75, 0x79, 0x61, 0x65, 0x69, 0x6F, 0xFF, 0xF2, 0xFF, 0xFB, 0xFF, 0xD1, 0xF0, 0x07, 0xF0, 0x07,
+    0xF0, 0x07, 0xF0, 0x07, 0x22, 0x85, 0x99, 0xB9, 0xB9, 0x21, 0xB3, 0xB4, 0x41, 0x6B, 0xE9, 0xB1,
+    0x21, 0x63, 0xFC, 0x21, 0x75, 0xFD, 0x21, 0x72, 0xFD, 0x21, 0x62, 0xFD, 0x21, 0x73, 0xFD, 0x41,
+    0x63, 0xE9, 0x9E, 0x21, 0x75, 0xFC, 0x21, 0x72, 0xFD, 0x21, 0x62, 0xFD, 0x22, 0x6E, 0x73, 0xF0,
+    0xFD, 0xC9, 0x02, 0x61, 0xC4, 0xC3, 0x61, 0x65, 0x69, 0x6F, 0x75, 0x79, 0x6E, 0xFF, 0xD3, 0xFF,
+    0xD8, 0xFF, 0x8C, 0xFF, 0x8C, 0xFF, 0x8C, 0xFF, 0x8C, 0xFF, 0x8C, 0xFF, 0x8C, 0xFF, 0xFB, 0x41,
+    0x72, 0xDB, 0xBC, 0x21, 0x74, 0xFC, 0x21, 0x73, 0xFD, 0x21, 0x69, 0xFD, 0x21, 0x6D, 0xFD, 0x21,
+    0x68, 0xFD, 0x41, 0x65, 0xFC, 0xD3, 0x21, 0x73, 0xFC, 0x21, 0x66, 0xFD, 0xC8, 0x02, 0x61, 0x79,
+    0x61, 0x63, 0x65, 0x66, 0x69, 0x6F, 0x75, 0xFF, 0x51, 0xEF, 0x87, 0xFF, 0xF3, 0xEF, 0x87, 0xFF,
+    0xFD, 0xEF, 0x87, 0xEF, 0x87, 0xEF, 0x87, 0xC6, 0x02, 0x61, 0x79, 0x61, 0x65, 0x69, 0x6F, 0x75,
+    0xFF, 0x36, 0xEF, 0x6C, 0xEF, 0x6C, 0xEF, 0x6C, 0xEF, 0x6C, 0xEF, 0x6C, 0xC5, 0x02, 0x61, 0x61,
+    0x65, 0x69, 0x6F, 0x75, 0xEF, 0x57, 0xEF, 0x57, 0xEF, 0x57, 0xEF, 0x57, 0xEF, 0x57, 0x5D, 0x2E,
+    0xC4, 0xC3, 0xC5, 0x62, 0x63, 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x72,
+    0x73, 0x74, 0x77, 0x7A, 0x76, 0x78, 0x61, 0x65, 0x69, 0x6F, 0x75, 0x79, 0xEE, 0x19, 0xEE, 0xB6,
+    0xEE, 0xCC, 0xF0, 0xA4, 0xF1, 0xC1, 0xF2, 0xE7, 0xF4, 0x6B, 0xF5, 0x1C, 0xF5, 0xC4, 0xF6, 0x3C,
+    0xF6, 0xA5, 0xF7, 0x4A, 0xF7, 0xC5, 0xF8, 0xB7, 0xF9, 0x28, 0xFA, 0x5D, 0xFB, 0x2E, 0xFC, 0xA0,
+    0xFD, 0x2E, 0xFD, 0xC8, 0xFE, 0x34, 0xFE, 0x86, 0xFE, 0xCC, 0xFF, 0x12, 0xFF, 0x3E, 0xFF, 0x83,
+    0xFF, 0xBE, 0xFF, 0xD9, 0xFF, 0xEE,
+};
+
+constexpr SerializedHyphenationPatterns pl_patterns = {
+    0x3C4Eu,
+    pl_trie_data,
+    sizeof(pl_trie_data),
+};
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
index ada60695..3da4120e 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-ru.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t ru_trie_data[] = {
diff --git a/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h b/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
index cfa0a27f..0c8480df 100644
--- a/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
+++ b/lib/Epub/Epub/hyphenation/generated/hyph-uk.trie.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t uk_trie_data[] = {
diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
index 4753d913..70faafbd 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
@@ -5,55 +5,50 @@
 #include <GfxRenderer.h>
 #include <HalStorage.h>
 #include <Logging.h>
+#include <MemoryBudget.h>
 #include <Utf8.h>
 #include <XmlParserUtils.h>
 #include <expat.h>
 
 #include <cstdlib>
+#include <iterator>
 #include <new>
 
-#include "../../Epub.h"
-#include "../Page.h"
-#include "../converters/ImageDecoderFactory.h"
-#include "../converters/ImageToFramebufferDecoder.h"
-#include "../htmlEntities.h"
-
-const char* HEADER_TAGS[] = {"h1", "h2", "h3", "h4", "h5", "h6"};
-constexpr int NUM_HEADER_TAGS = sizeof(HEADER_TAGS) / sizeof(HEADER_TAGS[0]);
+#include "Epub.h"
+#include "Epub/Page.h"
+#include "Epub/converters/ImageDecoderFactory.h"
+#include "Epub/converters/ImageToFramebufferDecoder.h"
+#include "Epub/htmlEntities.h"
 
 // Minimum file size (in bytes) to show indexing popup - smaller chapters don't benefit from it
 constexpr size_t MIN_SIZE_FOR_POPUP = 10 * 1024;  // 10KB
 constexpr size_t PARSE_BUFFER_SIZE = 1024;
 constexpr size_t IMAGE_EXTRACT_CHUNK_SIZE = 1024;
-constexpr size_t MIN_FREE_HEAP_FOR_IMAGE_EXTRACT = 48 * 1024;
-constexpr size_t MIN_MAX_ALLOC_FOR_IMAGE_EXTRACT = 36 * 1024;
-
-const char* BLOCK_TAGS[] = {"p", "li", "div", "br", "blockquote"};
-constexpr int NUM_BLOCK_TAGS = sizeof(BLOCK_TAGS) / sizeof(BLOCK_TAGS[0]);
-
-const char* BOLD_TAGS[] = {"b", "strong"};
-constexpr int NUM_BOLD_TAGS = sizeof(BOLD_TAGS) / sizeof(BOLD_TAGS[0]);
-
-const char* ITALIC_TAGS[] = {"i", "em"};
-constexpr int NUM_ITALIC_TAGS = sizeof(ITALIC_TAGS) / sizeof(ITALIC_TAGS[0]);
-
-const char* UNDERLINE_TAGS[] = {"u", "ins"};
-constexpr int NUM_UNDERLINE_TAGS = sizeof(UNDERLINE_TAGS) / sizeof(UNDERLINE_TAGS[0]);
-
-const char* STRIKETHROUGH_TAGS[] = {"s", "strike", "del"};
-constexpr int NUM_STRIKETHROUGH_TAGS = sizeof(STRIKETHROUGH_TAGS) / sizeof(STRIKETHROUGH_TAGS[0]);
-
-const char* IMAGE_TAGS[] = {"img"};
-constexpr int NUM_IMAGE_TAGS = sizeof(IMAGE_TAGS) / sizeof(IMAGE_TAGS[0]);
-
-const char* SKIP_TAGS[] = {"head"};
-constexpr int NUM_SKIP_TAGS = sizeof(SKIP_TAGS) / sizeof(SKIP_TAGS[0]);
+// FlexBLE: NimBLE eats ~50-58 KB once a remote is paired, which pushes the
+// reader very close to upstream's original 48 KB / 24 KB floor. Layout
+// genuinely works on tighter budgets; v1.2.9.4 had no floor at all and
+// chapters loaded fine. Field measurement on a Game-Brick-paired session:
+// parser's peak transient use during character-data parsing dipped free
+// heap to ~27 KB on a heavier chapter — still well above OOM, but below
+// our previous 32 KB floor. Drop to 22/12 KB so those chapters layout
+// instead of aborting; if the parser does run out of memory mid-build it
+// still aborts via individual allocation failures further down (same UX).
+constexpr uint32_t MIN_FREE_HEAP_FOR_TEXT_LAYOUT = 16 * 1024;
+constexpr uint32_t MIN_MAX_ALLOC_FOR_TEXT_LAYOUT = 10 * 1024;
+
+static constexpr const char* const HEADER_TAGS[] = {"h1", "h2", "h3", "h4", "h5", "h6"};
+static constexpr const char* const BLOCK_TAGS[] = {"p", "li", "div", "br", "blockquote"};
+static constexpr const char* const BOLD_TAGS[] = {"b", "strong"};
+static constexpr const char* const ITALIC_TAGS[] = {"i", "em"};
+static constexpr const char* const UNDERLINE_TAGS[] = {"u", "ins"};
+static constexpr const char* const STRIKETHROUGH_TAGS[] = {"s", "strike", "del"};
+static constexpr const char* const IMAGE_TAGS[] = {"img"};
+static constexpr const char* const SKIP_TAGS[] = {"head"};
 
 bool isWhitespace(const char c) { return c == ' ' || c == '\r' || c == '\n' || c == '\t'; }
 
-// given the start and end of a tag, check to see if it matches a known tag
-bool matches(const char* tag_name, const char* possible_tags[], const int possible_tag_count) {
-  for (int i = 0; i < possible_tag_count; i++) {
+bool matches(const char* tag_name, const char* const* possible_tags, size_t count) {
+  for (size_t i = 0; i < count; i++) {
     if (strcmp(tag_name, possible_tags[i]) == 0) {
       return true;
     }
@@ -80,7 +75,7 @@ bool isInternalEpubLink(const char* href) {
 }
 
 bool isHeaderOrBlock(const char* name) {
-  return matches(name, HEADER_TAGS, NUM_HEADER_TAGS) || matches(name, BLOCK_TAGS, NUM_BLOCK_TAGS);
+  return matches(name, HEADER_TAGS, std::size(HEADER_TAGS)) || matches(name, BLOCK_TAGS, std::size(BLOCK_TAGS));
 }
 
 bool isTableStructuralTag(const char* name) {
@@ -96,6 +91,7 @@ void ChapterHtmlSlimParser::updateEffectiveInlineStyle() {
       currentCssStyle.hasTextDecoration() && currentCssStyle.textDecoration == CssTextDecoration::Underline;
   effectiveStrikethrough =
       currentCssStyle.hasTextDecoration() && currentCssStyle.textDecoration == CssTextDecoration::LineThrough;
+  effectiveBackgroundBlack = currentCssStyle.hasBackgroundBlack() && currentCssStyle.backgroundBlack;
 
   // Apply inline style stack in order
   for (const auto& entry : inlineStyleStack) {
@@ -111,11 +107,36 @@ void ChapterHtmlSlimParser::updateEffectiveInlineStyle() {
     if (entry.hasStrikethrough) {
       effectiveStrikethrough = entry.strikethrough;
     }
+    if (entry.hasBackgroundBlack) {
+      effectiveBackgroundBlack = entry.backgroundBlack;
+    }
   }
 }
 
+bool ChapterHtmlSlimParser::shouldAbortForLowMemory(const char* stage) {
+  if (lowMemoryAbort) {
+    return true;
+  }
+
+  const auto heap = MemoryBudget::snapshot();
+  if (heap.freeHeap >= MIN_FREE_HEAP_FOR_TEXT_LAYOUT && heap.maxAllocHeap >= MIN_MAX_ALLOC_FOR_TEXT_LAYOUT) {
+    return false;
+  }
+
+  LOG_ERR("EHP", "Low heap during %s (%u free, %u max alloc); aborting section build", stage, heap.freeHeap,
+          heap.maxAllocHeap);
+  lowMemoryAbort = true;
+  return true;
+}
+
 // flush the contents of partWordBuffer to currentTextBlock
 void ChapterHtmlSlimParser::flushPartWordBuffer() {
+  if (lowMemoryAbort) {
+    partWordBufferIndex = 0;
+    nextWordContinues = false;
+    return;
+  }
+
   // Determine font style from depth-based tracking and CSS effective style
   const bool isBold = boldUntilDepth < depth || effectiveBold;
   const bool isItalic = italicUntilDepth < depth || effectiveItalic;
@@ -139,24 +160,23 @@ void ChapterHtmlSlimParser::flushPartWordBuffer() {
 
   // flush the buffer
   partWordBuffer[partWordBufferIndex] = '\0';
-  currentTextBlock->addWord(partWordBuffer, fontStyle, false, nextWordContinues);
+  currentTextBlock->addWord(partWordBuffer, fontStyle, false, nextWordContinues, effectiveBackgroundBlack);
   partWordBufferIndex = 0;
   nextWordContinues = false;
 }
 
 // start a new text block if needed
 void ChapterHtmlSlimParser::startNewTextBlock(const BlockStyle& blockStyle) {
+  if (shouldAbortForLowMemory("text block start")) {
+    return;
+  }
+
   nextWordContinues = false;  // New block = new paragraph, no continuation
   if (currentTextBlock) {
     // already have a text block running and it is empty - just reuse it
     if (currentTextBlock->isEmpty()) {
-      // Merge with existing block style to accumulate CSS styling from parent block elements.
-      // This handles cases like <div style="margin-bottom:2em"><h1>text</h1></div> where the
-      // div's margin should be preserved, even though it has no direct text content.
-
       BlockStyle incoming = blockStyle;
       const bool currentIsEmptyBr = currentTextBlock->getBlockStyle().fromBrElement;
-      const bool incomingIsBr = incoming.fromBrElement;
       if (currentIsEmptyBr) {
         // The empty block was created by a <br> section separator. Inject a full line of
         // blank space before the following paragraph so the scene/section break is visible.
@@ -165,7 +185,10 @@ void ChapterHtmlSlimParser::startNewTextBlock(const BlockStyle& blockStyle) {
         incoming.marginTop = static_cast<int16_t>(incoming.marginTop + lineHeight);
       }
 
-      auto combinedStyle = currentTextBlock->getBlockStyle().getCombinedBlockStyle(incoming);
+      // The stack accumulates horizontal properties from ancestors. Vertical margins are
+      // per-element; merge them only while the placeholder block is still empty.
+      const auto style = currentTextBlock->getBlockStyle();
+      auto combinedStyle = style.getCombinedBlockStyle(incoming, BlockStyle::CombineAxis::Vertical);
       combinedStyle.fromBrElement = incoming.fromBrElement;
       currentTextBlock->setBlockStyle(combinedStyle);
 
@@ -189,6 +212,10 @@ void ChapterHtmlSlimParser::startNewTextBlock(const BlockStyle& blockStyle) {
 }
 
 void ChapterHtmlSlimParser::finalizeCurrentTableCell() {
+  if (lowMemoryAbort) {
+    return;
+  }
+
   if (!currentTableBuffer || tableDepth != 1 || !currentTextBlock) {
     return;
   }
@@ -227,6 +254,68 @@ void ChapterHtmlSlimParser::finalizeCurrentTableCell() {
   nextWordContinues = false;
 }
 
+void ChapterHtmlSlimParser::emitHorizontalRule(const BlockStyle& blockStyle) {
+  if (partWordBufferIndex > 0) {
+    flushPartWordBuffer();
+  }
+
+  if (currentTextBlock && !currentTextBlock->isEmpty()) {
+    const BlockStyle parentBlockStyle = currentTextBlock->getBlockStyle();
+    startNewTextBlock(parentBlockStyle);
+  }
+
+  if (!currentPage) {
+    currentPage.reset(new (std::nothrow) Page());
+    if (!currentPage) {
+      LOG_ERR("EHP", "Failed to create page for horizontal rule");
+      return;
+    }
+    currentPageNextY = 0;
+  }
+
+  const int16_t lineHeight = static_cast<int16_t>(renderer.getLineHeight(fontId) * lineCompression + 0.5f);
+  const int16_t defaultVerticalSpacing = static_cast<int16_t>(lineHeight / 2);
+  const int16_t topSpacing =
+      static_cast<int16_t>((blockStyle.marginTop > 0 ? blockStyle.marginTop : defaultVerticalSpacing) +
+                           (blockStyle.paddingTop > 0 ? blockStyle.paddingTop : 0));
+  const int16_t bottomSpacing =
+      static_cast<int16_t>((blockStyle.marginBottom > 0 ? blockStyle.marginBottom : defaultVerticalSpacing) +
+                           (blockStyle.paddingBottom > 0 ? blockStyle.paddingBottom : 0));
+  constexpr uint8_t ruleThickness = 2;
+  const int16_t availableWidth =
+      std::max<int16_t>(1, static_cast<int16_t>(viewportWidth - blockStyle.totalHorizontalInset()));
+  const int16_t width = std::max<int16_t>(1, static_cast<int16_t>(availableWidth / 4));
+  const int16_t xPos = static_cast<int16_t>(blockStyle.leftInset() + ((availableWidth - width) / 2));
+  const int16_t totalHeight = static_cast<int16_t>(topSpacing + ruleThickness + bottomSpacing);
+
+  if (!currentPage->elements.empty() && currentPageNextY + totalHeight > viewportHeight) {
+    completePageFn(std::move(currentPage), xpathParagraphIndex, xpathListItemIndex);
+    completedPageCount++;
+    currentPage.reset(new (std::nothrow) Page());
+    if (!currentPage) {
+      LOG_ERR("EHP", "Failed to create page after horizontal-rule page break");
+      return;
+    }
+    currentPageNextY = 0;
+  }
+
+  currentPageNextY += topSpacing;
+
+  auto pageRule = std::shared_ptr<PageHorizontalRule>(
+      new (std::nothrow) PageHorizontalRule(width, ruleThickness, xPos, currentPageNextY));
+  if (!pageRule) {
+    LOG_ERR("EHP", "Failed to create PageHorizontalRule");
+    return;
+  }
+  currentPage->elements.push_back(pageRule);
+  currentPageNextY = static_cast<int16_t>(currentPageNextY + ruleThickness + bottomSpacing);
+
+  if (!pendingAnchorId.empty()) {
+    anchorData.push_back({std::move(pendingAnchorId), static_cast<uint16_t>(completedPageCount)});
+    pendingAnchorId.clear();
+  }
+}
+
 void ChapterHtmlSlimParser::emitBufferedTableAsParagraphs(BufferedTable& table) {
   if (!currentPage) {
     currentPage.reset(new Page());
@@ -310,7 +399,6 @@ void ChapterHtmlSlimParser::emitBufferedTableAsFragments(BufferedTable& table) {
               viewportHeight);
       return false;
     }
-
     for (size_t colIndex = 0; colIndex < row.cells.size(); colIndex++) {
       const auto& sourceCell = row.cells[colIndex];
       auto& destCell = prepared.fragmentRow.cells[colIndex];
@@ -399,7 +487,7 @@ void ChapterHtmlSlimParser::emitBufferedTableAsFragments(BufferedTable& table) {
           break;
         }
         if (fragmentRows.empty() && currentPageNextY + nextHeight > viewportHeight && !currentPage->elements.empty()) {
-          completePageFn(std::move(currentPage), xpathParagraphIndex);
+          completePageFn(std::move(currentPage), xpathParagraphIndex, xpathListItemIndex);
           completedPageCount++;
           currentPage.reset(new Page());
           currentPageNextY = 0;
@@ -430,7 +518,7 @@ void ChapterHtmlSlimParser::emitBufferedTableAsFragments(BufferedTable& table) {
       currentPageNextY += fragmentHeight;
 
       if (nextRowIndex < segment.rows.size()) {
-        completePageFn(std::move(currentPage), xpathParagraphIndex);
+        completePageFn(std::move(currentPage), xpathParagraphIndex, xpathListItemIndex);
         completedPageCount++;
         currentPage.reset(new Page());
         currentPageNextY = 0;
@@ -474,6 +562,9 @@ void ChapterHtmlSlimParser::emitCurrentTableBuffer() {
 
 void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char* name, const XML_Char** atts) {
   auto* self = static_cast<ChapterHtmlSlimParser*>(userData);
+  if (self->shouldAbortForLowMemory("element start")) {
+    return;
+  }
 
   // Middle of skip
   if (self->skipUntilDepth < self->depth) {
@@ -481,6 +572,13 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     return;
   }
 
+  if (strcmp(name, "p") == 0) {
+    self->xpathParagraphIndex++;
+  }
+  if (strcmp(name, "li") == 0) {
+    self->xpathListItemIndex++;
+  }
+
   // Extract class, style, and id attributes
   std::string classAttr;
   std::string styleAttr;
@@ -510,6 +608,9 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       CssStyle inlineStyle = CssParser::parseInlineStyle(styleAttr);
       cssStyle.applyOver(inlineStyle);
     }
+    if (self->shouldAbortForLowMemory("CSS style resolution")) {
+      return;
+    }
   }
 
   // Skip elements with display:none before all fast paths (tables, links, etc.).
@@ -597,6 +698,10 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       headerStyle.depth = self->depth;
       headerStyle.hasBold = true;
       headerStyle.bold = true;
+      if (cssStyle.hasBackgroundBlack()) {
+        headerStyle.hasBackgroundBlack = true;
+        headerStyle.backgroundBlack = cssStyle.backgroundBlack;
+      }
       self->inlineStyleStack.push_back(headerStyle);
       self->updateEffectiveInlineStyle();
     }
@@ -608,7 +713,7 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
   }
 
   if (self->tableDepth == 1 &&
-      (matches(name, HEADER_TAGS, NUM_HEADER_TAGS) || matches(name, BLOCK_TAGS, NUM_BLOCK_TAGS))) {
+      (matches(name, HEADER_TAGS, std::size(HEADER_TAGS)) || matches(name, BLOCK_TAGS, std::size(BLOCK_TAGS)))) {
     // Treat block/header tags inside a table cell as transparent wrappers around the
     // cell's text content instead of forcing the whole table back to paragraph mode.
     // This covers common EPUB patterns like <td><p>...</p></td> and
@@ -622,7 +727,7 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     return;
   }
 
-  if (self->tableDepth == 1 && matches(name, IMAGE_TAGS, NUM_IMAGE_TAGS)) {
+  if (self->tableDepth == 1 && matches(name, IMAGE_TAGS, std::size(IMAGE_TAGS))) {
     if (self->currentTableBuffer) {
       self->currentTableBuffer->unsupported = true;
     }
@@ -639,7 +744,16 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     return;
   }
 
-  if (matches(name, IMAGE_TAGS, NUM_IMAGE_TAGS)) {
+  if (self->tableDepth == 1 && strcmp(name, "hr") == 0) {
+    if (self->currentTableBuffer) {
+      self->currentTableBuffer->unsupported = true;
+    }
+    self->ancestorStack_.push_back({self->depth, std::string(name), classAttr});
+    self->depth += 1;
+    return;
+  }
+
+  if (matches(name, IMAGE_TAGS, std::size(IMAGE_TAGS))) {
     std::string src;
     std::string alt;
     if (atts != nullptr) {
@@ -683,13 +797,20 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
         LOG_DBG("EHP", "Found image: src=%s", src.c_str());
 
         {
-          const uint32_t freeHeap = ESP.getFreeHeap();
-          const uint32_t maxAllocHeap = ESP.getMaxAllocHeap();
-          if (!self->lowMemoryImageFallback &&
-              (freeHeap < MIN_FREE_HEAP_FOR_IMAGE_EXTRACT || maxAllocHeap < MIN_MAX_ALLOC_FOR_IMAGE_EXTRACT)) {
+          const auto releaseHeapBefore = MemoryBudget::snapshot();
+          if (MemoryBudget::shouldReleaseSdFontCachesForEpubInlineImage(releaseHeapBefore) &&
+              self->renderer.releaseSdCardFontForLowMemory(self->fontId)) {
+            const auto releaseHeapAfter = MemoryBudget::snapshot();
+            LOG_DBG("EHP", "Released SD font caches before image extraction: free=%u->%u maxAlloc=%u->%u src=%s",
+                    releaseHeapBefore.freeHeap, releaseHeapAfter.freeHeap, releaseHeapBefore.maxAllocHeap,
+                    releaseHeapAfter.maxAllocHeap, src.c_str());
+          }
+
+          const auto heapBeforeImage = MemoryBudget::snapshot();
+          LOG_DBG("EHP", "Heap before image extraction: free=%u maxAlloc=%u src=%s", heapBeforeImage.freeHeap,
+                  heapBeforeImage.maxAllocHeap, src.c_str());
+          if (!self->lowMemoryImageFallback && !MemoryBudget::hasHeapForEpubInlineImage("EHP", src.c_str())) {
             self->lowMemoryImageFallback = true;
-            LOG_ERR("EHP", "Low heap before image extraction (%u free, %u max alloc); suppressing inline images",
-                    freeHeap, maxAllocHeap);
           }
 
           if (self->lowMemoryImageFallback) {
@@ -721,19 +842,16 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
               }
 
               if (extractSuccess) {
+                LOG_DBG("EHP", "Heap after image extraction: free=%u maxAlloc=%u path=%s", ESP.getFreeHeap(),
+                        ESP.getMaxAllocHeap(), cachedImagePath.c_str());
                 // Get image dimensions
                 ImageDimensions dims = {0, 0};
                 ImageToFramebufferDecoder* decoder = ImageDecoderFactory::getDecoder(cachedImagePath);
                 if (decoder && decoder->getDimensions(cachedImagePath, dims)) {
                   LOG_DBG("EHP", "Image dimensions: %dx%d", dims.width, dims.height);
 
-                  const uint32_t postExtractFreeHeap = ESP.getFreeHeap();
-                  const uint32_t postExtractMaxAllocHeap = ESP.getMaxAllocHeap();
-                  if (postExtractFreeHeap < MIN_FREE_HEAP_FOR_IMAGE_EXTRACT ||
-                      postExtractMaxAllocHeap < MIN_MAX_ALLOC_FOR_IMAGE_EXTRACT) {
+                  if (!MemoryBudget::hasHeapForEpubInlineImage("EHP", cachedImagePath.c_str())) {
                     self->lowMemoryImageFallback = true;
-                    LOG_ERR("EHP", "Low heap after image extraction (%u free, %u max alloc); suppressing image",
-                            postExtractFreeHeap, postExtractMaxAllocHeap);
                     Storage.remove(cachedImagePath.c_str());
                     self->skipUntilDepth = self->depth;
                     self->depth += 1;
@@ -752,19 +870,25 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                   }
                   const bool hasCssHeight = imgStyle.hasImageHeight();
                   const bool hasCssWidth = imgStyle.hasImageWidth();
+                  int containerWidth = self->viewportWidth;
+                  if (self->currentTextBlock) {
+                    const int inset = self->currentTextBlock->getBlockStyle().totalHorizontalInset();
+                    if (inset > 0 && inset < self->viewportWidth) {
+                      containerWidth = self->viewportWidth - inset;
+                    }
+                  }
 
                   if (hasCssHeight && hasCssWidth && dims.width > 0 && dims.height > 0) {
                     // Both CSS height and width set: resolve both, then clamp to viewport preserving requested ratio
                     displayHeight = static_cast<int>(
                         imgStyle.imageHeight.toPixels(emSize, static_cast<float>(self->viewportHeight)) + 0.5f);
                     displayWidth = static_cast<int>(
-                        imgStyle.imageWidth.toPixels(emSize, static_cast<float>(self->viewportWidth)) + 0.5f);
+                        imgStyle.imageWidth.toPixels(emSize, static_cast<float>(containerWidth)) + 0.5f);
                     if (displayHeight < 1) displayHeight = 1;
                     if (displayWidth < 1) displayWidth = 1;
-                    if (displayWidth > self->viewportWidth || displayHeight > self->viewportHeight) {
-                      float scaleX = (displayWidth > self->viewportWidth)
-                                         ? static_cast<float>(self->viewportWidth) / displayWidth
-                                         : 1.0f;
+                    if (displayWidth > containerWidth || displayHeight > self->viewportHeight) {
+                      float scaleX =
+                          (displayWidth > containerWidth) ? static_cast<float>(containerWidth) / displayWidth : 1.0f;
                       float scaleY = (displayHeight > self->viewportHeight)
                                          ? static_cast<float>(self->viewportHeight) / displayHeight
                                          : 1.0f;
@@ -789,8 +913,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                           static_cast<int>(displayHeight * (static_cast<float>(dims.width) / dims.height) + 0.5f);
                       if (displayWidth < 1) displayWidth = 1;
                     }
-                    if (displayWidth > self->viewportWidth) {
-                      displayWidth = self->viewportWidth;
+                    if (displayWidth > containerWidth) {
+                      displayWidth = containerWidth;
                       // Rescale height to preserve aspect ratio when width is clamped
                       displayHeight =
                           static_cast<int>(displayWidth * (static_cast<float>(dims.height) / dims.width) + 0.5f);
@@ -799,10 +923,10 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                     if (displayWidth < 1) displayWidth = 1;
                     LOG_DBG("EHP", "Display size from CSS height: %dx%d", displayWidth, displayHeight);
                   } else if (hasCssWidth && !hasCssHeight && dims.width > 0 && dims.height > 0) {
-                    // Use CSS width (resolve % against viewport width) and derive height from aspect ratio
+                    // Use CSS width (resolve % against container width) and derive height from aspect ratio
                     displayWidth = static_cast<int>(
-                        imgStyle.imageWidth.toPixels(emSize, static_cast<float>(self->viewportWidth)) + 0.5f);
-                    if (displayWidth > self->viewportWidth) displayWidth = self->viewportWidth;
+                        imgStyle.imageWidth.toPixels(emSize, static_cast<float>(containerWidth)) + 0.5f);
+                    if (displayWidth > containerWidth) displayWidth = containerWidth;
                     if (displayWidth < 1) displayWidth = 1;
                     displayHeight =
                         static_cast<int>(displayWidth * (static_cast<float>(dims.height) / dims.width) + 0.5f);
@@ -816,8 +940,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                     if (displayHeight < 1) displayHeight = 1;
                     LOG_DBG("EHP", "Display size from CSS width: %dx%d", displayWidth, displayHeight);
                   } else {
-                    // BScale to fit viewport while preserving aspect ratio
-                    int maxWidth = self->viewportWidth;
+                    // Scale to fit container while preserving aspect ratio
+                    int maxWidth = containerWidth;
                     int maxHeight = self->viewportHeight;
                     float scaleX = (dims.width > maxWidth) ? (float)maxWidth / dims.width : 1.0f;
                     float scaleY = (dims.height > maxHeight) ? (float)maxHeight / dims.height : 1.0f;
@@ -838,10 +962,22 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                     self->startNewTextBlock(parentBlockStyle);
                   }
 
+                  int16_t imageMarginTop = 0;
+                  int16_t imageMarginBottom = 0;
+                  if (self->currentTextBlock && self->currentTextBlock->isEmpty()) {
+                    const auto& bs = self->currentTextBlock->getBlockStyle();
+                    imageMarginTop = bs.topInset();
+                    if (self->blockStyleStack.size() > 1) {
+                      imageMarginBottom = self->blockStyleStack.back().bottomInset();
+                    }
+                  }
+
                   // Create page for image - only break if image won't fit remaining space
                   if (self->currentPage && !self->currentPage->elements.empty() &&
-                      (self->currentPageNextY + displayHeight > self->viewportHeight)) {
-                    self->completePageFn(std::move(self->currentPage), self->xpathParagraphIndex);
+                      (self->currentPageNextY + imageMarginTop + displayHeight + imageMarginBottom >
+                       self->viewportHeight)) {
+                    self->completePageFn(std::move(self->currentPage), self->xpathParagraphIndex,
+                                         self->xpathListItemIndex);
                     self->completedPageCount++;
                     self->currentPage.reset(new (std::nothrow) Page());
                     if (!self->currentPage) {
@@ -858,6 +994,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                     self->currentPageNextY = 0;
                   }
 
+                  self->currentPageNextY += imageMarginTop;
+
                   // Create ImageBlock and add to page
                   auto imageBlock = std::shared_ptr<ImageBlock>(
                       new (std::nothrow) ImageBlock(cachedImagePath, displayWidth, displayHeight));
@@ -873,7 +1011,15 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                     return;
                   }
                   self->currentPage->elements.push_back(pageImage);
-                  self->currentPageNextY += displayHeight;
+                  self->currentPageNextY += displayHeight + imageMarginBottom;
+
+                  if (self->currentTextBlock && self->currentTextBlock->isEmpty()) {
+                    BlockStyle resetStyle;
+                    resetStyle.alignment = (self->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None))
+                                               ? CssTextAlign::Justify
+                                               : static_cast<CssTextAlign>(self->paragraphAlignment);
+                    self->currentTextBlock->setBlockStyle(resetStyle);
+                  }
 
                   self->ancestorStack_.push_back({self->depth, std::string(name), classAttr});
                   self->depth += 1;
@@ -886,8 +1032,8 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
                 Storage.remove(cachedImagePath.c_str());
                 const uint32_t postFailureFreeHeap = ESP.getFreeHeap();
                 const uint32_t postFailureMaxAllocHeap = ESP.getMaxAllocHeap();
-                if (!self->lowMemoryImageFallback && (postFailureFreeHeap < MIN_FREE_HEAP_FOR_IMAGE_EXTRACT ||
-                                                      postFailureMaxAllocHeap < MIN_MAX_ALLOC_FOR_IMAGE_EXTRACT)) {
+                if (!self->lowMemoryImageFallback &&
+                    !MemoryBudget::hasHeapForEpubInlineImage("EHP", cachedImagePath.c_str())) {
                   self->lowMemoryImageFallback = true;
                   LOG_ERR("EHP", "Disabling remaining image extraction after failure (%u free, %u max alloc)",
                           postFailureFreeHeap, postFailureMaxAllocHeap);
@@ -902,7 +1048,9 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       // Fallback to alt text if image processing fails
       if (!alt.empty()) {
         alt = "[Image: " + alt + "]";
-        self->startNewTextBlock(centeredBlockStyle);
+        self->startNewTextBlock(self->blockStyleStack.back()
+                                    .getCombinedBlockStyle(centeredBlockStyle, BlockStyle::CombineAxis::Horizontal)
+                                    .withoutBottom());
         self->italicUntilDepth = std::min(self->italicUntilDepth, self->depth);
         self->ancestorStack_.push_back({self->depth, std::string(name), classAttr});
         self->depth += 1;
@@ -919,7 +1067,7 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     }
   }
 
-  if (matches(name, SKIP_TAGS, NUM_SKIP_TAGS)) {
+  if (matches(name, SKIP_TAGS, std::size(SKIP_TAGS))) {
     // start skip
     self->skipUntilDepth = self->depth;
     self->depth += 1;
@@ -973,6 +1121,10 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       entry.depth = self->depth;
       entry.hasUnderline = true;
       entry.underline = true;
+      if (cssStyle.hasBackgroundBlack()) {
+        entry.hasBackgroundBlack = true;
+        entry.backgroundBlack = cssStyle.backgroundBlack;
+      }
       self->inlineStyleStack.push_back(entry);
       self->updateEffectiveInlineStyle();
 
@@ -1020,7 +1172,27 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     }
   }
 
-  if (matches(name, HEADER_TAGS, NUM_HEADER_TAGS)) {
+  if (strcmp(name, "hr") == 0) {
+    auto hrBlockStyle = BlockStyle::fromCssStyle(cssStyle, emSize, CssTextAlign::Left, self->viewportWidth);
+    if (!self->embeddedStyle) {
+      hrBlockStyle.marginLeft = 0;
+      hrBlockStyle.marginRight = 0;
+      hrBlockStyle.marginTop = 0;
+      hrBlockStyle.marginBottom = 0;
+      hrBlockStyle.paddingLeft = 0;
+      hrBlockStyle.paddingRight = 0;
+      hrBlockStyle.paddingTop = 0;
+      hrBlockStyle.paddingBottom = 0;
+      hrBlockStyle.textIndentDefined = false;
+      hrBlockStyle.textIndent = 0;
+    }
+    self->emitHorizontalRule(hrBlockStyle);
+    self->ancestorStack_.push_back({self->depth, std::string(name), classAttr});
+    self->depth += 1;
+    return;
+  }
+
+  if (matches(name, HEADER_TAGS, std::size(HEADER_TAGS))) {
     self->currentCssStyle = cssStyle;
     auto headerBlockStyle = BlockStyle::fromCssStyle(cssStyle, emSize, CssTextAlign::Center, self->viewportWidth);
     headerBlockStyle.textAlignDefined = true;
@@ -1039,10 +1211,13 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       headerBlockStyle.textIndentDefined = false;
       headerBlockStyle.textIndent = 0;
     }
-    self->startNewTextBlock(headerBlockStyle);
+    const auto accumulated =
+        self->blockStyleStack.back().getCombinedBlockStyle(headerBlockStyle, BlockStyle::CombineAxis::Horizontal);
+    self->blockStyleStack.push_back(accumulated);
+    self->startNewTextBlock(accumulated.withoutBottom());
     self->boldUntilDepth = std::min(self->boldUntilDepth, self->depth);
     self->updateEffectiveInlineStyle();
-  } else if (matches(name, BLOCK_TAGS, NUM_BLOCK_TAGS)) {
+  } else if (matches(name, BLOCK_TAGS, std::size(BLOCK_TAGS))) {
     if (strcmp(name, "br") == 0) {
       if (self->partWordBufferIndex > 0) {
         // flush word preceding <br/> to currentTextBlock before calling startNewTextBlock
@@ -1052,22 +1227,38 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       // the block remains empty (i.e. <br> is a section separator between paragraphs).
       // If the block gets text added before the next block opens it becomes non-empty,
       // goes through makePages() normally, and the flag has no effect (inline <br> case).
-      BlockStyle brStyle = self->currentTextBlock->getBlockStyle();
+      BlockStyle brStyle = self->blockStyleStack.back().withoutBottom();
+      if (self->currentTextBlock) {
+        brStyle = self->currentTextBlock->getBlockStyle();
+      }
       brStyle.fromBrElement = true;
       self->startNewTextBlock(brStyle);
     } else {
       self->currentCssStyle = cssStyle;
-      self->startNewTextBlock(userAlignmentBlockStyle);
-      if (strcmp(name, "p") == 0) {
-        self->xpathParagraphIndex++;
+      const auto accumulated = self->blockStyleStack.back().getCombinedBlockStyle(userAlignmentBlockStyle,
+                                                                                  BlockStyle::CombineAxis::Horizontal);
+      self->blockStyleStack.push_back(accumulated);
+      // Common EPUB shape: <li><p>text</p></li>. Keep the first paragraph in the marker block
+      // so the auto bullet does not become its own orphaned paragraph.
+      const bool reuseListMarkerBlock = strcmp(name, "p") == 0 && self->pendingListMarkerDepth >= 0 &&
+                                        self->depth == self->pendingListMarkerDepth + 1 && self->currentTextBlock &&
+                                        self->currentTextBlock->size() == 1;
+      if (reuseListMarkerBlock) {
+        const auto mergedStyle = self->currentTextBlock->getBlockStyle().getCombinedBlockStyle(
+            accumulated.withoutBottom(), BlockStyle::CombineAxis::Vertical);
+        self->currentTextBlock->setBlockStyle(mergedStyle);
+      } else {
+        self->startNewTextBlock(accumulated.withoutBottom());
       }
       self->updateEffectiveInlineStyle();
 
       if (strcmp(name, "li") == 0) {
-        self->currentTextBlock->addWord("\xe2\x80\xa2", EpdFontFamily::REGULAR);
+        self->currentTextBlock->addWord("\xe2\x80\xa2", EpdFontFamily::REGULAR, false, false,
+                                        self->effectiveBackgroundBlack);
+        self->pendingListMarkerDepth = self->depth;
       }
     }
-  } else if (matches(name, UNDERLINE_TAGS, NUM_UNDERLINE_TAGS)) {
+  } else if (matches(name, UNDERLINE_TAGS, std::size(UNDERLINE_TAGS))) {
     // Flush buffer before style change so preceding text gets current style
     if (self->partWordBufferIndex > 0) {
       self->flushPartWordBuffer();
@@ -1087,9 +1278,13 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       entry.hasItalic = true;
       entry.italic = cssStyle.fontStyle == CssFontStyle::Italic;
     }
+    if (cssStyle.hasBackgroundBlack()) {
+      entry.hasBackgroundBlack = true;
+      entry.backgroundBlack = cssStyle.backgroundBlack;
+    }
     self->inlineStyleStack.push_back(entry);
     self->updateEffectiveInlineStyle();
-  } else if (matches(name, STRIKETHROUGH_TAGS, NUM_STRIKETHROUGH_TAGS)) {
+  } else if (matches(name, STRIKETHROUGH_TAGS, std::size(STRIKETHROUGH_TAGS))) {
     // Flush buffer before style change so preceding text gets current style
     if (self->partWordBufferIndex > 0) {
       self->flushPartWordBuffer();
@@ -1109,9 +1304,13 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       entry.hasItalic = true;
       entry.italic = cssStyle.fontStyle == CssFontStyle::Italic;
     }
+    if (cssStyle.hasBackgroundBlack()) {
+      entry.hasBackgroundBlack = true;
+      entry.backgroundBlack = cssStyle.backgroundBlack;
+    }
     self->inlineStyleStack.push_back(entry);
     self->updateEffectiveInlineStyle();
-  } else if (matches(name, BOLD_TAGS, NUM_BOLD_TAGS)) {
+  } else if (matches(name, BOLD_TAGS, std::size(BOLD_TAGS))) {
     // Flush buffer before style change so preceding text gets current style
     if (self->partWordBufferIndex > 0) {
       self->flushPartWordBuffer();
@@ -1133,9 +1332,13 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       entry.hasStrikethrough = true;
       entry.strikethrough = cssStyle.textDecoration == CssTextDecoration::LineThrough;
     }
+    if (cssStyle.hasBackgroundBlack()) {
+      entry.hasBackgroundBlack = true;
+      entry.backgroundBlack = cssStyle.backgroundBlack;
+    }
     self->inlineStyleStack.push_back(entry);
     self->updateEffectiveInlineStyle();
-  } else if (matches(name, ITALIC_TAGS, NUM_ITALIC_TAGS)) {
+  } else if (matches(name, ITALIC_TAGS, std::size(ITALIC_TAGS))) {
     // Flush buffer before style change so preceding text gets current style
     if (self->partWordBufferIndex > 0) {
       self->flushPartWordBuffer();
@@ -1157,10 +1360,15 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
       entry.hasStrikethrough = true;
       entry.strikethrough = cssStyle.textDecoration == CssTextDecoration::LineThrough;
     }
+    if (cssStyle.hasBackgroundBlack()) {
+      entry.hasBackgroundBlack = true;
+      entry.backgroundBlack = cssStyle.backgroundBlack;
+    }
     self->inlineStyleStack.push_back(entry);
     self->updateEffectiveInlineStyle();
   } else if (strcmp(name, "span") == 0 || !isHeaderOrBlock(name)) {
-    if (cssStyle.hasFontWeight() || cssStyle.hasFontStyle() || cssStyle.hasTextDecoration()) {
+    if (cssStyle.hasFontWeight() || cssStyle.hasFontStyle() || cssStyle.hasTextDecoration() ||
+        cssStyle.hasBackgroundBlack()) {
       // Flush buffer before style change so preceding text gets current style
       if (self->partWordBufferIndex > 0) {
         self->flushPartWordBuffer();
@@ -1182,6 +1390,10 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
         entry.hasStrikethrough = true;
         entry.strikethrough = cssStyle.textDecoration == CssTextDecoration::LineThrough;
       }
+      if (cssStyle.hasBackgroundBlack()) {
+        entry.hasBackgroundBlack = true;
+        entry.backgroundBlack = cssStyle.backgroundBlack;
+      }
       self->inlineStyleStack.push_back(entry);
       self->updateEffectiveInlineStyle();
     }
@@ -1194,6 +1406,9 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
 
 void XMLCALL ChapterHtmlSlimParser::characterData(void* userData, const XML_Char* s, const int len) {
   auto* self = static_cast<ChapterHtmlSlimParser*>(userData);
+  if (self->shouldAbortForLowMemory("character data")) {
+    return;
+  }
 
   // Skip content of nested table
   if (self->tableDepth > 1) {
@@ -1376,6 +1591,9 @@ void XMLCALL ChapterHtmlSlimParser::defaultHandlerExpand(void* userData, const X
 
 void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* name) {
   auto* self = static_cast<ChapterHtmlSlimParser*>(userData);
+  if (self->lowMemoryAbort) {
+    return;
+  }
 
   // Check if any style state will change after we decrement depth
   // If so, we MUST flush the partWordBuffer with the CURRENT style first
@@ -1403,13 +1621,13 @@ void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* n
   // Flush buffer with current style BEFORE any style changes
   if (self->partWordBufferIndex > 0) {
     // Flush if style will change OR if we're closing a block/structural element
-    const bool isInlineTag =
-        !headerOrBlockTag && !tableStructuralTag && !matches(name, IMAGE_TAGS, NUM_IMAGE_TAGS) && self->depth != 1;
-    const bool shouldFlush = styleWillChange || headerOrBlockTag || matches(name, BOLD_TAGS, NUM_BOLD_TAGS) ||
-                             matches(name, ITALIC_TAGS, NUM_ITALIC_TAGS) ||
-                             matches(name, UNDERLINE_TAGS, NUM_UNDERLINE_TAGS) ||
-                             matches(name, STRIKETHROUGH_TAGS, NUM_STRIKETHROUGH_TAGS) || tableStructuralTag ||
-                             matches(name, IMAGE_TAGS, NUM_IMAGE_TAGS) || self->depth == 1;
+    const bool isInlineTag = !headerOrBlockTag && !tableStructuralTag &&
+                             !matches(name, IMAGE_TAGS, std::size(IMAGE_TAGS)) && self->depth != 1;
+    const bool shouldFlush = styleWillChange || headerOrBlockTag || matches(name, BOLD_TAGS, std::size(BOLD_TAGS)) ||
+                             matches(name, ITALIC_TAGS, std::size(ITALIC_TAGS)) ||
+                             matches(name, UNDERLINE_TAGS, std::size(UNDERLINE_TAGS)) ||
+                             matches(name, STRIKETHROUGH_TAGS, std::size(STRIKETHROUGH_TAGS)) || tableStructuralTag ||
+                             matches(name, IMAGE_TAGS, std::size(IMAGE_TAGS)) || self->depth == 1;
 
     if (shouldFlush) {
       self->flushPartWordBuffer();
@@ -1470,6 +1688,10 @@ void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* n
     self->nextWordContinues = false;
   }
 
+  if (strcmp(name, "li") == 0 && self->pendingListMarkerDepth == self->depth) {
+    self->pendingListMarkerDepth = -1;
+  }
+
   // Leaving bold tag
   if (self->boldUntilDepth == self->depth) {
     self->boldUntilDepth = INT_MAX;
@@ -1502,29 +1724,35 @@ void XMLCALL ChapterHtmlSlimParser::endElement(void* userData, const XML_Char* n
     self->currentCssStyle.reset();
     self->updateEffectiveInlineStyle();
 
-    // Reset alignment on empty text blocks to prevent stale alignment from bleeding
-    // into the next sibling element. This fixes issue #1026 where an empty <h1> (default
-    // Center) followed by an image-only <p> causes Center to persist through the chain
-    // of empty block reuse into subsequent text paragraphs.
-    // Margins/padding are preserved so parent element spacing still accumulates correctly.
-    if (self->currentTextBlock && self->currentTextBlock->isEmpty()) {
-      auto style = self->currentTextBlock->getBlockStyle();
-      style.textAlignDefined = false;
-      style.alignment = (self->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None))
-                            ? CssTextAlign::Justify
-                            : static_cast<CssTextAlign>(self->paragraphAlignment);
-      self->currentTextBlock->setBlockStyle(style);
+    // br is self-closing and not a container — it doesn't push/pop the stack.
+    if (strcmp(name, "br") != 0 && self->blockStyleStack.size() > 1) {
+      // Apply closing element's bottom margin to the current text block so
+      // container spacing appears after the element's content (on the last child),
+      // not on the first child via the empty-block merge in startNewTextBlock.
+      if (self->currentTextBlock) {
+        const auto style = self->currentTextBlock->getBlockStyle();
+        self->currentTextBlock->setBlockStyle(style.addBottom(self->blockStyleStack.back()));
+      }
+      self->blockStyleStack.pop_back();
     }
   }
 }
 
 bool ChapterHtmlSlimParser::parseAndBuildPages() {
+  // Initialize block style stack with a root entry representing "no ancestor block elements".
+  // The user's paragraph alignment is set as the default so child elements without explicit
+  // text-align inherit it correctly through getCombinedBlockStyle.
+  BlockStyle rootBlockStyle;
+  rootBlockStyle.alignment = (this->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None))
+                                 ? CssTextAlign::Justify
+                                 : static_cast<CssTextAlign>(this->paragraphAlignment);
+  blockStyleStack.clear();
+  blockStyleStack.reserve(8);
+  blockStyleStack.push_back(rootBlockStyle);
+
   auto paragraphAlignmentBlockStyle = BlockStyle();
   paragraphAlignmentBlockStyle.textAlignDefined = true;
-  // Resolve None sentinel to Justify for initial block (no CSS context yet)
-  const auto align = (this->paragraphAlignment == static_cast<uint8_t>(CssTextAlign::None))
-                         ? CssTextAlign::Justify
-                         : static_cast<CssTextAlign>(this->paragraphAlignment);
+  const auto align = rootBlockStyle.alignment;
   paragraphAlignmentBlockStyle.alignment = align;
   startNewTextBlock(paragraphAlignmentBlockStyle);
 
@@ -1586,20 +1814,35 @@ bool ChapterHtmlSlimParser::parseAndBuildPages() {
       file.close();
       return false;
     }
+
+    if (lowMemoryAbort) {
+      LOG_ERR("EHP", "Aborting section parse due to low heap");
+      destroyXmlParser(parser);
+      file.close();
+      return false;
+    }
+
   } while (!done);
-  LOG_DBG("EHP", "Time to parse and build pages: %lu ms", millis() - chapterStartTime);
+  LOG_DBG("EHP", "Time to parse and build pages: %lu ms (free=%u, maxAlloc=%u)", millis() - chapterStartTime,
+          ESP.getFreeHeap(), ESP.getMaxAllocHeap());
 
   destroyXmlParser(parser);
   file.close();
 
   // Process last page if there is still text
   if (currentTextBlock) {
+    if (shouldAbortForLowMemory("final page layout")) {
+      return false;
+    }
     makePages();
+    if (lowMemoryAbort) {
+      return false;
+    }
     if (!pendingAnchorId.empty()) {
       anchorData.push_back({std::move(pendingAnchorId), static_cast<uint16_t>(completedPageCount)});
       pendingAnchorId.clear();
     }
-    completePageFn(std::move(currentPage), xpathParagraphIndex);
+    completePageFn(std::move(currentPage), xpathParagraphIndex, xpathListItemIndex);
     completedPageCount++;
     currentPage.reset();
     currentTextBlock.reset();
@@ -1617,7 +1860,7 @@ void ChapterHtmlSlimParser::addLineToPage(std::shared_ptr<TextBlock> line) {
   }
 
   if (currentPageNextY + lineHeight > viewportHeight) {
-    completePageFn(std::move(currentPage), xpathParagraphIndex);
+    completePageFn(std::move(currentPage), xpathParagraphIndex, xpathListItemIndex);
     completedPageCount++;
     currentPage.reset(new Page());
     currentPageNextY = 0;
@@ -1639,6 +1882,10 @@ void ChapterHtmlSlimParser::addLineToPage(std::shared_ptr<TextBlock> line) {
 }
 
 void ChapterHtmlSlimParser::makePages() {
+  if (shouldAbortForLowMemory("page layout")) {
+    return;
+  }
+
   if (!currentTextBlock) {
     LOG_ERR("EHP", "!! No text block to make pages for !!");
     return;
diff --git a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
index 1377b8b7..e54b3ecb 100644
--- a/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
+++ b/lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <vector>
 
-#include "../FootnoteEntry.h"
-#include "../ParsedText.h"
-#include "../blocks/ImageBlock.h"
-#include "../blocks/TextBlock.h"
-#include "../css/CssParser.h"
-#include "../css/CssStyle.h"
+#include "Epub/FootnoteEntry.h"
+#include "Epub/ParsedText.h"
+#include "Epub/blocks/ImageBlock.h"
+#include "Epub/blocks/TextBlock.h"
+#include "Epub/css/CssParser.h"
+#include "Epub/css/CssStyle.h"
 
 class Page;
 class GfxRenderer;
@@ -30,7 +30,7 @@ class ChapterHtmlSlimParser {
   std::shared_ptr<Epub> epub;
   const std::string& filepath;
   GfxRenderer& renderer;
-  std::function<void(std::unique_ptr<Page>, uint16_t)> completePageFn;
+  std::function<void(std::unique_ptr<Page>, uint16_t, uint16_t)> completePageFn;
   std::function<void()> popupFn;  // Popup callback
   int depth = 0;
   int skipUntilDepth = INT_MAX;
@@ -63,6 +63,7 @@ class ChapterHtmlSlimParser {
   std::string imageBasePath;
   int imageCounter = 0;
   bool lowMemoryImageFallback = false;
+  bool lowMemoryAbort = false;
 
   // Style tracking (replaces depth-based approach)
   struct StyleStackEntry {
@@ -71,13 +72,16 @@ class ChapterHtmlSlimParser {
     bool hasItalic = false, italic = false;
     bool hasUnderline = false, underline = false;
     bool hasStrikethrough = false, strikethrough = false;
+    bool hasBackgroundBlack = false, backgroundBlack = false;
   };
   std::vector<StyleStackEntry> inlineStyleStack;
+  std::vector<BlockStyle> blockStyleStack;  // accumulated block styles from open ancestor elements
   CssStyle currentCssStyle;
   bool effectiveBold = false;
   bool effectiveItalic = false;
   bool effectiveUnderline = false;
   bool effectiveStrikethrough = false;
+  bool effectiveBackgroundBlack = false;
 
   struct BufferedTableCell {
     std::unique_ptr<ParsedText> text;
@@ -104,6 +108,7 @@ class ChapterHtmlSlimParser {
   int tableDepth = 0;
   int tableRowIndex = 0;
   int tableColIndex = 0;
+  int pendingListMarkerDepth = -1;
   bool currentTableCellIsHeader = false;
   uint8_t currentTableCellColSpan = 1;
   std::unique_ptr<BufferedTable> currentTableBuffer = nullptr;
@@ -114,6 +119,7 @@ class ChapterHtmlSlimParser {
   std::vector<std::pair<std::string, uint16_t>> anchorData;
   std::string pendingAnchorId;  // deferred until after previous text block is flushed
   uint16_t xpathParagraphIndex = 0;
+  uint16_t xpathListItemIndex = 0;
 
   // Footnote link tracking
   bool insideFootnoteLink = false;
@@ -124,9 +130,11 @@ class ChapterHtmlSlimParser {
   int wordsExtractedInBlock = 0;
 
   void updateEffectiveInlineStyle();
+  bool shouldAbortForLowMemory(const char* stage);
   void startNewTextBlock(const BlockStyle& blockStyle);
   void flushPartWordBuffer();
   void makePages();
+  void emitHorizontalRule(const BlockStyle& blockStyle);
   void finalizeCurrentTableCell();
   void emitBufferedTableAsParagraphs(BufferedTable& table);
   void emitBufferedTableAsFragments(BufferedTable& table);
@@ -144,7 +152,7 @@ class ChapterHtmlSlimParser {
                                  const uint16_t viewportWidth, const uint16_t viewportHeight,
                                  const bool hyphenationEnabled, const bool bionicReadingEnabled,
                                  const bool guideReadingEnabled,
-                                 const std::function<void(std::unique_ptr<Page>, uint16_t)>& completePageFn,
+                                 const std::function<void(std::unique_ptr<Page>, uint16_t, uint16_t)>& completePageFn,
                                  const bool embeddedStyle, const std::string& contentBase,
                                  const std::string& imageBasePath, const uint8_t imageRendering = 0,
                                  const std::function<void()>& popupFn = nullptr, const CssParser* cssParser = nullptr)
@@ -175,4 +183,5 @@ class ChapterHtmlSlimParser {
   void addLineToPage(std::shared_ptr<TextBlock> line);
   const std::vector<std::pair<std::string, uint16_t>>& getAnchors() const { return anchorData; }
   bool wasLowMemoryFallbackTriggered() const { return lowMemoryImageFallback; }
+  bool wasLowMemoryAbortTriggered() const { return lowMemoryAbort; }
 };
diff --git a/lib/Epub/Epub/parsers/ContentOpfParser.cpp b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
index f75fd2d0..1707b310 100644
--- a/lib/Epub/Epub/parsers/ContentOpfParser.cpp
+++ b/lib/Epub/Epub/parsers/ContentOpfParser.cpp
@@ -5,7 +5,7 @@
 #include <Serialization.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 namespace {
 constexpr char MEDIA_TYPE_NCX[] = "application/x-dtbncx+xml";
diff --git a/lib/Epub/Epub/parsers/TocNavParser.cpp b/lib/Epub/Epub/parsers/TocNavParser.cpp
index dc293c14..01ca8bef 100644
--- a/lib/Epub/Epub/parsers/TocNavParser.cpp
+++ b/lib/Epub/Epub/parsers/TocNavParser.cpp
@@ -4,7 +4,7 @@
 #include <Logging.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 bool TocNavParser::setup() {
   parser = XML_ParserCreate(nullptr);
diff --git a/lib/Epub/Epub/parsers/TocNcxParser.cpp b/lib/Epub/Epub/parsers/TocNcxParser.cpp
index ac968010..5c0400aa 100644
--- a/lib/Epub/Epub/parsers/TocNcxParser.cpp
+++ b/lib/Epub/Epub/parsers/TocNcxParser.cpp
@@ -4,7 +4,7 @@
 #include <Logging.h>
 #include <XmlParserUtils.h>
 
-#include "../BookMetadataCache.h"
+#include "Epub/BookMetadataCache.h"
 
 bool TocNcxParser::setup() {
   parser = XML_ParserCreate(nullptr);
diff --git a/lib/FsHelpers/FsHelpers.cpp b/lib/FsHelpers/FsHelpers.cpp
index 352e2c26..891190fd 100644
--- a/lib/FsHelpers/FsHelpers.cpp
+++ b/lib/FsHelpers/FsHelpers.cpp
@@ -1,5 +1,6 @@
 #include "FsHelpers.h"
 
+#include <algorithm>
 #include <cctype>
 #include <cstring>
 #include <vector>
@@ -42,6 +43,58 @@ std::string normalisePath(const std::string& path) {
   return result;
 }
 
+void sortFileList(std::vector<std::string>& strs) {
+  std::sort(begin(strs), end(strs), [](const std::string& str1, const std::string& str2) {
+    // Directories first
+    bool isDir1 = str1.back() == '/';
+    bool isDir2 = str2.back() == '/';
+    if (isDir1 != isDir2) return isDir1;
+
+    // Start naive natural sort
+    const char* s1 = str1.c_str();
+    const char* s2 = str2.c_str();
+
+    // Iterate while both strings have characters
+    while (*s1 && *s2) {
+      // Check if both are at the start of a number
+      if (isdigit(*s1) && isdigit(*s2)) {
+        // Skip leading zeros and track them
+        const char* start1 = s1;
+        const char* start2 = s2;
+        while (*s1 == '0') s1++;
+        while (*s2 == '0') s2++;
+
+        // Count digits to compare lengths first
+        int len1 = 0, len2 = 0;
+        while (isdigit(s1[len1])) len1++;
+        while (isdigit(s2[len2])) len2++;
+
+        // Different length so return smaller integer value
+        if (len1 != len2) return len1 < len2;
+
+        // Same length so compare digit by digit
+        for (int i = 0; i < len1; i++) {
+          if (s1[i] != s2[i]) return s1[i] < s2[i];
+        }
+
+        // Numbers equal so advance pointers
+        s1 += len1;
+        s2 += len2;
+      } else {
+        // Regular case-insensitive character comparison
+        char c1 = tolower(*s1);
+        char c2 = tolower(*s2);
+        if (c1 != c2) return c1 < c2;
+        s1++;
+        s2++;
+      }
+    }
+
+    // One string is prefix of other
+    return *s1 == '\0' && *s2 != '\0';
+  });
+}
+
 bool checkFileExtension(std::string_view fileName, const char* extension) {
   const size_t extLen = strlen(extension);
   if (fileName.length() < extLen) {
diff --git a/lib/FsHelpers/FsHelpers.h b/lib/FsHelpers/FsHelpers.h
index b70a3dc8..56c2c987 100644
--- a/lib/FsHelpers/FsHelpers.h
+++ b/lib/FsHelpers/FsHelpers.h
@@ -3,11 +3,14 @@
 
 #include <string>
 #include <string_view>
+#include <vector>
 
 namespace FsHelpers {
 
 std::string normalisePath(const std::string& path);
 
+void sortFileList(std::vector<std::string>& strs);
+
 /**
  * Check if the given filename ends with the specified extension (case-insensitive).
  */
diff --git a/lib/GfxRenderer/BitmapHelpers.cpp b/lib/GfxRenderer/BitmapHelpers.cpp
index dca059ec..2613fa20 100644
--- a/lib/GfxRenderer/BitmapHelpers.cpp
+++ b/lib/GfxRenderer/BitmapHelpers.cpp
@@ -147,4 +147,4 @@ void createBmpHeader(BmpHeader* bmpHeader, int width, int height, BmpRowOrder ro
   bmpHeader->colors[1].rgbGreen = 255;
   bmpHeader->colors[1].rgbRed = 255;
   bmpHeader->colors[1].rgbReserved = 0;
-}
\ No newline at end of file
+}
diff --git a/lib/GfxRenderer/FontCacheManager.cpp b/lib/GfxRenderer/FontCacheManager.cpp
index 98ae2f58..bde1b7be 100644
--- a/lib/GfxRenderer/FontCacheManager.cpp
+++ b/lib/GfxRenderer/FontCacheManager.cpp
@@ -2,23 +2,38 @@
 
 #include <FontDecompressor.h>
 #include <Logging.h>
+#include <SdCardFont.h>
 
 #include <cstring>
 
-FontCacheManager::FontCacheManager(const std::map<int, EpdFontFamily>& fontMap) : fontMap_(fontMap) {}
+FontCacheManager::FontCacheManager(const std::map<int, EpdFontFamily>& fontMap,
+                                   const std::map<int, SdCardFont*>& sdCardFonts)
+    : fontMap_(fontMap), sdCardFonts_(sdCardFonts) {}
 
 void FontCacheManager::setFontDecompressor(FontDecompressor* d) { fontDecompressor_ = d; }
 
 void FontCacheManager::clearCache() {
   if (fontDecompressor_) fontDecompressor_->clearCache();
+  for (auto& [id, font] : sdCardFonts_) {
+    font->clearCache();
+  }
 }
 
 void FontCacheManager::prewarmCache(int fontId, const char* utf8Text, uint8_t styleMask) {
+  // SD card font prewarm path: prewarm all requested styles in one call
+  auto it = sdCardFonts_.find(fontId);
+  if (it != sdCardFonts_.end()) {
+    int missed = it->second->prewarm(utf8Text, styleMask);
+    if (missed > 0) {
+      LOG_DBG("FCM", "prewarmCache(SD): %d glyph(s) not found (styleMask=0x%02X)", missed, styleMask);
+    }
+    return;
+  }
+
+  // Standard compressed font prewarm path: loop over all requested styles
   if (!fontDecompressor_ || fontMap_.count(fontId) == 0) return;
 
-  // Iterate in reverse so REGULAR (index 0) is prewarmed last and stays in the page buffer.
-  // Each prewarmCache call overwrites the previous page buffer, so whichever style runs last
-  // wins. With bionic reading, most rendered text is REGULAR, making it the more valuable cache.
+  // Reverse iteration is harmless now; the decompressor keeps one retained page slot per style.
   for (int8_t i = 3; i >= 0; i--) {
     if (!(styleMask & (1 << i))) continue;
     auto style = static_cast<EpdFontFamily::Style>(i);
@@ -33,10 +48,16 @@ void FontCacheManager::prewarmCache(int fontId, const char* utf8Text, uint8_t st
 
 void FontCacheManager::logStats(const char* label) {
   if (fontDecompressor_) fontDecompressor_->logStats(label);
+  for (auto& [id, font] : sdCardFonts_) {
+    font->logStats(label);
+  }
 }
 
 void FontCacheManager::resetStats() {
   if (fontDecompressor_) fontDecompressor_->resetStats();
+  for (auto& [id, font] : sdCardFonts_) {
+    font->resetStats();
+  }
 }
 
 bool FontCacheManager::isScanning() const { return scanMode_ == ScanMode::Scanning; }
diff --git a/lib/GfxRenderer/FontCacheManager.h b/lib/GfxRenderer/FontCacheManager.h
index f4c14dba..27dde4a0 100644
--- a/lib/GfxRenderer/FontCacheManager.h
+++ b/lib/GfxRenderer/FontCacheManager.h
@@ -7,10 +7,11 @@
 #include <string>
 
 class FontDecompressor;
+class SdCardFont;
 
 class FontCacheManager {
  public:
-  explicit FontCacheManager(const std::map<int, EpdFontFamily>& fontMap);
+  FontCacheManager(const std::map<int, EpdFontFamily>& fontMap, const std::map<int, SdCardFont*>& sdCardFonts);
 
   void setFontDecompressor(FontDecompressor* d);
 
@@ -45,6 +46,7 @@ class FontCacheManager {
 
  private:
   const std::map<int, EpdFontFamily>& fontMap_;
+  const std::map<int, SdCardFont*>& sdCardFonts_;
   FontDecompressor* fontDecompressor_ = nullptr;
 
   enum class ScanMode : uint8_t { None, Scanning };
diff --git a/lib/GfxRenderer/GfxRenderer.cpp b/lib/GfxRenderer/GfxRenderer.cpp
index 69efd276..2df9d127 100644
--- a/lib/GfxRenderer/GfxRenderer.cpp
+++ b/lib/GfxRenderer/GfxRenderer.cpp
@@ -3,10 +3,27 @@
 #include <FontDecompressor.h>
 #include <HalGPIO.h>
 #include <Logging.h>
+#include <SdCardFont.h>
 #include <Utf8.h>
+#include <freertos/task.h>
+
+#include <algorithm>
 
 #include "FontCacheManager.h"
 
+namespace {
+
+const char* resolveVisualText(const char* text, std::string& visualBuffer, int paragraphLevel);
+
+/**
+ * Resolves the requested style to the best available style in the given SD card font.
+ * Falls back gracefully when the font lacks the requested variant.
+ */
+uint8_t resolveSdCardStyle(const SdCardFont& font, const EpdFontFamily::Style style) {
+  return font.resolveStyle(static_cast<uint8_t>(style));
+}
+}  // namespace
+
 const uint8_t* GfxRenderer::getGlyphBitmap(const EpdFontData* fontData, const EpdGlyph* glyph) const {
   if (fontData->groups != nullptr) {
     auto* fd = fontCacheManager_ ? fontCacheManager_->getDecompressor() : nullptr;
@@ -20,9 +37,75 @@ const uint8_t* GfxRenderer::getGlyphBitmap(const EpdFontData* fontData, const Ep
     // must consume it (draw the glyph) before requesting another bitmap.
     return fd->getBitmap(fontData, glyph, glyphIndex);
   }
+  // For SD card fonts, check if the glyph was loaded on demand into the overflow
+  // buffer.  getOverflowBitmap() returns:
+  //   - bitmap pointer for overflow glyphs with bitmap data
+  //   - nullptr for overflow glyphs without bitmap data (e.g. space: width=0, height=0)
+  //   - nullptr for non-overflow glyphs (normal prewarmed path)
+  // We distinguish overflow-with-no-bitmap from non-overflow by checking isOverflowGlyph().
+  if (fontData->glyphMissCtx) {
+    auto* sdFont = SdCardFont::fromMissCtx(fontData->glyphMissCtx);
+    if (sdFont->isOverflowGlyph(glyph)) {
+      return sdFont->getOverflowBitmap(glyph);  // may be nullptr for zero-width glyphs
+    }
+  }
   return &fontData->bitmap[glyph->dataOffset];
 }
 
+GfxRenderer::BitmapScratchLock::BitmapScratchLock(const GfxRenderer& renderer) : renderer_(renderer) {
+  if (renderer_.bitmapScratchMutex_ == nullptr) {
+    LOG_ERR("GFX", "!! Bitmap scratch mutex is not initialized");
+    assert(false);
+    return;
+  }
+
+  const auto takeResult = xSemaphoreTake(renderer_.bitmapScratchMutex_, portMAX_DELAY);
+  if (takeResult != pdTRUE) {
+    LOG_ERR("GFX", "!! Failed to acquire bitmap scratch mutex");
+    assert(false);
+    return;
+  }
+
+  locked_ = true;
+}
+
+GfxRenderer::BitmapScratchLock::~BitmapScratchLock() {
+  if (!locked_) return;
+  xSemaphoreGive(renderer_.bitmapScratchMutex_);
+}
+
+void GfxRenderer::ensureSdCardFontReady(int fontId, const char* utf8Text, uint8_t styleMask) const {
+  auto it = sdCardFonts_.find(fontId);
+  if (it != sdCardFonts_.end()) {
+    int missed = it->second->buildAdvanceTable(utf8Text, styleMask);
+    if (missed > 0) {
+      LOG_DBG("GFX", "ensureSdCardFontReady: %d glyph(s) not found", missed);
+    }
+  }
+}
+
+void GfxRenderer::ensureSdCardFontReady(int fontId, const std::vector<std::string>& words, bool includeHyphen,
+                                        uint8_t styleMask) const {
+  auto it = sdCardFonts_.find(fontId);
+  if (it != sdCardFonts_.end()) {
+    // Augment the persistent advance-only table for layout measurement.
+    // The table survives across paragraphs/sections (capped per font), so
+    // repeated indexing of the same SD font amortizes glyph-metric SD reads.
+    int missed = it->second->buildAdvanceTable(words, includeHyphen, styleMask);
+    if (missed > 0) {
+      LOG_DBG("GFX", "ensureSdCardFontReady: %d glyph(s) not found", missed);
+    }
+  }
+}
+
+bool GfxRenderer::releaseSdCardFontForLowMemory(int fontId) const {
+  auto it = sdCardFonts_.find(fontId);
+  if (it == sdCardFonts_.end()) return false;
+
+  it->second->releaseForLowMemory();
+  return true;
+}
+
 void GfxRenderer::begin() {
   frameBuffer = display.getFrameBuffer();
   if (!frameBuffer) {
@@ -33,10 +116,59 @@ void GfxRenderer::begin() {
   panelHeight = display.getDisplayHeight();
   panelWidthBytes = display.getDisplayWidthBytes();
   frameBufferSize = display.getBufferSize();
-  bwBufferChunks.assign((frameBufferSize + BW_BUFFER_CHUNK_SIZE - 1) / BW_BUFFER_CHUNK_SIZE, nullptr);
 }
 
-void GfxRenderer::insertFont(const int fontId, EpdFontFamily font) { fontMap.insert({fontId, font}); }
+void GfxRenderer::freeBitmapScratchBuffers() {
+  free(bitmapScratchOutputRow_);
+  bitmapScratchOutputRow_ = nullptr;
+  bitmapScratchOutputRowSize_ = 0;
+
+  free(bitmapScratchRowBytes_);
+  bitmapScratchRowBytes_ = nullptr;
+  bitmapScratchRowBytesSize_ = 0;
+}
+
+bool GfxRenderer::bitmapScratchLockHeldByCurrentTask() const {
+  if (bitmapScratchMutex_ == nullptr) return false;
+  return xSemaphoreGetMutexHolder(bitmapScratchMutex_) == xTaskGetCurrentTaskHandle();
+}
+
+bool GfxRenderer::ensureBitmapScratchBuffers(const size_t outputRowSize, const size_t rowBytesSize) const {
+  if (!bitmapScratchLockHeldByCurrentTask()) {
+    LOG_ERR("GFX", "!! Bitmap scratch buffers used without holding scratch mutex");
+    assert(false);
+    return false;
+  }
+
+  if (outputRowSize > bitmapScratchOutputRowSize_) {
+    auto* grownOutput = static_cast<uint8_t*>(realloc(bitmapScratchOutputRow_, outputRowSize));
+    if (!grownOutput) {
+      LOG_ERR("GFX", "!! Failed to grow BMP output row scratch buffer to %zu bytes", outputRowSize);
+      return false;
+    }
+    bitmapScratchOutputRow_ = grownOutput;
+    bitmapScratchOutputRowSize_ = outputRowSize;
+  }
+
+  if (rowBytesSize > bitmapScratchRowBytesSize_) {
+    auto* grownRowBytes = static_cast<uint8_t*>(realloc(bitmapScratchRowBytes_, rowBytesSize));
+    if (!grownRowBytes) {
+      LOG_ERR("GFX", "!! Failed to grow BMP row-bytes scratch buffer to %zu bytes", rowBytesSize);
+      return false;
+    }
+    bitmapScratchRowBytes_ = grownRowBytes;
+    bitmapScratchRowBytesSize_ = rowBytesSize;
+  }
+
+  return true;
+}
+
+void GfxRenderer::insertFont(const int fontId, EpdFontFamily font) {
+  auto result = fontMap.insert({fontId, font});
+  if (!result.second) {
+    LOG_ERR("GFX", "Font ID %d already registered, ignoring duplicate", fontId);
+  }
+}
 
 // Translate logical (x,y) coordinates to physical panel coordinates based on current orientation
 // This should always be inlined for better performance
@@ -74,6 +206,225 @@ static inline void rotateCoordinates(const GfxRenderer::Orientation orientation,
 
 enum class TextRotation { None, Rotated90CW };
 
+struct SyntheticSolidGlyphMetrics {
+  uint16_t advanceX;
+  int ascender;
+  int left;
+  int top;
+  int width;
+  int height;
+};
+
+static void fillRectClipped(const GfxRenderer& renderer, int x, int y, int width, int height, const bool pixelState) {
+  if (width <= 0 || height <= 0) return;
+
+  const int screenWidth = renderer.getScreenWidth();
+  const int screenHeight = renderer.getScreenHeight();
+  const int x2 = x + width;
+  const int y2 = y + height;
+  if (x >= screenWidth || y >= screenHeight || x2 <= 0 || y2 <= 0) return;
+
+  const int clippedX = std::max(0, x);
+  const int clippedY = std::max(0, y);
+  const int clippedX2 = std::min(screenWidth, x2);
+  const int clippedY2 = std::min(screenHeight, y2);
+  renderer.fillRect(clippedX, clippedY, clippedX2 - clippedX, clippedY2 - clippedY, pixelState);
+}
+
+static void drawPixelClipped(const GfxRenderer& renderer, const int x, const int y, const bool pixelState) {
+  if (x < 0 || x >= renderer.getScreenWidth() || y < 0 || y >= renderer.getScreenHeight()) return;
+  renderer.drawPixel(x, y, pixelState);
+}
+
+static SyntheticSolidGlyphMetrics getSyntheticSolidGlyphMetrics(const EpdFontFamily& font,
+                                                                const EpdFontFamily::Style style, const uint32_t cp) {
+  const EpdFontData* data = font.getData(style);
+  const uint16_t advanceX = syntheticGlyph::solidAdvanceX(data, font.getGlyph('M', style));
+  const int height = syntheticGlyph::solidHeight(data, cp);
+  const int width = syntheticGlyph::solidWidth(cp, advanceX, height);
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  return {
+      advanceX, ascender, syntheticGlyph::solidLeft(cp, advanceX, width), syntheticGlyph::solidTop(data, cp, height),
+      width,    height};
+}
+
+static SyntheticSolidGlyphMetrics getSyntheticGreekGlyphMetrics(const EpdFontFamily& font,
+                                                                const EpdFontFamily::Style style, const uint32_t cp) {
+  const EpdFontData* data = font.getData(style);
+  const uint16_t advanceX = syntheticGlyph::greekAdvanceX(data, font.getGlyph('M', style), cp);
+  const int height = syntheticGlyph::greekHeight(data, cp);
+  const int width = syntheticGlyph::greekWidth(cp, advanceX, height);
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  return {
+      advanceX, ascender, syntheticGlyph::greekLeft(cp, advanceX, width), syntheticGlyph::greekTop(data, cp, height),
+      width,    height};
+}
+
+static SyntheticSolidGlyphMetrics getSyntheticReplacementGlyphMetrics(const EpdFontFamily& font,
+                                                                      const EpdFontFamily::Style style) {
+  const EpdFontData* data = font.getData(style);
+  const uint16_t advanceX = syntheticGlyph::replacementAdvanceX(data, font.getGlyph('M', style));
+  const int height = syntheticGlyph::replacementHeight(data);
+  const int width = syntheticGlyph::replacementWidth(advanceX, height);
+  const int ascender = data && data->ascender > 0 ? data->ascender : height;
+  return {advanceX,
+          ascender,
+          syntheticGlyph::replacementLeft(advanceX, width),
+          syntheticGlyph::replacementTop(data, height),
+          width,
+          height};
+}
+
+static void fillSyntheticSolidGlyph(const GfxRenderer& renderer, const SyntheticSolidGlyphMetrics& metrics,
+                                    const int cursorX, const int baselineY, const bool pixelState) {
+  fillRectClipped(renderer, cursorX + metrics.left, baselineY - metrics.top, metrics.width, metrics.height, pixelState);
+}
+
+static void fillSyntheticSolidGlyphRotated90CW(const GfxRenderer& renderer, const SyntheticSolidGlyphMetrics& metrics,
+                                               const int cursorX, const int cursorY, const bool pixelState) {
+  fillRectClipped(renderer, cursorX + metrics.ascender - metrics.top, cursorY - metrics.left - metrics.width + 1,
+                  metrics.height, metrics.width, pixelState);
+}
+
+static int syntheticStroke(const SyntheticSolidGlyphMetrics& metrics) {
+  const int minDim = metrics.width < metrics.height ? metrics.width : metrics.height;
+  return minDim >= 14 ? 2 : 1;
+}
+
+static bool epsilonTemplatePixel(const int srcX, const int srcY) {
+  static constexpr uint8_t EPSILON_7X7[] = {
+      0b0111110, 0b1100000, 0b1000000, 0b1111100, 0b1000000, 0b1100000, 0b0111110,
+  };
+  return (EPSILON_7X7[srcY] & (1 << (6 - srcX))) != 0;
+}
+
+static bool questionTemplatePixel(const int srcX, const int srcY) {
+  static constexpr uint8_t QUESTION_7X9[] = {
+      0b0011100, 0b0100010, 0b0000010, 0b0000100, 0b0001000, 0b0001000, 0b0000000, 0b0001000, 0b0001000,
+  };
+  return (QUESTION_7X9[srcY] & (1 << (6 - srcX))) != 0;
+}
+
+static void drawSyntheticReplacementGlyph(const GfxRenderer& renderer, const SyntheticSolidGlyphMetrics& metrics,
+                                          const int cursorX, const int baselineY, const bool pixelState) {
+  const int x = cursorX + metrics.left;
+  const int y = baselineY - metrics.top;
+  const int w = metrics.width;
+  const int h = metrics.height;
+  if (w <= 0 || h <= 0) return;
+
+  const int limit = w < h ? w : h;
+  for (int gy = 0; gy < h; gy++) {
+    for (int gx = 0; gx < w; gx++) {
+      const int diamondX = abs((2 * gx + 1) - w);
+      const int diamondY = abs((2 * gy + 1) - h);
+      if (diamondX + diamondY <= limit) {
+        drawPixelClipped(renderer, x + gx, y + gy, pixelState);
+      }
+    }
+  }
+
+  if (w < 7 || h < 9) return;
+  const int qW = w > 10 ? 7 : 5;
+  const int qH = h > 12 ? 9 : 7;
+  const int qX = x + (w - qW) / 2;
+  const int qY = y + (h - qH) / 2;
+  for (int gy = 0; gy < qH; gy++) {
+    for (int gx = 0; gx < qW; gx++) {
+      if (questionTemplatePixel(gx * 7 / qW, gy * 9 / qH)) {
+        drawPixelClipped(renderer, qX + gx, qY + gy, !pixelState);
+      }
+    }
+  }
+}
+
+static void drawSyntheticReplacementGlyphRotated90CW(const GfxRenderer& renderer,
+                                                     const SyntheticSolidGlyphMetrics& metrics, const int cursorX,
+                                                     const int cursorY, const bool pixelState) {
+  const int baseX = cursorX + metrics.ascender - metrics.top;
+  const int baseY = cursorY - metrics.left;
+  const int w = metrics.width;
+  const int h = metrics.height;
+  if (w <= 0 || h <= 0) return;
+
+  const int limit = w < h ? w : h;
+  for (int gy = 0; gy < h; gy++) {
+    for (int gx = 0; gx < w; gx++) {
+      const int diamondX = abs((2 * gx + 1) - w);
+      const int diamondY = abs((2 * gy + 1) - h);
+      if (diamondX + diamondY <= limit) {
+        drawPixelClipped(renderer, baseX + gy, baseY - gx, pixelState);
+      }
+    }
+  }
+
+  if (w < 7 || h < 9) return;
+  const int qW = w > 10 ? 7 : 5;
+  const int qH = h > 12 ? 9 : 7;
+  const int qLeft = (w - qW) / 2;
+  const int qTop = (h - qH) / 2;
+  for (int gy = 0; gy < qH; gy++) {
+    for (int gx = 0; gx < qW; gx++) {
+      if (questionTemplatePixel(gx * 7 / qW, gy * 9 / qH)) {
+        drawPixelClipped(renderer, baseX + qTop + gy, baseY - (qLeft + gx), !pixelState);
+      }
+    }
+  }
+}
+
+static void drawSyntheticGreekGlyph(const GfxRenderer& renderer, const SyntheticSolidGlyphMetrics& metrics,
+                                    const uint32_t cp, const int cursorX, const int baselineY, const bool pixelState) {
+  const int x = cursorX + metrics.left;
+  const int y = baselineY - metrics.top;
+  const int w = metrics.width;
+  const int h = metrics.height;
+  const int s = syntheticStroke(metrics);
+  if (w <= 0 || h <= 0) return;
+
+  if (cp == syntheticGlyph::GREEK_CAPITAL_GAMMA) {
+    fillRectClipped(renderer, x, y, s, h, pixelState);
+    fillRectClipped(renderer, x, y, w, s, pixelState);
+  } else if (cp == syntheticGlyph::GREEK_SMALL_EPSILON) {
+    for (int gy = 0; gy < h; gy++) {
+      const int srcY = gy * 7 / h;
+      for (int gx = 0; gx < w; gx++) {
+        if (epsilonTemplatePixel(gx * 7 / w, srcY)) drawPixelClipped(renderer, x + gx, y + gy, pixelState);
+      }
+    }
+  } else if (cp == syntheticGlyph::GREEK_SMALL_OMEGA) {
+    const int mid = w / 2;
+    fillRectClipped(renderer, x, y + s, s, h - 2 * s, pixelState);
+    fillRectClipped(renderer, x + w - s, y + s, s, h - 2 * s, pixelState);
+    fillRectClipped(renderer, x + s, y + h - s, mid - s, s, pixelState);
+    fillRectClipped(renderer, x + mid, y + h - s, w - mid - s, s, pixelState);
+    fillRectClipped(renderer, x + mid - s / 2, y + h / 2, s, h / 2, pixelState);
+  }
+}
+
+static void drawSyntheticGreekGlyphRotated90CW(const GfxRenderer& renderer, const SyntheticSolidGlyphMetrics& metrics,
+                                               const uint32_t cp, const int cursorX, const int cursorY,
+                                               const bool pixelState) {
+  const int baseX = cursorX + metrics.ascender - metrics.top;
+  const int baseY = cursorY - metrics.left;
+  const int s = syntheticStroke(metrics);
+  for (int gy = 0; gy < metrics.height; gy++) {
+    for (int gx = 0; gx < metrics.width; gx++) {
+      bool draw = false;
+      if (cp == syntheticGlyph::GREEK_CAPITAL_GAMMA) {
+        draw = gx < s || gy < s;
+      } else if (cp == syntheticGlyph::GREEK_SMALL_EPSILON) {
+        draw = epsilonTemplatePixel(gx * 7 / metrics.width, gy * 7 / metrics.height);
+      } else if (cp == syntheticGlyph::GREEK_SMALL_OMEGA) {
+        draw = (gx < s && gy >= s && gy < metrics.height - s) ||
+               (gx >= metrics.width - s && gy >= s && gy < metrics.height - s) ||
+               (gy >= metrics.height - s && gx >= s && gx < metrics.width - s) ||
+               (gx >= metrics.width / 2 - s / 2 && gx < metrics.width / 2 - s / 2 + s && gy >= metrics.height / 2);
+      }
+      if (draw) drawPixelClipped(renderer, baseX + gy, baseY - gx, pixelState);
+    }
+  }
+}
+
 // Shared glyph rendering logic for normal and rotated text.
 // Coordinate mapping and cursor advance direction are selected at compile time via the template parameter.
 template <TextRotation rotation>
@@ -253,6 +604,8 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha
     }
 
     cp = font.applyLigatures(cp, text, style);
+    cp = font.getFallbackCodepoint(cp, style);
+    const bool hasRealGlyph = font.findGlyphData(cp, style).glyph != nullptr;
 
     // Differential rounding: snap (previous advance + current kern) as one unit so
     // identical character pairs always produce the same pixel step regardless of
@@ -262,6 +615,48 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha
       lastBaseX += fp4::toPixel(prevAdvanceFP + kernFP);       // snap 12.4 fixed-point to nearest pixel
     }
 
+    if (!hasRealGlyph && syntheticGlyph::isSpaceFallback(cp)) {
+      prevAdvanceFP = 0;
+      lastBaseLeft = 0;
+      lastBaseWidth = 0;
+      lastBaseTop = 0;
+      prevCp = 0;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isSolid(cp)) {
+      const auto metrics = getSyntheticSolidGlyphMetrics(font, style, cp);
+      fillSyntheticSolidGlyph(*this, metrics, lastBaseX, yPos, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isGreekFallback(cp)) {
+      const auto metrics = getSyntheticGreekGlyphMetrics(font, style, cp);
+      drawSyntheticGreekGlyph(*this, metrics, cp, lastBaseX, yPos, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isReplacementFallback(cp)) {
+      const auto metrics = getSyntheticReplacementGlyphMetrics(font, style);
+      drawSyntheticReplacementGlyph(*this, metrics, lastBaseX, yPos, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
     const EpdGlyph* glyph = font.getGlyph(cp, style);
 
     if (!glyph) {
@@ -287,17 +682,21 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha
 
 void GfxRenderer::drawLine(int x1, int y1, int x2, int y2, const bool state) const {
   if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
+  const int sw = getScreenWidth();
+  const int sh = getScreenHeight();
   if (x1 == x2) {
-    if (y2 < y1) {
-      std::swap(y1, y2);
-    }
+    if (x1 < 0 || x1 >= sw) return;
+    if (y2 < y1) std::swap(y1, y2);
+    y1 = std::max(y1, 0);
+    y2 = std::min(y2, sh - 1);
     for (int y = y1; y <= y2; y++) {
       drawPixel(x1, y, state);
     }
   } else if (y1 == y2) {
-    if (x2 < x1) {
-      std::swap(x1, x2);
-    }
+    if (y1 < 0 || y1 >= sh) return;
+    if (x2 < x1) std::swap(x1, x2);
+    x1 = std::max(x1, 0);
+    x2 = std::min(x2, sw - 1);
     for (int x = x1; x <= x2; x++) {
       drawPixel(x, y1, state);
     }
@@ -490,16 +889,23 @@ void GfxRenderer::fillRectDither(const int x, const int y, const int width, cons
     fillRect(x, y, width, height, true);
   } else if (color == Color::White) {
     fillRect(x, y, width, height, false);
-  } else if (color == Color::LightGray) {
-    for (int fillY = y; fillY < y + height; fillY++) {
-      for (int fillX = x; fillX < x + width; fillX++) {
-        drawPixelDither<Color::LightGray>(fillX, fillY);
+  } else if (color == Color::LightGray || color == Color::DarkGray) {
+    const int x0 = std::max(x, 0);
+    const int y0 = std::max(y, 0);
+    const int x1 = std::min(x + width, getScreenWidth());
+    const int y1 = std::min(y + height, getScreenHeight());
+    if (x0 >= x1 || y0 >= y1) return;
+    if (color == Color::LightGray) {
+      for (int fillY = y0; fillY < y1; fillY++) {
+        for (int fillX = x0; fillX < x1; fillX++) {
+          drawPixelDither<Color::LightGray>(fillX, fillY);
+        }
       }
-    }
-  } else if (color == Color::DarkGray) {
-    for (int fillY = y; fillY < y + height; fillY++) {
-      for (int fillX = x; fillX < x + width; fillX++) {
-        drawPixelDither<Color::DarkGray>(fillX, fillY);
+    } else {
+      for (int fillY = y0; fillY < y1; fillY++) {
+        for (int fillX = x0; fillX < x1; fillX++) {
+          drawPixelDither<Color::DarkGray>(fillX, fillY);
+        }
       }
     }
   }
@@ -679,6 +1085,69 @@ void GfxRenderer::drawIcon(const uint8_t bitmap[], const int x, const int y, con
   display.drawImageTransparent(bitmap, y, getScreenWidth() - width - x, height, width);
 }
 
+void GfxRenderer::drawIconInverted(const uint8_t bitmap[], const int x, const int y, const int width,
+                                   const int height) const {
+  if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
+
+  // Portrait-mode coordinate transform (x↔y swap), matching drawIcon.
+  // OR with ~srcByte sets framebuffer bits to 1 (white) wherever the icon
+  // bitmap is 0 (black) — produces a white icon on a black background.
+  const int physX = y;
+  const int physY = getScreenWidth() - width - x;
+  const int imgW = height;  // dimensions swapped by portrait transform
+  const int imgH = width;
+  const int srcStride = (imgW + 7) / 8;  // round up so non-byte-aligned widths copy fully
+
+  // Trivial off-screen rejection.
+  if (physX + imgW <= 0 || physX >= HalDisplay::DISPLAY_WIDTH) return;
+  if (physY + imgH <= 0 || physY >= HalDisplay::DISPLAY_HEIGHT) return;
+
+  // Floor-divide so a negative physX produces the correct (negative) base byte;
+  // C++ integer division truncates toward zero, which would round up for negatives.
+  const int baseByte = (physX >= 0) ? (physX >> 3) : -(((-physX) + 7) >> 3);
+  const int bitShift = ((physX % 8) + 8) % 8;  // 0..7
+
+  // Strip spurious low bits in the trailing source byte when imgW is not a
+  // multiple of 8 — without this, ~bitmap would set them to 1 and bleed extra
+  // white pixels past the icon's right edge.
+  const int trail = srcStride * 8 - imgW;
+  const uint8_t trailMask = static_cast<uint8_t>(0xFF << trail);
+  const int lastCol = srcStride - 1;
+
+  for (int row = 0; row < imgH; ++row) {
+    const int destY = physY + row;
+    if (destY < 0 || destY >= HalDisplay::DISPLAY_HEIGHT) continue;
+    const int rowBase = destY * HalDisplay::DISPLAY_WIDTH_BYTES;
+    const int srcOffset = row * srcStride;
+
+    if (bitShift == 0) {
+      for (int col = 0; col < srcStride; ++col) {
+        const int dst = baseByte + col;
+        if (dst < 0) continue;
+        if (dst >= HalDisplay::DISPLAY_WIDTH_BYTES) break;
+        uint8_t inv = ~bitmap[srcOffset + col];
+        if (col == lastCol && trail > 0) inv &= trailMask;
+        frameBuffer[rowBase + dst] |= inv;
+      }
+    } else {
+      const int rsh = bitShift;
+      const int lsh = 8 - bitShift;
+      for (int col = 0; col < srcStride; ++col) {
+        uint8_t inv = ~bitmap[srcOffset + col];
+        if (col == lastCol && trail > 0) inv &= trailMask;
+        const int dstHi = baseByte + col;
+        const int dstLo = dstHi + 1;
+        if (dstHi >= 0 && dstHi < HalDisplay::DISPLAY_WIDTH_BYTES) {
+          frameBuffer[rowBase + dstHi] |= static_cast<uint8_t>(inv >> rsh);
+        }
+        if (dstLo >= 0 && dstLo < HalDisplay::DISPLAY_WIDTH_BYTES) {
+          frameBuffer[rowBase + dstLo] |= static_cast<uint8_t>(inv << lsh);
+        }
+      }
+    }
+  }
+}
+
 void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, const int maxWidth, const int maxHeight,
                              const float cropX, const float cropY) const {
   if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
@@ -717,18 +1186,17 @@ void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, con
   }
   LOG_DBG("GFX", "Scaling by %f - %s", scale, isScaled ? "scaled" : "not scaled");
 
+  BitmapScratchLock scratchLock(*this);
+  if (!scratchLock.isLocked()) return;
+
   // Calculate output row size (2 bits per pixel, packed into bytes)
   // IMPORTANT: Use int, not uint8_t, to avoid overflow for images > 1020 pixels wide
   const int outputRowSize = (bitmap.getWidth() + 3) / 4;
-  auto* outputRow = static_cast<uint8_t*>(malloc(outputRowSize));
-  auto* rowBytes = static_cast<uint8_t*>(malloc(bitmap.getRowBytes()));
-
-  if (!outputRow || !rowBytes) {
-    LOG_ERR("GFX", "!! Failed to allocate BMP row buffers");
-    free(outputRow);
-    free(rowBytes);
+  if (!ensureBitmapScratchBuffers(outputRowSize, bitmap.getRowBytes())) {
     return;
   }
+  auto* outputRow = bitmapScratchOutputRow_;
+  auto* rowBytes = bitmapScratchRowBytes_;
 
   for (int bmpY = 0; bmpY < (bitmap.getHeight() - cropPixY); bmpY++) {
     // The BMP's (0, 0) is the bottom-left corner (if the height is positive, top-left if negative).
@@ -744,8 +1212,6 @@ void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, con
 
     if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) {
       LOG_ERR("GFX", "Failed to read row %d from bitmap", bmpY);
-      free(outputRow);
-      free(rowBytes);
       return;
     }
 
@@ -782,9 +1248,6 @@ void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, con
       }
     }
   }
-
-  free(outputRow);
-  free(rowBytes);
 }
 
 void GfxRenderer::drawBitmap1Bit(const Bitmap& bitmap, const int x, const int y, const int maxWidth,
@@ -800,24 +1263,21 @@ void GfxRenderer::drawBitmap1Bit(const Bitmap& bitmap, const int x, const int y,
     isScaled = true;
   }
 
+  BitmapScratchLock scratchLock(*this);
+  if (!scratchLock.isLocked()) return;
+
   // For 1-bit BMP, output is still 2-bit packed (for consistency with readNextRow)
   const int outputRowSize = (bitmap.getWidth() + 3) / 4;
-  auto* outputRow = static_cast<uint8_t*>(malloc(outputRowSize));
-  auto* rowBytes = static_cast<uint8_t*>(malloc(bitmap.getRowBytes()));
-
-  if (!outputRow || !rowBytes) {
-    LOG_ERR("GFX", "!! Failed to allocate 1-bit BMP row buffers");
-    free(outputRow);
-    free(rowBytes);
+  if (!ensureBitmapScratchBuffers(outputRowSize, bitmap.getRowBytes())) {
     return;
   }
+  auto* outputRow = bitmapScratchOutputRow_;
+  auto* rowBytes = bitmapScratchRowBytes_;
 
   for (int bmpY = 0; bmpY < bitmap.getHeight(); bmpY++) {
     // Read rows sequentially using readNextRow
     if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) {
       LOG_ERR("GFX", "Failed to read row %d from 1-bit bitmap", bmpY);
-      free(outputRow);
-      free(rowBytes);
       return;
     }
 
@@ -851,9 +1311,65 @@ void GfxRenderer::drawBitmap1Bit(const Bitmap& bitmap, const int x, const int y,
       // White pixels (val == 3) are not drawn (leave background)
     }
   }
+}
+
+void GfxRenderer::drawPerspectiveBitmap(const Bitmap& bitmap, const int x, const int y, const int w, const int hL,
+                                        const int hR) const {
+  if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
+  if (w <= 0 || hL <= 0 || hR <= 0) return;
+
+  const int srcW = bitmap.getWidth();
+  const int srcH = bitmap.getHeight();
+  if (srcW <= 0 || srcH <= 0) return;
+
+  const int hMax = std::max(hL, hR);
+  const int screenW = getScreenWidth();
+  const int screenH = getScreenHeight();
+  const bool topDown = bitmap.isTopDown();
+
+  BitmapScratchLock scratchLock(*this);
+  if (!scratchLock.isLocked()) return;
+
+  const int outputRowSize = (srcW + 3) / 4;
+  if (!ensureBitmapScratchBuffers(outputRowSize, bitmap.getRowBytes())) {
+    return;
+  }
+  auto* outputRow = bitmapScratchOutputRow_;
+  auto* rowBytes = bitmapScratchRowBytes_;
+
+  for (int srcY = 0; srcY < srcH; srcY++) {
+    if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) {
+      LOG_ERR("GFX", "Failed to read row %d from bitmap (perspective)", srcY);
+      return;
+    }
+    const int srcRowIndex = topDown ? srcY : (srcH - 1 - srcY);
 
-  free(outputRow);
-  free(rowBytes);
+    for (int dx = 0; dx < w; dx++) {
+      const int colH = (w == 1) ? hL : (hL + (hR - hL) * dx / (w - 1));
+      if (colH <= 0) continue;
+      const int colTop = (hMax - colH) / 2;
+      const int screenX = x + dx;
+      if (screenX < 0 || screenX >= screenW) continue;
+
+      const int srcX = (dx * srcW) / w;
+      const uint8_t val = (outputRow[srcX / 4] >> (6 - ((srcX * 2) % 8))) & 0x3;
+
+      const int dstYStart = (srcRowIndex * colH) / srcH;
+      const int dstYEnd = ((srcRowIndex + 1) * colH) / srcH;
+      for (int dy = dstYStart; dy < dstYEnd; ++dy) {
+        const int screenY = y + colTop + dy;
+        if (screenY < 0 || screenY >= screenH) continue;
+
+        if (renderMode == BW && val < 3) {
+          drawPixel(screenX, screenY);
+        } else if (renderMode == GRAYSCALE_MSB && (val == 1 || val == 2)) {
+          drawPixel(screenX, screenY, false);
+        } else if (renderMode == GRAYSCALE_LSB && val == 1) {
+          drawPixel(screenX, screenY, false);
+        }
+      }
+    }
+  }
 }
 
 void GfxRenderer::fillPolygon(const int* xPoints, const int* yPoints, int numPoints, bool state) const {
@@ -894,16 +1410,8 @@ void GfxRenderer::fillPolygon(const int* xPoints, const int* yPoints, int numPoi
       j = i;
     }
 
-    // Sort nodes by X (simple bubble sort, numPoints is small)
-    for (int i = 0; i < nodes - 1; i++) {
-      for (int k = i + 1; k < nodes; k++) {
-        if (nodeX[i] > nodeX[k]) {
-          int temp = nodeX[i];
-          nodeX[i] = nodeX[k];
-          nodeX[k] = temp;
-        }
-      }
-    }
+    // Sort nodes by X
+    std::sort(nodeX, nodeX + nodes);
 
     // Fill between pairs of nodes
     for (int i = 0; i < nodes - 1; i += 2) {
@@ -1058,6 +1566,13 @@ int GfxRenderer::getScreenHeight() const {
 }
 
 int GfxRenderer::getSpaceWidth(const int fontId, const EpdFontFamily::Style style) const {
+  // Advance table fast-path for SD card fonts during layout
+  auto sdIt = sdCardFonts_.find(fontId);
+  if (sdIt != sdCardFonts_.end() && sdIt->second->hasAdvanceTable()) {
+    const uint8_t resolvedStyle = resolveSdCardStyle(*sdIt->second, style);
+    return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
+  }
+
   const auto fontIt = fontMap.find(fontId);
   if (fontIt == fontMap.end()) {
     LOG_ERR("GFX", "Font %d not found", fontId);
@@ -1070,6 +1585,15 @@ int GfxRenderer::getSpaceWidth(const int fontId, const EpdFontFamily::Style styl
 
 int GfxRenderer::getSpaceAdvance(const int fontId, const uint32_t leftCp, const uint32_t rightCp,
                                  const EpdFontFamily::Style style) const {
+  // Advance table fast-path for SD card fonts during layout.
+  // Kern data is not loaded during layout (consistent with previous metadataOnly behavior),
+  // so we return just the space advance without kerning.
+  auto sdIt = sdCardFonts_.find(fontId);
+  if (sdIt != sdCardFonts_.end() && sdIt->second->hasAdvanceTable()) {
+    const uint8_t resolvedStyle = resolveSdCardStyle(*sdIt->second, style);
+    return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
+  }
+
   const auto fontIt = fontMap.find(fontId);
   if (fontIt == fontMap.end()) return 0;
   const auto& font = fontIt->second;
@@ -1091,6 +1615,19 @@ int GfxRenderer::getKerning(const int fontId, const uint32_t leftCp, const uint3
 }
 
 int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, EpdFontFamily::Style style) const {
+  // Advance table fast-path for SD card fonts during layout.
+  // No kerning/ligature lookup — consistent with previous metadataOnly behavior
+  // where kern/lig data was not loaded.
+  auto sdIt = sdCardFonts_.find(fontId);
+  if (sdIt != sdCardFonts_.end() && sdIt->second->hasAdvanceTable()) {
+    int32_t widthFP = 0;
+    const uint8_t styleIdx = resolveSdCardStyle(*sdIt->second, style);
+    while (uint32_t cp = utf8NextCodepoint(reinterpret_cast<const uint8_t**>(&text))) {
+      widthFP += sdIt->second->getAdvance(cp, styleIdx);
+    }
+    return fp4::toPixel(widthFP);
+  }
+
   const auto fontIt = fontMap.find(fontId);
   if (fontIt == fontMap.end()) {
     LOG_ERR("GFX", "Font %d not found", fontId);
@@ -1107,6 +1644,8 @@ int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, EpdFontFami
       continue;
     }
     cp = font.applyLigatures(cp, text, style);
+    cp = font.getFallbackCodepoint(cp, style);
+    const bool hasRealGlyph = font.findGlyphData(cp, style).glyph != nullptr;
 
     // Differential rounding: snap (previous advance + current kern) together,
     // matching drawText so measurement and rendering agree exactly.
@@ -1115,6 +1654,30 @@ int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, EpdFontFami
       widthPx += fp4::toPixel(prevAdvanceFP + kernFP);         // snap 12.4 fixed-point to nearest pixel
     }
 
+    if (!hasRealGlyph && syntheticGlyph::isSpaceFallback(cp)) {
+      prevAdvanceFP = 0;
+      prevCp = 0;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isSolid(cp)) {
+      prevAdvanceFP = getSyntheticSolidGlyphMetrics(font, style, cp).advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isGreekFallback(cp)) {
+      prevAdvanceFP = getSyntheticGreekGlyphMetrics(font, style, cp).advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isReplacementFallback(cp)) {
+      prevAdvanceFP = getSyntheticReplacementGlyphMetrics(font, style).advanceX;
+      prevCp = cp;
+      continue;
+    }
+
     const EpdGlyph* glyph = font.getGlyph(cp, style);
     prevAdvanceFP = glyph ? glyph->advanceX : 0;
     prevCp = cp;
@@ -1188,6 +1751,8 @@ void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y
     }
 
     cp = font.applyLigatures(cp, text, style);
+    cp = font.getFallbackCodepoint(cp, style);
+    const bool hasRealGlyph = font.findGlyphData(cp, style).glyph != nullptr;
 
     // Differential rounding: snap (previous advance + current kern) as one unit,
     // subtracting for the rotated coordinate direction.
@@ -1196,6 +1761,48 @@ void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y
       lastBaseY -= fp4::toPixel(prevAdvanceFP + kernFP);       // snap 12.4 fixed-point to nearest pixel
     }
 
+    if (!hasRealGlyph && syntheticGlyph::isSpaceFallback(cp)) {
+      prevAdvanceFP = 0;
+      lastBaseLeft = 0;
+      lastBaseWidth = 0;
+      lastBaseTop = 0;
+      prevCp = 0;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isSolid(cp)) {
+      const auto metrics = getSyntheticSolidGlyphMetrics(font, style, cp);
+      fillSyntheticSolidGlyphRotated90CW(*this, metrics, x, lastBaseY, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isGreekFallback(cp)) {
+      const auto metrics = getSyntheticGreekGlyphMetrics(font, style, cp);
+      drawSyntheticGreekGlyphRotated90CW(*this, metrics, cp, x, lastBaseY, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
+    if (!hasRealGlyph && syntheticGlyph::isReplacementFallback(cp)) {
+      const auto metrics = getSyntheticReplacementGlyphMetrics(font, style);
+      drawSyntheticReplacementGlyphRotated90CW(*this, metrics, x, lastBaseY, black);
+      lastBaseLeft = metrics.left;
+      lastBaseWidth = metrics.width;
+      lastBaseTop = metrics.top;
+      prevAdvanceFP = metrics.advanceX;
+      prevCp = cp;
+      continue;
+    }
+
     const EpdGlyph* glyph = font.getGlyph(cp, style);
 
     if (!glyph) {
@@ -1234,79 +1841,150 @@ void GfxRenderer::displayGrayBuffer(const bool turnOffScreen) const {
   display.displayGrayBuffer(fadingFix || turnOffScreen);
 }
 
-void GfxRenderer::freeBwBufferChunks() {
-  for (auto& bwBufferChunk : bwBufferChunks) {
-    if (bwBufferChunk) {
-      free(bwBufferChunk);
-      bwBufferChunk = nullptr;
-    }
+void GfxRenderer::freeBwCompressedBackup() {
+  if (bwCompressedBackup) {
+    free(bwCompressedBackup);
+    bwCompressedBackup = nullptr;
   }
+  bwCompressedBackupSize = 0;
 }
 
 /**
- * This should be called before grayscale buffers are populated.
- * A `restoreBwBuffer` call should always follow the grayscale render if this method was called.
- * Uses chunked allocation to avoid needing 48KB of contiguous memory.
- * Returns true if buffer was stored successfully, false if allocation failed.
+ * Encode the framebuffer into a PackBits-style RLE backup.
+ *
+ * The output stream is a sequence of (header, payload) packets:
+ *   - header [0x00, 0x7F]: literal run; copy the next (header + 1) bytes
+ *     verbatim from the input. The header itself is stored as count-1, so a
+ *     header byte of 0x00 means "copy 1 byte".
+ *   - header [0x80, 0xFF]: byte run; repeat the next byte ((header & 0x7F) + 1)
+ *     times. A header byte of 0x80 means "repeat the next byte once" — i.e.
+ *     a run of 1 — which is wasteful, so the encoder never emits runs <3 here
+ *     and prefers literal runs for short sequences.
+ *
+ * Worst-case expansion (purely random input) is +1 byte per 128 literals,
+ * but reader pages are >95% 0xFF runs and typically encode to <5 KB. If we
+ * exceed MAX_BW_COMPRESSED_SIZE the call fails and the caller falls back
+ * to skipping the grayscale pass — same UX as the old chunked alloc failure.
+ *
+ * A `restoreBwBuffer` call should always follow the grayscale render if this
+ * method was called.
+ *
+ * Returns true if the framebuffer was successfully stored, false if the
+ * compressed buffer couldn't be allocated or the data overflowed.
  */
 bool GfxRenderer::storeBwBuffer() {
-  // Allocate and copy each chunk
-  for (size_t i = 0; i < bwBufferChunks.size(); i++) {
-    // Check if any chunks are already allocated
-    if (bwBufferChunks[i]) {
-      LOG_ERR("GFX", "!! BW buffer chunk %zu already stored - this is likely a bug, freeing chunk", i);
-      free(bwBufferChunks[i]);
-      bwBufferChunks[i] = nullptr;
-    }
-
-    const size_t offset = i * BW_BUFFER_CHUNK_SIZE;
-    const size_t chunkSize = std::min(BW_BUFFER_CHUNK_SIZE, static_cast<size_t>(frameBufferSize - offset));
-    bwBufferChunks[i] = static_cast<uint8_t*>(malloc(chunkSize));
-
-    if (!bwBufferChunks[i]) {
-      LOG_ERR("GFX", "!! Failed to allocate BW buffer chunk %zu (%zu bytes)", i, chunkSize);
-      // Free previously allocated chunks
-      freeBwBufferChunks();
-      return false;
+  if (bwCompressedBackup) {
+    LOG_ERR("GFX", "!! BW backup already stored - freeing previous");
+    freeBwCompressedBackup();
+  }
+
+  bwCompressedBackup = static_cast<uint8_t*>(malloc(MAX_BW_COMPRESSED_SIZE));
+  if (!bwCompressedBackup) {
+    LOG_ERR("GFX", "!! Failed to allocate BW compressed backup (%zu bytes)", MAX_BW_COMPRESSED_SIZE);
+    return false;
+  }
+
+  const uint8_t* src = frameBuffer;
+  const uint8_t* srcEnd = frameBuffer + frameBufferSize;
+  uint8_t* dst = bwCompressedBackup;
+  uint8_t* dstEnd = bwCompressedBackup + MAX_BW_COMPRESSED_SIZE;
+
+  while (src < srcEnd) {
+    // Look ahead for a run of >=3 identical bytes — the break-even point
+    // versus encoding them as a literal sequence.
+    size_t runLen = 1;
+    const size_t maxRun = std::min<size_t>(128, srcEnd - src);
+    while (runLen < maxRun && src[runLen] == src[0]) {
+      runLen++;
     }
 
-    memcpy(bwBufferChunks[i], frameBuffer + offset, chunkSize);
+    if (runLen >= 3) {
+      if (dst + 2 > dstEnd) {
+        freeBwCompressedBackup();
+        LOG_ERR("GFX", "!! BW backup compression overflow at run (frameOffset=%zu)",
+                static_cast<size_t>(src - frameBuffer));
+        return false;
+      }
+      *dst++ = 0x80 | static_cast<uint8_t>(runLen - 1);
+      *dst++ = *src;
+      src += runLen;
+    } else {
+      // Literal run — read up to 128 bytes, stopping early if we spot a
+      // worthwhile (>=3 byte) run upcoming so we don't bury it inside a
+      // literal packet.
+      size_t litLen = 1;
+      const size_t maxLit = std::min<size_t>(128, srcEnd - src);
+      while (litLen < maxLit) {
+        if (litLen + 2 < static_cast<size_t>(srcEnd - src) && src[litLen] == src[litLen + 1] &&
+            src[litLen + 1] == src[litLen + 2]) {
+          break;
+        }
+        litLen++;
+      }
+      if (dst + 1 + litLen > dstEnd) {
+        freeBwCompressedBackup();
+        LOG_ERR("GFX", "!! BW backup compression overflow at literal (frameOffset=%zu)",
+                static_cast<size_t>(src - frameBuffer));
+        return false;
+      }
+      *dst++ = static_cast<uint8_t>(litLen - 1);
+      memcpy(dst, src, litLen);
+      dst += litLen;
+      src += litLen;
+    }
   }
 
-  LOG_DBG("GFX", "Stored BW buffer in %zu chunks (%zu bytes each)", bwBufferChunks.size(), BW_BUFFER_CHUNK_SIZE);
+  bwCompressedBackupSize = dst - bwCompressedBackup;
+  LOG_DBG("GFX", "Stored BW buffer compressed: %lu -> %zu bytes (%.1f%%)", static_cast<unsigned long>(frameBufferSize),
+          bwCompressedBackupSize, (100.0f * bwCompressedBackupSize) / frameBufferSize);
   return true;
 }
 
 /**
- * This can only be called if `storeBwBuffer` was called prior to the grayscale render.
- * It should be called to restore the BW buffer state after grayscale rendering is complete.
- * Uses chunked restoration to match chunked storage.
+ * Decompress the backup back into the framebuffer. Pairs with storeBwBuffer.
+ * If the backup is missing or malformed, the framebuffer is left as-is and
+ * the call is a no-op — the grayscale layer is already on the e-ink, so
+ * leaving the framebuffer mid-grayscale only matters for subsequent partial
+ * refreshes (status bar etc.), which will re-render their region anyway.
  */
 void GfxRenderer::restoreBwBuffer() {
-  // Check if all chunks are allocated
-  bool missingChunks = false;
-  for (const auto& bwBufferChunk : bwBufferChunks) {
-    if (!bwBufferChunk) {
-      missingChunks = true;
-      break;
-    }
-  }
-
-  if (missingChunks) {
-    freeBwBufferChunks();
+  if (!bwCompressedBackup || bwCompressedBackupSize == 0) {
     return;
   }
 
-  for (size_t i = 0; i < bwBufferChunks.size(); i++) {
-    const size_t offset = i * BW_BUFFER_CHUNK_SIZE;
-    const size_t chunkSize = std::min(BW_BUFFER_CHUNK_SIZE, static_cast<size_t>(frameBufferSize - offset));
-    memcpy(frameBuffer + offset, bwBufferChunks[i], chunkSize);
+  const uint8_t* src = bwCompressedBackup;
+  const uint8_t* srcEnd = bwCompressedBackup + bwCompressedBackupSize;
+  uint8_t* dst = frameBuffer;
+  uint8_t* dstEnd = frameBuffer + frameBufferSize;
+
+  while (src < srcEnd && dst < dstEnd) {
+    const uint8_t hdr = *src++;
+    if (hdr & 0x80) {
+      // Byte-run packet: (header & 0x7F) + 1 copies of the next byte.
+      const size_t runLen = (hdr & 0x7F) + 1u;
+      if (src >= srcEnd || dst + runLen > dstEnd) {
+        LOG_ERR("GFX", "!! BW restore truncated at run (decoded=%zu)", static_cast<size_t>(dst - frameBuffer));
+        break;
+      }
+      memset(dst, *src++, runLen);
+      dst += runLen;
+    } else {
+      // Literal packet: header + 1 verbatim bytes.
+      const size_t litLen = static_cast<size_t>(hdr) + 1u;
+      if (src + litLen > srcEnd || dst + litLen > dstEnd) {
+        LOG_ERR("GFX", "!! BW restore truncated at literal (decoded=%zu)", static_cast<size_t>(dst - frameBuffer));
+        break;
+      }
+      memcpy(dst, src, litLen);
+      dst += litLen;
+      src += litLen;
+    }
   }
 
   display.cleanupGrayscaleBuffers(frameBuffer);
 
-  freeBwBufferChunks();
-  LOG_DBG("GFX", "Restored and freed BW buffer chunks");
+  freeBwCompressedBackup();
+  LOG_DBG("GFX", "Restored BW buffer from compressed backup");
 }
 
 /**
@@ -1347,69 +2025,3 @@ void GfxRenderer::getOrientedViewableTRBL(int* outTop, int* outRight, int* outBo
       break;
   }
 }
-
-void GfxRenderer::drawPerspectiveBitmap(const Bitmap& bitmap, const int x, const int y, const int w, const int hL,
-                                        const int hR) const {
-  if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
-  if (w <= 0 || hL <= 0 || hR <= 0) return;
-
-  const int srcW = bitmap.getWidth();
-  const int srcH = bitmap.getHeight();
-  if (srcW <= 0 || srcH <= 0) return;
-
-  const int hMax = (hL > hR) ? hL : hR;
-  const int screenW = getScreenWidth();
-  const int screenH = getScreenHeight();
-  const bool topDown = bitmap.isTopDown();
-
-  // Same row buffer pattern as drawBitmap (2 bits per pixel quantized).
-  const int outputRowSize = (srcW + 3) / 4;
-  auto* outputRow = static_cast<uint8_t*>(malloc(outputRowSize));
-  auto* rowBytes = static_cast<uint8_t*>(malloc(bitmap.getRowBytes()));
-  if (!outputRow || !rowBytes) {
-    LOG_ERR("GFX", "!! Failed to allocate perspective row buffers");
-    free(outputRow);
-    free(rowBytes);
-    return;
-  }
-
-  for (int srcY = 0; srcY < srcH; srcY++) {
-    if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) {
-      LOG_ERR("GFX", "Failed to read row %d from bitmap (perspective)", srcY);
-      free(outputRow);
-      free(rowBytes);
-      return;
-    }
-    // Position of this row inside the source image.
-    const int srcRowIndex = topDown ? srcY : (srcH - 1 - srcY);
-
-    for (int dx = 0; dx < w; dx++) {
-      // Linear interp of column height between hL (dx=0) and hR (dx=w-1).
-      const int colH = (w == 1) ? hL : (hL + (hR - hL) * dx / (w - 1));
-      if (colH <= 0) continue;
-      const int colTop = (hMax - colH) / 2;
-      const int dy = (srcRowIndex * colH) / srcH;
-      const int screenX = x + dx;
-      const int screenY = y + colTop + dy;
-      if (screenX < 0 || screenX >= screenW) continue;
-      if (screenY < 0 || screenY >= screenH) continue;
-
-      const int srcX = (dx * srcW) / w;
-      const uint8_t val = (outputRow[srcX / 4] >> (6 - ((srcX * 2) % 8))) & 0x3;
-
-      // Match drawBitmap's "OR-style" semantics: only write black; never clear
-      // a pixel. This way multiple src rows mapping to the same dst pixel
-      // (downsampling) keep any black contribution.
-      if (renderMode == BW && val < 3) {
-        drawPixel(screenX, screenY);
-      } else if (renderMode == GRAYSCALE_MSB && (val == 1 || val == 2)) {
-        drawPixel(screenX, screenY, false);
-      } else if (renderMode == GRAYSCALE_LSB && val == 1) {
-        drawPixel(screenX, screenY, false);
-      }
-    }
-  }
-
-  free(outputRow);
-  free(rowBytes);
-}
diff --git a/lib/GfxRenderer/GfxRenderer.h b/lib/GfxRenderer/GfxRenderer.h
index c1040b40..389b52df 100644
--- a/lib/GfxRenderer/GfxRenderer.h
+++ b/lib/GfxRenderer/GfxRenderer.h
@@ -2,9 +2,13 @@
 
 #include <EpdFontFamily.h>
 #include <HalDisplay.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
 
 class FontCacheManager;
+class SdCardFont;
 
+#include <cassert>
 #include <cstring>
 #include <map>
 #include <string>
@@ -29,7 +33,17 @@ class GfxRenderer {
   };
 
  private:
-  static constexpr size_t BW_BUFFER_CHUNK_SIZE = 8000;  // 8KB chunks to allow for non-contiguous memory
+  // BW backup for the grayscale anti-aliasing pass uses PackBits-style RLE
+  // compression. Reader pages are >95% same-byte runs, so a 48 KB framebuffer
+  // typically encodes to 2-5 KB. We allocate a single bounded buffer instead
+  // of 12 × 4 KB chunks, which dramatically reduces fragmentation pressure
+  // when NimBLE + EPUB allocations have split the heap.
+  // Cap at 32 KB so image-heavy pages (which compress poorly because their
+  // dithered patterns have few same-byte runs) still fit. Field measurements
+  // showed dense pages compress to ~25-26 KB. If even 32 KB isn't enough we
+  // gracefully skip grayscale for that page (same UX as the old chunked
+  // alloc-failure path).
+  static constexpr size_t MAX_BW_COMPRESSED_SIZE = 32U * 1024U;
 
   HalDisplay& display;
   RenderMode renderMode;
@@ -40,8 +54,35 @@ class GfxRenderer {
   uint16_t panelHeight = HalDisplay::DISPLAY_HEIGHT;
   uint16_t panelWidthBytes = HalDisplay::DISPLAY_WIDTH_BYTES;
   uint32_t frameBufferSize = HalDisplay::BUFFER_SIZE;
-  std::vector<uint8_t*> bwBufferChunks;
+  uint8_t* bwCompressedBackup = nullptr;
+  size_t bwCompressedBackupSize = 0;
   std::map<int, EpdFontFamily> fontMap;
+  // Shared bitmap row buffers. Every read/write must be inside BitmapScratchLock;
+  // ensureBitmapScratchBuffers() asserts that contract before exposing them.
+  mutable SemaphoreHandle_t bitmapScratchMutex_ = nullptr;
+  mutable uint8_t* bitmapScratchOutputRow_ = nullptr;
+  mutable size_t bitmapScratchOutputRowSize_ = 0;
+  mutable uint8_t* bitmapScratchRowBytes_ = nullptr;
+  mutable size_t bitmapScratchRowBytesSize_ = 0;
+
+  class BitmapScratchLock {
+    const GfxRenderer& renderer_;
+    bool locked_ = false;
+
+   public:
+    explicit BitmapScratchLock(const GfxRenderer& renderer);
+    BitmapScratchLock(const BitmapScratchLock&) = delete;
+    BitmapScratchLock& operator=(const BitmapScratchLock&) = delete;
+    ~BitmapScratchLock();
+
+    bool isLocked() const { return locked_; }
+  };
+
+  // Mutable because ensureSdCardFontReady() is const (called from layout code
+  // that holds a const GfxRenderer&) but triggers SD card reads and heap
+  // allocation inside the SdCardFont objects. Same pragmatic compromise as
+  // fontCacheManager_ below.
+  mutable std::map<int, SdCardFont*> sdCardFonts_;
 
   // Mutable because drawText() is const but needs to delegate scan-mode
   // recording to the (non-const) FontCacheManager. Same pragmatic compromise
@@ -50,7 +91,10 @@ class GfxRenderer {
 
   void renderChar(const EpdFontFamily& fontFamily, uint32_t cp, int* x, int* y, bool pixelState,
                   EpdFontFamily::Style style) const;
-  void freeBwBufferChunks();
+  void freeBwCompressedBackup();
+  void freeBitmapScratchBuffers();
+  bool ensureBitmapScratchBuffers(size_t outputRowSize, size_t rowBytesSize) const;
+  bool bitmapScratchLockHeldByCurrentTask() const;
   template <Color color>
   void drawPixelDither(int x, int y) const;
   template <Color color>
@@ -58,8 +102,21 @@ class GfxRenderer {
 
  public:
   explicit GfxRenderer(HalDisplay& halDisplay)
-      : display(halDisplay), renderMode(BW), orientation(Portrait), fadingFix(false) {}
-  ~GfxRenderer() { freeBwBufferChunks(); }
+      : display(halDisplay),
+        renderMode(BW),
+        orientation(Portrait),
+        fadingFix(false),
+        bitmapScratchMutex_(xSemaphoreCreateMutex()) {
+    assert(bitmapScratchMutex_ != nullptr && "Failed to create GfxRenderer bitmap scratch mutex");
+  }
+  GfxRenderer(const GfxRenderer&) = delete;
+  GfxRenderer& operator=(const GfxRenderer&) = delete;
+  GfxRenderer(GfxRenderer&&) = delete;
+  GfxRenderer& operator=(GfxRenderer&&) = delete;
+  ~GfxRenderer() {
+    freeBwCompressedBackup();
+    freeBitmapScratchBuffers();
+  }
 
   static constexpr int VIEWABLE_MARGIN_TOP = 9;
   static constexpr int VIEWABLE_MARGIN_RIGHT = 3;
@@ -69,9 +126,28 @@ class GfxRenderer {
   // Setup
   void begin();  // must be called right after display.begin()
   void insertFont(int fontId, EpdFontFamily font);
+  // Clears both the flash-font map and any SD-font registration for fontId.
+  // Coupled to avoid dangling SdCardFont* in sdCardFonts_ when callers free
+  // the underlying SdCardFont and forget the SD-side unregister.
+  void removeFont(int fontId) {
+    fontMap.erase(fontId);
+    sdCardFonts_.erase(fontId);
+  }
   void setFontCacheManager(FontCacheManager* m) { fontCacheManager_ = m; }
   FontCacheManager* getFontCacheManager() const { return fontCacheManager_; }
   const std::map<int, EpdFontFamily>& getFontMap() const { return fontMap; }
+  void registerSdCardFont(int fontId, SdCardFont* font) { sdCardFonts_[fontId] = font; }
+  void unregisterSdCardFont(int fontId) { removeFont(fontId); }
+  void clearSdCardFonts() { sdCardFonts_.clear(); }
+  const std::map<int, SdCardFont*>& getSdCardFonts() const { return sdCardFonts_; }
+  bool isSdCardFont(int fontId) const { return sdCardFonts_.count(fontId) > 0; }
+  // Ensure SD card font glyph data is loaded for the given text. Called from layout code
+  // (which holds a const GfxRenderer&) before measuring word widths. Safe to call on non-SD fonts (no-op).
+  // styleMask: bitmask of styles to prepare (bit 0=regular, 1=bold, 2=italic, 3=bold-italic).
+  void ensureSdCardFontReady(int fontId, const char* utf8Text, uint8_t styleMask = 0x0F) const;
+  void ensureSdCardFontReady(int fontId, const std::vector<std::string>& words, bool includeHyphen,
+                             uint8_t styleMask = 0x0F) const;
+  bool releaseSdCardFontForLowMemory(int fontId) const;
 
   // Orientation control (affects logical width/height and coordinate transforms)
   void setOrientation(const Orientation o) {
@@ -113,11 +189,12 @@ class GfxRenderer {
                        bool roundBottomLeft, bool roundBottomRight, Color color) const;
   void drawImage(const uint8_t bitmap[], int x, int y, int width, int height) const;
   void drawIcon(const uint8_t bitmap[], int x, int y, int width, int height) const;
+  void drawIconInverted(const uint8_t bitmap[], int x, int y, int width, int height) const;
   void drawBitmap(const Bitmap& bitmap, int x, int y, int maxWidth, int maxHeight, float cropX = 0,
                   float cropY = 0) const;
   void drawBitmap1Bit(const Bitmap& bitmap, int x, int y, int maxWidth, int maxHeight) const;
   // Trapezoidal blit used by Flow/iPod-style carousel. Fits the bitmap into a
-  // bounding box of width `w` and height `max(hL, hR)` whose top-left is (x,y);
+  // bounding box of width `w` and height `max(hL, hR)` whose top-left is (x, y);
   // each output column has its own height linearly interpolated from hL on the
   // left edge to hR on the right edge, vertically centered in the bbox.
   void drawPerspectiveBitmap(const Bitmap& bitmap, int x, int y, int w, int hL, int hR) const;
diff --git a/lib/I18n/translations/belarusian.yaml b/lib/I18n/translations/belarusian.yaml
index 8aa4c57d..54c2abc7 100644
--- a/lib/I18n/translations/belarusian.yaml
+++ b/lib/I18n/translations/belarusian.yaml
@@ -69,6 +69,9 @@ STR_TEXT_AA: "Згладжванне тэксту"
 STR_SHORT_PWR_BTN: "Кароткае націсканне PWR"
 STR_ORIENTATION: "Арыентацыя чытання"
 STR_SIDE_BTN_LAYOUT: "Бакавыя кнопкі"
+STR_ORIENTATION_AWARE: "З улікам арыентацыі"
+STR_NAV_BUTTONS: "Кнопкі навігацыі"
+STR_ALL_BUTTONS: "Усе кнопкі"
 STR_LONG_PRESS_SKIP: "Доўгае націсканне - змена раздзела"
 STR_FONT_FAMILY: "Шрыфт чытання"
 STR_FONT_SIZE: "Памер шрыфту інтэрфейсу"
@@ -176,6 +179,7 @@ STR_ERROR_GENERAL_FAILURE: "Памылка: Агульная памылка"
 STR_ERROR_NETWORK_NOT_FOUND: "Памылка: Сетка не знойдзена"
 STR_ERROR_CONNECTION_TIMEOUT: "Памылка: Тайм-аўт злучэння"
 STR_SD_CARD: "SD-карта"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Доўга націсніце «Галоўная», каб пераключыць схаваныя файлы"
 STR_BACK: "« Назад"
 STR_EXIT: "« Выхад"
 STR_HOME: "« Галоўная"
@@ -201,7 +205,9 @@ STR_SLEEP_COVER_FILTER: "Фільтр экрана сну"
 STR_FILTER_CONTRAST: "Кантраст"
 STR_UI_THEME: "Тэма інтэрфейсу"
 STR_THEME_CLASSIC: "Класічная"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Выгляд нядаўніх кніг"
+STR_LIST_VIEW: "Спіс"
+STR_GRID_VIEW: "Сетка"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Кампенсацыя выцвітання"
 STR_REMAP_FRONT_BUTTONS: "Пераназначыць пярэднія кнопкі"
@@ -231,6 +237,7 @@ STR_GO_TO_PERCENT: "Перайсці да %"
 STR_GO_HOME_BUTTON: "На галоўную"
 STR_SYNC_PROGRESS: "Сінхранізаваць прагрэс"
 STR_DELETE_CACHE: "Выдаліць кэш кнігі"
+STR_BOOK_CACHE_DELETED: "Кэш кнігі выдалены"
 STR_CHAPTER_PREFIX: "Раздзел:"
 STR_PAGES_SEPARATOR: "стар.  |"
 STR_BOOK_PREFIX: "Кніга:"
@@ -255,6 +262,7 @@ STR_NO_REMOTE_MSG: "Аддалены прагрэс не знойдзены"
 STR_UPLOAD_PROMPT: "Адправіць бягучую пазіцыю?"
 STR_UPLOAD_SUCCESS: "Прагрэс адпраўлены!"
 STR_SYNC_FAILED_MSG: "Памылка сінхранізацыі"
+STR_SAVE_PROGRESS_FAILED: "Не ўдалося захаваць прагрэс"
 STR_SECTION_PREFIX: "Раздзел"
 STR_UPLOAD: "Адправіць"
 STR_BOOK_S_STYLE: "Стыль кнігі"
@@ -293,7 +301,10 @@ STR_FOOTNOTES: "Зноскі"
 STR_NO_FOOTNOTES: "На гэтай старонцы няма зносак"
 STR_LINK: "[спасылка]"
 STR_AUTO_TURN_ENABLED: "Аўтаперагортванне: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Аўтаперагортванне (старонак за хвіліну)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Інтэрвал аўтаперагортвання (секунды)"
+STR_AUTO_TURN_STEP_HINT: "Улева/Управа: 1 с  Уверх/Уніз: 5 с"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u хв"
+STR_SLEEP_TIMER_STEP_HINT: "Улева/Управа: 1 хв  Уверх/Уніз: 5 хв"
 STR_REMAP_FRONT_BUTTONS_READER: "Пераназначыць пярэднія кнопкі"
 STR_READING_STATS: "Статыстыка чытання"
 STR_BOOKMARKS: "Закладкі"
diff --git a/lib/I18n/translations/catalan.yaml b/lib/I18n/translations/catalan.yaml
index 9a8119ac..31456814 100644
--- a/lib/I18n/translations/catalan.yaml
+++ b/lib/I18n/translations/catalan.yaml
@@ -73,7 +73,13 @@ STR_IMAGES_SUPPRESS: "Suprimir"
 STR_SHORT_PWR_BTN: "Clic curt del botó d'engegada"
 STR_ORIENTATION: "Orientació de lectura"
 STR_SIDE_BTN_LAYOUT: "Disposició botons laterals"
-STR_LONG_PRESS_SKIP: "Pressió llarga omet el capítol"
+STR_ORIENTATION_AWARE: "Segons orientació"
+STR_NAV_BUTTONS: "Botons de navegació"
+STR_ALL_BUTTONS: "Tots els botons"
+STR_LONG_PRESS_BEHAVIOR: "Comportament de prémer llargament el botó"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivat"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Saltar capítols"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Canvi d'orientació"
 STR_FONT_FAMILY: "Tipus de lletra"
 STR_FONT_SIZE: "Mida de la lletra (UI)"
 STR_LINE_SPACING: "Interlineat del lector"
@@ -181,6 +187,7 @@ STR_ERROR_GENERAL_FAILURE: "Error: Fallada general"
 STR_ERROR_NETWORK_NOT_FOUND: "Error: No s'ha trobat la xarxa"
 STR_ERROR_CONNECTION_TIMEOUT: "Error: temps de connexió esgotat"
 STR_SD_CARD: "Targeta SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Mantén premut Inici per alternar els fitxers ocults"
 STR_BACK: "« Enrere"
 STR_EXIT: "« Surt"
 STR_HOME: "« Inici"
@@ -224,7 +231,9 @@ STR_TITLE: "Títol"
 STR_BATTERY: "Bateria"
 STR_UI_THEME: "Tema de la interfície"
 STR_THEME_CLASSIC: "Clàssic"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Vista de llibres recents"
+STR_LIST_VIEW: "Llista"
+STR_GRID_VIEW: "Graella"
 STR_THEME_LYRA_EXTENDED: "Lyra Ampliat"
 STR_SUNLIGHT_FADING_FIX: "Correcció de l'esvaïment pel sol"
 STR_REMAP_FRONT_BUTTONS: "Reassigna els botons frontals"
@@ -254,6 +263,7 @@ STR_GO_TO_PERCENT: "Ves al %"
 STR_GO_HOME_BUTTON: "Ves a l'inici"
 STR_SYNC_PROGRESS: "Sincronitza el progrés"
 STR_DELETE_CACHE: "Esborra la memòria cau del llibre"
+STR_BOOK_CACHE_DELETED: "Memòria cau del llibre esborrada"
 STR_DELETE: "Esborra"
 STR_DISPLAY_QR: "Mostra la pàgina com a QR"
 STR_CHAPTER_PREFIX: "Capítol: "
@@ -280,6 +290,7 @@ STR_NO_REMOTE_MSG: "No s'ha trobat progrés remot"
 STR_UPLOAD_PROMPT: "Voleu pujar la posició actual?"
 STR_UPLOAD_SUCCESS: "Progrés pujat!"
 STR_SYNC_FAILED_MSG: "Sincronització fallida"
+STR_SAVE_PROGRESS_FAILED: "No s'ha pogut desar el progrés"
 STR_SECTION_PREFIX: "Secció "
 STR_UPLOAD: "Puja"
 STR_BOOK_S_STYLE: "Estil del llibre"
@@ -291,7 +302,10 @@ STR_NO_FOOTNOTES: "No hi ha notes al peu en aquesta pàgina"
 STR_LINK: "[enllaç]"
 STR_SCREENSHOT_BUTTON: "Fes una captura de pantalla"
 STR_AUTO_TURN_ENABLED: "Passar automàtic activat: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Passar automàtic (pàgines per minut)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval del pas automàtic (segons)"
+STR_AUTO_TURN_STEP_HINT: "Esquerra/Dreta: 1 s Amunt/Avall: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Esquerra/Dreta: 1 min  Amunt/Avall: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Reassigna els botons frontals"
 STR_READING_STATS: "Estadístiques de lectura"
 STR_BOOKMARKS: "Punts de llibre"
diff --git a/lib/I18n/translations/czech.yaml b/lib/I18n/translations/czech.yaml
index 5aff0f25..21b4b106 100644
--- a/lib/I18n/translations/czech.yaml
+++ b/lib/I18n/translations/czech.yaml
@@ -69,7 +69,14 @@ STR_TEXT_AA: "Vyhlazování textu"
 STR_SHORT_PWR_BTN: "Krátké stisknutí tlačítka napájení"
 STR_ORIENTATION: "Orientace čtení"
 STR_SIDE_BTN_LAYOUT: "Rozvržení bočních tlačítek (čtečka)"
-STR_LONG_PRESS_SKIP: "Dlouhé stisknutí Přeskočit kapitolu"
+STR_ORIENTATION_AWARE: "Podle orientace"
+STR_NAV_BUTTONS: "Navigační tlačítka"
+STR_ALL_BUTTONS: "Všechna tlačítka"
+STR_LONG_PRESS_SKIP: "Dlouhé stisknutí pro přeskočení kapitoly"
+STR_LONG_PRESS_BEHAVIOR: "Chování při dlouhém stisknutí tlačítka"
+STR_LONG_PRESS_BEHAVIOR_OFF: "VYP"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Přeskočení kapitoly"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Změna orientace"
 STR_FONT_FAMILY: "Rodina písem čtečky"
 STR_FONT_SIZE: "Velikost písma rozhraní"
 STR_LINE_SPACING: "Řádkování čtečky"
@@ -176,6 +183,7 @@ STR_ERROR_GENERAL_FAILURE: "Chyba: Obecná chyba"
 STR_ERROR_NETWORK_NOT_FOUND: "Chyba: Síť nenalezena"
 STR_ERROR_CONNECTION_TIMEOUT: "Chyba: Časový limit připojení"
 STR_SD_CARD: "SD karta"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Dlouhým stiskem Domů přepnete skryté soubory"
 STR_BACK: "« Zpět"
 STR_EXIT: "« Konec"
 STR_HOME: "« Domů"
@@ -201,7 +209,6 @@ STR_SLEEP_COVER_FILTER: "Filtr obrazovky spánku"
 STR_FILTER_CONTRAST: "Kontrast"
 STR_UI_THEME: "Šablona rozhraní"
 STR_THEME_CLASSIC: "Klasická"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Oprava blednutí na slunci"
@@ -210,6 +217,9 @@ STR_OPDS_BROWSER: "Prohlížeč OPDS"
 STR_COVER_CUSTOM: "Obálka + Vlastní"
 STR_PAGE_OVERLAY: "Překrytí stránky"
 STR_MENU_RECENT_BOOKS: "Nedávné knihy"
+STR_RECENT_BOOKS_VIEW: "Zobrazení nedávných knih"
+STR_LIST_VIEW: "Seznam"
+STR_GRID_VIEW: "Mřížka"
 STR_NO_RECENT_BOOKS: "Žádné nedávné knihy"
 STR_CALIBRE_DESC: "Používat přenosy bezdrátových zařízení Calibre"
 STR_FORGET_AND_REMOVE: "Zapomenout síť a odstranit uložené heslo?"
@@ -232,6 +242,7 @@ STR_GO_TO_PERCENT: "Přejít na %"
 STR_GO_HOME_BUTTON: "Přejít Domů"
 STR_SYNC_PROGRESS: "Průběh synchronizace"
 STR_DELETE_CACHE: "Smazat mezipaměť knihy"
+STR_BOOK_CACHE_DELETED: "Mezipaměť knihy smazána"
 STR_DELETE: "Smazat"
 STR_CHAPTER_PREFIX: "Kapitola:"
 STR_PAGES_SEPARATOR: "stránek |"
@@ -257,6 +268,7 @@ STR_NO_REMOTE_MSG: "Nenalezen žádný vzdálený postup"
 STR_UPLOAD_PROMPT: "Nahrát aktuální pozici?"
 STR_UPLOAD_SUCCESS: "Postup nahrán!"
 STR_SYNC_FAILED_MSG: "Synchronizace se nezdařila"
+STR_SAVE_PROGRESS_FAILED: "Nepodařilo se uložit pokrok"
 STR_SECTION_PREFIX: "Sekce"
 STR_UPLOAD: "Nahrát"
 STR_BOOK_S_STYLE: "Styl knihy"
@@ -267,6 +279,10 @@ STR_GUIDE_READING: "Vodicí tečky"
 STR_OPDS_SERVER_URL: "URL serveru OPDS"
 STR_SCREENSHOT_BUTTON: "Udělat snímek obrazovky"
 STR_REMAP_FRONT_BUTTONS_READER: "Přemapovat přední tlačítka"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval automatického otáčení stránek (sekundy)"
+STR_AUTO_TURN_STEP_HINT: "Vlevo/Vpravo: 1 s Nahoru/Dolů: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Vlevo/Vpravo: 1 min  Nahoru/Dolů: 5 min"
 STR_READING_STATS: "Statistiky čtení"
 STR_BOOKMARKS: "Záložky"
 STR_OPDS_SERVERS: "Servery OPDS"
diff --git a/lib/I18n/translations/danish.yaml b/lib/I18n/translations/danish.yaml
index 7fa46fd5..82a2f99a 100644
--- a/lib/I18n/translations/danish.yaml
+++ b/lib/I18n/translations/danish.yaml
@@ -73,7 +73,14 @@ STR_IMAGES_SUPPRESS: "Skjul"
 STR_SHORT_PWR_BTN: "Kort tryk på tænd/sluk-knap"
 STR_ORIENTATION: "Læseretning"
 STR_SIDE_BTN_LAYOUT: "Knaplayout på siden (læser)"
-STR_LONG_PRESS_SKIP: "Langt tryk spring kapitel over"
+STR_ORIENTATION_AWARE: "Orienteringsbevidst"
+STR_NAV_BUTTONS: "Navigationsknapper"
+STR_ALL_BUTTONS: "Alle knapper"
+STR_LONG_PRESS_SKIP: "Langt tryk for at springe kapitel over"
+STR_LONG_PRESS_BEHAVIOR: "Comportamiento al mantener pulsado el botón"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivado"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Saltar capítulo"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Cambio de orientación"
 STR_FONT_FAMILY: "Læser skrifttype"
 STR_FONT_SIZE: "Læser skriftstørrelse"
 STR_LINE_SPACING: "Linjeafstand"
@@ -181,6 +188,7 @@ STR_ERROR_GENERAL_FAILURE: "Fejl: Generel fejl"
 STR_ERROR_NETWORK_NOT_FOUND: "Fejl: Netværk ikke fundet"
 STR_ERROR_CONNECTION_TIMEOUT: "Fejl: Forbindelses timeout"
 STR_SD_CARD: "SD-kort"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Langt tryk på Hjem viser/skjuler skjulte filer"
 STR_BACK: "« Tilbage"
 STR_EXIT: "« Afslut"
 STR_HOME: "« Hjem"
@@ -224,7 +232,9 @@ STR_TITLE: "Titel"
 STR_BATTERY: "Batteri"
 STR_UI_THEME: "Brugergrænseflade tema"
 STR_THEME_CLASSIC: "Klassisk"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Visning af seneste bøger"
+STR_LIST_VIEW: "Liste"
+STR_GRID_VIEW: "Gitter"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Sollysfading-rettelse"
 STR_REMAP_FRONT_BUTTONS: "Omtildel frontknapper"
@@ -254,6 +264,7 @@ STR_GO_TO_PERCENT: "Gå til %"
 STR_GO_HOME_BUTTON: "Gå til start"
 STR_SYNC_PROGRESS: "Synkroniser fremskridt"
 STR_DELETE_CACHE: "Slet bogcache"
+STR_BOOK_CACHE_DELETED: "Bogcache slettet"
 STR_DELETE: "Slet"
 STR_DISPLAY_QR: "Vis side som QR"
 STR_CHAPTER_PREFIX: "Kapitel: "
@@ -280,6 +291,7 @@ STR_NO_REMOTE_MSG: "Ingen fjernfremskridt fundet"
 STR_UPLOAD_PROMPT: "Upload nuværende position?"
 STR_UPLOAD_SUCCESS: "Fremskridt uploadet!"
 STR_SYNC_FAILED_MSG: "Synkronisering mislykkedes"
+STR_SAVE_PROGRESS_FAILED: "Kunne ikke gemme fremskridt"
 STR_SECTION_PREFIX: "Afsnit "
 STR_UPLOAD: "Upload"
 STR_BOOK_S_STYLE: "Bogens stil"
@@ -291,7 +303,10 @@ STR_NO_FOOTNOTES: "Ingen fodnoter på denne side"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Tag skærmbillede"
 STR_AUTO_TURN_ENABLED: "Automatisk sidevendning aktiveret: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Automatisk vending (sider per minut)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval for automatisk sidevendning (sekunder)"
+STR_AUTO_TURN_STEP_HINT: "Venstre/Højre: 1 s  Op/Ned: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Venstre/Højre: 1 min  Op/Ned: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Omtildel frontknapper"
 STR_READING_STATS: "Læsestatistik"
 STR_BOOKMARKS: "Bogmærker"
diff --git a/lib/I18n/translations/dutch.yaml b/lib/I18n/translations/dutch.yaml
index 76dad492..d19c37be 100644
--- a/lib/I18n/translations/dutch.yaml
+++ b/lib/I18n/translations/dutch.yaml
@@ -73,7 +73,9 @@ STR_IMAGES_SUPPRESS: "Verbergen"
 STR_SHORT_PWR_BTN: "Korte klik aan/uit-knop"
 STR_ORIENTATION: "Leesstand"
 STR_SIDE_BTN_LAYOUT: "Indeling zijknoppen (lezer)"
-STR_LONG_PRESS_SKIP: "Hoofdstuk overslaan (lang indrukken)"
+STR_ORIENTATION_AWARE: "Oriëntatiebewust"
+STR_NAV_BUTTONS: "Navigatieknoppen"
+STR_ALL_BUTTONS: "Alle knoppen"
 STR_FONT_FAMILY: "Lettertype lezer"
 STR_FONT_SIZE: "Lettergrootte lezer"
 STR_LINE_SPACING: "Regelafstand lezer"
@@ -181,6 +183,7 @@ STR_ERROR_GENERAL_FAILURE: "Fout: Algemene fout"
 STR_ERROR_NETWORK_NOT_FOUND: "Fout: Netwerk niet gevonden"
 STR_ERROR_CONNECTION_TIMEOUT: "Fout: Verbindingstime-out"
 STR_SD_CARD: "SD-kaart"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Houd Home ingedrukt om verborgen bestanden te tonen/verbergen"
 STR_BACK: "« Terug"
 STR_EXIT: "« Sluit"
 STR_HOME: "« Home"
@@ -224,7 +227,9 @@ STR_TITLE: "Titel"
 STR_BATTERY: "Batterij"
 STR_UI_THEME: "UI Thema"
 STR_THEME_CLASSIC: "Klassiek"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Weergave recente boeken"
+STR_LIST_VIEW: "Lijst"
+STR_GRID_VIEW: "Raster"
 STR_THEME_LYRA_EXTENDED: "Lyra Uitgebreid"
 STR_SUNLIGHT_FADING_FIX: "Zonlicht vervaging fix"
 STR_REMAP_FRONT_BUTTONS: "Knoppen voorzijde wijzigen"
@@ -254,6 +259,7 @@ STR_GO_TO_PERCENT: "Ga naar %"
 STR_GO_HOME_BUTTON: "Naar Home"
 STR_SYNC_PROGRESS: "Voortgang synchroniseren"
 STR_DELETE_CACHE: "Boekcache verwijderen"
+STR_BOOK_CACHE_DELETED: "Boekcache verwijderd"
 STR_DELETE: "Verwijder"
 STR_DISPLAY_QR: "Pagina als QR tonen"
 STR_CHAPTER_PREFIX: "Hoofdstuk: "
@@ -280,6 +286,7 @@ STR_NO_REMOTE_MSG: "Geen externe voortgang gevonden"
 STR_UPLOAD_PROMPT: "Huidige positie uploaden?"
 STR_UPLOAD_SUCCESS: "Voortgang geüpload!"
 STR_SYNC_FAILED_MSG: "Sync mislukt"
+STR_SAVE_PROGRESS_FAILED: "Voortgang opslaan mislukt"
 STR_SECTION_PREFIX: "Sectie "
 STR_UPLOAD: "Uploaden"
 STR_BOOK_S_STYLE: "Stijl van boek"
@@ -291,7 +298,10 @@ STR_NO_FOOTNOTES: "Geen voetnoten op deze pagina"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Screenshot maken"
 STR_AUTO_TURN_ENABLED: "Automatisch omslaan ingeschakeld: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Autom. omslaan (pagina's per minuut)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval automatisch omslaan (seconden)"
+STR_AUTO_TURN_STEP_HINT: "Links/Rechts: 1 s  Omhoog/Omlaag: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Links/Rechts: 1 min  Omhoog/Omlaag: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Knoppen voorzijde wijzigen"
 STR_READING_STATS: "Leesstatistieken"
 STR_BOOKMARKS: "Bladwijzers"
diff --git a/lib/I18n/translations/english.yaml b/lib/I18n/translations/english.yaml
index 0df536b4..0bddf957 100644
--- a/lib/I18n/translations/english.yaml
+++ b/lib/I18n/translations/english.yaml
@@ -7,8 +7,11 @@ STR_BOOTING: "BOOTING"
 STR_SLEEPING: "SLEEPING"
 STR_ENTERING_SLEEP: "Going to sleep"
 STR_BROWSE_FILES: "Browse Files"
+STR_BROWSE: "Browse"
 STR_FILE_TRANSFER: "File Transfer"
 STR_SETTINGS_TITLE: "Settings"
+STR_READ: "Read"
+STR_MENU: "Menu"
 STR_CONTINUE_READING: "Continue Reading"
 STR_NO_OPEN_BOOK: "No open book"
 STR_START_READING: "Start reading below"
@@ -29,6 +32,7 @@ STR_NO_NETWORKS: "No networks found"
 STR_NETWORKS_FOUND: "%zu networks found"
 STR_SCANNING: "Scanning..."
 STR_BLUETOOTH: "Bluetooth"
+STR_BT_QUICK_CONNECT: "BT Quick Connect"
 STR_CONNECTING: "Connecting..."
 STR_CONNECTED: "Connected!"
 STR_CONNECTION_FAILED: "Connection Failed"
@@ -74,12 +78,19 @@ STR_IMAGES_DISPLAY: "Display"
 STR_IMAGES_PLACEHOLDER: "Placeholder"
 STR_IMAGES_SUPPRESS: "Suppress"
 STR_SHORT_PWR_BTN: "Short-press Action"
-STR_ORIENTATION: "Reading Orientation"
+STR_ORIENTATION: "Orientation"
 STR_SIDE_BTN_LAYOUT: "Layout"
+STR_ORIENTATION_AWARE: "Orientation Aware"
+STR_NAV_BUTTONS: "Nav Buttons"
+STR_ALL_BUTTONS: "All Buttons"
 STR_LONG_PRESS_SKIP: "Long-press Chapter Skip"
 STR_SIDE_BTN_LONG_PRESS: "Long-press Action"
 STR_CHAPTER_SKIP_OPT: "Chapter Skip"
 STR_CHANGE_FONT_SIZE: "Change Font Size"
+STR_LONG_PRESS_BEHAVIOR: "Long-press Button Behavior"
+STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Chapter skip"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Orientation change"
 STR_FONT_FAMILY: "Font Family"
 STR_FONT_SIZE: "Font Size"
 STR_LINE_SPACING: "Line Spacing"
@@ -180,6 +191,7 @@ STR_NO_UPDATE: "No update available"
 STR_UPDATE_FAILED: "Update failed"
 STR_UPDATE_COMPLETE: "Update complete"
 STR_POWER_ON_HINT: "Press and hold power button to turn back on"
+STR_RESTARTING_HINT: "Restarting... If device does not restart, hold the power button for a few seconds."
 STR_NO_ENTRIES: "No entries found"
 STR_DOWNLOADING: "Downloading..."
 STR_DOWNLOAD_FAILED: "Download failed"
@@ -196,6 +208,7 @@ STR_ERROR_GENERAL_FAILURE: "Error: General failure"
 STR_ERROR_NETWORK_NOT_FOUND: "Error: Network not found"
 STR_ERROR_CONNECTION_TIMEOUT: "Error: Connection timeout"
 STR_SD_CARD: "SD card"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Long-press HOME key to toggle hidden files"
 STR_BACK: "« Back"
 STR_EXIT: "« Exit"
 STR_HOME: "« Home"
@@ -239,12 +252,20 @@ STR_EXAMPLE_BOOK: "Book Title"
 STR_PREVIEW: "Preview"
 STR_TITLE: "Title"
 STR_BATTERY: "Battery"
+STR_XTC_STATUS_BAR: "XTC Status Bar"
+STR_BOTTOM: "Bottom"
+STR_TOP: "Top"
 STR_UI_THEME: "UI Theme"
 STR_THEME_CLASSIC: "Classic"
 STR_THEME_LYRA: "Lyra"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_THEME_FLOW: "Flow"
+STR_THEME_LYRA_CAROUSEL: "Lyra Carousel"
+STR_THEME_MINIMAL: "Minimal"
+STR_RECENT_BOOKS_VIEW: "Recent Books View"
+STR_LIST_VIEW: "List"
+STR_GRID_VIEW: "Grid"
 STR_SUNLIGHT_FADING_FIX: "Sunlight Fading Fix"
 STR_REMAP_FRONT_BUTTONS: "Remap Front Buttons"
 STR_REMAP_FRONT_BUTTONS_READER: "Remap Front Buttons (reader)"
@@ -276,6 +297,7 @@ STR_GO_TO_PERCENT: "Go to %"
 STR_GO_HOME_BUTTON: "Go Home"
 STR_SYNC_PROGRESS: "Sync Progress"
 STR_DELETE_CACHE: "Delete Book Cache"
+STR_BOOK_CACHE_DELETED: "Book Cache Deleted"
 STR_DELETE: "Delete"
 STR_PIN_AS_FAVORITE: "Pin as Favorite"
 STR_UNPIN_AS_FAVORITE: "Unpin as Favorite"
@@ -305,6 +327,7 @@ STR_NO_REMOTE_MSG: "No remote progress found"
 STR_UPLOAD_PROMPT: "Upload current position?"
 STR_UPLOAD_SUCCESS: "Progress uploaded!"
 STR_SYNC_FAILED_MSG: "Sync failed"
+STR_SAVE_PROGRESS_FAILED: "Could not save progress"
 STR_SECTION_PREFIX: "Section "
 STR_UPLOAD: "Upload"
 STR_BOOK_S_STYLE: "Book's Style"
@@ -312,12 +335,16 @@ STR_EMBEDDED_STYLE: "Embedded Style"
 STR_BIONIC_READING: "Bionic Reading"
 STR_GUIDE_READING: "Guide Dots"
 STR_OPDS_SERVER_URL: "OPDS Server URL"
+STR_SET_SLEEP_COVER: "Set Cover"
 STR_FOOTNOTES: "Footnotes"
 STR_NO_FOOTNOTES: "No footnotes on this page"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Take Screenshot"
 STR_AUTO_TURN_ENABLED: "Auto Page Turn Enabled: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Auto Page Turn Interval (seconds)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Auto Page Turn Interval (seconds)"
+STR_AUTO_TURN_STEP_HINT: "Left/Right: 1s  Up/Down: 5s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Left/Right: 1 min  Up/Down: 5 min"
 STR_READING_STATS: "Reading Stats"
 STR_MARK_FINISHED: "Mark as Finished"
 STR_MARK_UNFINISHED: "Mark as Unfinished"
@@ -358,6 +385,24 @@ STR_DELETE_CONFIRM: "Delete this server?"
 STR_OPDS_SERVERS: "OPDS Servers"
 STR_MOVE_TO_READ_FAILED_TITLE: "Could not move book"
 STR_MOVE_TO_READ_FAILED_BODY: "Failed to move \"%s\" to /Read folder."
+STR_DOWNLOAD_FONTS: "Download Fonts"
+STR_FONT_DOWNLOAD: "Font Download"
+STR_MANAGE_FONTS: "Manage Fonts"
+STR_FONT_BROWSER: "Font Browser"
+STR_LOADING_FONT_LIST: "Loading font list..."
+STR_NO_FONTS_AVAILABLE: "No fonts available"
+STR_FONT_INSTALLED: "Font installed!"
+STR_FONT_INSTALL_FAILED: "Font installation failed"
+STR_INSTALLED: "Installed"
+STR_CONFIRM_DOWNLOAD_PROMPT: "Download?"
+STR_SD_CARD_FULL: "Insufficient SD card space"
+STR_FILES_LABEL: "Files: "
+STR_SIZE_LABEL: "Size: "
+STR_REDOWNLOAD: "Re-download"
+STR_DOWNLOAD_ALL: "Download All"
+STR_UPDATE_ALL: "Update All"
+STR_ALL_FONTS_INSTALLED: "All fonts installed!"
+STR_UPDATE_AVAILABLE: "Update"
 STR_CRASH_TITLE: "System Crash"
 STR_CRASH_DESCRIPTION: "A detailed report was saved to crash_report.txt. Please include this file in your bug report."
 STR_CRASH_REASON: "Crash reason:"
@@ -396,3 +441,18 @@ STR_MARKED_FINISHED: "Marked as Finished"
 STR_MARKED_UNFINISHED: "Marked as Unfinished"
 STR_LOW_MEMORY_IMAGES_TITLE: "Chapter loaded without images"
 STR_LOW_MEMORY_IMAGES_BODY: "Available memory was too low to extract images for this chapter."
+STR_EPUB_LAYOUT_MEMORY_TITLE: "Cannot load chapter"
+STR_EPUB_LAYOUT_MEMORY_BODY: "This chapter uses too much memory to lay out. The EPUB may be corrupted or badly formatted."
+STR_SD_FIRMWARE_UPDATE: "SD Card Firmware Update"
+STR_SELECT_FIRMWARE_FILE: "Select firmware file (.bin)"
+STR_NO_BIN_FILES: "No .bin files found"
+STR_VALIDATING_FIRMWARE: "Validating firmware..."
+STR_INVALID_FIRMWARE: "Invalid firmware file"
+STR_FIRMWARE_TOO_LARGE: "Firmware too large for partition"
+STR_FIRMWARE_TOO_SMALL: "Firmware file is too small"
+STR_FIRMWARE_UPDATE_PROMPT: "Update firmware?"
+STR_FIRMWARE_FILE_OPEN_FAILED: "Cannot open file"
+STR_FIRMWARE_WRITE_FAILED: "Firmware write failed"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Do not power off!"
+STR_RECOVERY_MODE: "Recovery Mode"
+STR_RECOVERY_MODE_HINT: "Place firmware.bin on SD card root and select it"
diff --git a/lib/I18n/translations/finnish.yaml b/lib/I18n/translations/finnish.yaml
index 0315f96c..4e825711 100644
--- a/lib/I18n/translations/finnish.yaml
+++ b/lib/I18n/translations/finnish.yaml
@@ -69,7 +69,10 @@ STR_TEXT_AA: "Tekstin reunanpehmennys"
 STR_SHORT_PWR_BTN: "Lyhyt virtapainikkeen painallus"
 STR_ORIENTATION: "Lukusuunta"
 STR_SIDE_BTN_LAYOUT: "Sivupainikkeiden asettelu (lukija)"
-STR_LONG_PRESS_SKIP: "Pitkä painallus: lukuhyppy"
+STR_ORIENTATION_AWARE: "Suunnan huomioiva"
+STR_NAV_BUTTONS: "Navigointipainikkeet"
+STR_ALL_BUTTONS: "Kaikki painikkeet"
+STR_LONG_PRESS_SKIP: "Pitkän painalluksen lukuhyppy"
 STR_FONT_FAMILY: "Lukijan fonttiperhe"
 STR_FONT_SIZE: "Käyttöliittymän fonttikoko"
 STR_LINE_SPACING: "Lukijan riviväli"
@@ -176,6 +179,7 @@ STR_ERROR_GENERAL_FAILURE: "Virhe: Yleinen virhe"
 STR_ERROR_NETWORK_NOT_FOUND: "Virhe: Verkkoa ei löytynyt"
 STR_ERROR_CONNECTION_TIMEOUT: "Virhe: Yhteys aikakatkaistiin"
 STR_SD_CARD: "SD-kortti"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Pidä Koti painettuna näyttääksesi/piilottaaksesi piilotetut tiedostot"
 STR_BACK: "« Takaisin"
 STR_EXIT: "« Poistu"
 STR_HOME: "« Koti"
@@ -201,7 +205,9 @@ STR_SLEEP_COVER_FILTER: "Lepotilanäytön kansisuodatin"
 STR_FILTER_CONTRAST: "Kontrasti"
 STR_UI_THEME: "Käyttöliittymäteema"
 STR_THEME_CLASSIC: "Klassinen"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Viimeisimpien kirjojen näkymä"
+STR_LIST_VIEW: "Luettelo"
+STR_GRID_VIEW: "Ruudukko"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Auringonvalon haalistumiskorjaus"
 STR_REMAP_FRONT_BUTTONS: "Uudelleenmääritä etupainikkeet"
@@ -231,6 +237,7 @@ STR_GO_TO_PERCENT: "Siirry kohtaan %"
 STR_GO_HOME_BUTTON: "Siirry kotiin"
 STR_SYNC_PROGRESS: "Synkronoi edistyminen"
 STR_DELETE_CACHE: "Poista kirjan välimuisti"
+STR_BOOK_CACHE_DELETED: "Kirjan välimuisti poistettu"
 STR_CHAPTER_PREFIX: "Luku: "
 STR_PAGES_SEPARATOR: " sivua  |  "
 STR_BOOK_PREFIX: "Kirja: "
@@ -255,6 +262,7 @@ STR_NO_REMOTE_MSG: "Etäedistymistä ei löytynyt"
 STR_UPLOAD_PROMPT: "Lähetä nykyinen sijainti?"
 STR_UPLOAD_SUCCESS: "Edistyminen lähetetty!"
 STR_SYNC_FAILED_MSG: "Synkronointi epäonnistui"
+STR_SAVE_PROGRESS_FAILED: "Edistymisen tallennus epäonnistui"
 STR_SECTION_PREFIX: "Osio "
 STR_UPLOAD: "Lähetä"
 STR_BOOK_S_STYLE: "Kirjan tyyli"
@@ -263,6 +271,10 @@ STR_BIONIC_READING: "Keskittynyt lukeminen"
 STR_OPDS_SERVER_URL: "OPDS-palvelimen osoite"
 STR_SCREENSHOT_BUTTON: "Ota kuvakaappaus"
 STR_REMAP_FRONT_BUTTONS_READER: "Uudelleenmääritä etupainikkeet"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Automaattisen sivunkäännön väli (sekuntia)"
+STR_AUTO_TURN_STEP_HINT: "Vasen/Oikea: 1 s  Ylös/Alas: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Vasen/Oikea: 1 min  Ylös/Alas: 5 min"
 STR_READING_STATS: "Lukutilastot"
 STR_BOOKMARKS: "Kirjanmerkit"
 STR_OPDS_SERVERS: "OPDS-palvelimet"
diff --git a/lib/I18n/translations/french.yaml b/lib/I18n/translations/french.yaml
index e3052dd4..bf8783f8 100644
--- a/lib/I18n/translations/french.yaml
+++ b/lib/I18n/translations/french.yaml
@@ -73,7 +73,14 @@ STR_IMAGES_SUPPRESS: "Masquer"
 STR_SHORT_PWR_BTN: "Appui court alim."
 STR_ORIENTATION: "Orientation de lecture"
 STR_SIDE_BTN_LAYOUT: "Boutons latéraux"
-STR_LONG_PRESS_SKIP: "Appui long saut de chapitre"
+STR_ORIENTATION_AWARE: "Selon l'orientation"
+STR_NAV_BUTTONS: "Boutons navigation"
+STR_ALL_BUTTONS: "Tous les boutons"
+STR_LONG_PRESS_SKIP: "Appui long : saut de chapitre"
+STR_LONG_PRESS_BEHAVIOR: "Comportement lors d'un appui long"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Désactivé"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Saut de chapitre"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Changement d'orientation"
 STR_FONT_FAMILY: "Police de caractères du lecteur"
 STR_FONT_SIZE: "Taille texte interface"
 STR_LINE_SPACING: "Interligne"
@@ -181,6 +188,7 @@ STR_ERROR_GENERAL_FAILURE: "Erreur : Échec général"
 STR_ERROR_NETWORK_NOT_FOUND: "Erreur : Réseau introuvable"
 STR_ERROR_CONNECTION_TIMEOUT: "Erreur : Délai dépassé"
 STR_SD_CARD: "Carte SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Appui long sur Accueil pour afficher/masquer les fichiers cachés"
 STR_BACK: "« Retour"
 STR_EXIT: "« Quitter"
 STR_HOME: "« Accueil"
@@ -224,7 +232,9 @@ STR_TITLE: "Titre"
 STR_BATTERY: "Batterie"
 STR_UI_THEME: "Thème interface"
 STR_THEME_CLASSIC: "Classique"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Vue des livres récents"
+STR_LIST_VIEW: "Liste"
+STR_GRID_VIEW: "Grille"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Correction lisibilité au soleil"
@@ -255,6 +265,7 @@ STR_GO_TO_PERCENT: "Aller à %"
 STR_GO_HOME_BUTTON: "Retour Accueil"
 STR_SYNC_PROGRESS: "Synchro progression"
 STR_DELETE_CACHE: "Supprimer cache livre"
+STR_BOOK_CACHE_DELETED: "Cache du livre supprimé"
 STR_DELETE: "Supprimer"
 STR_DISPLAY_QR: "Afficher la page en QR"
 STR_CHAPTER_PREFIX: "Chapitre : "
@@ -281,6 +292,7 @@ STR_NO_REMOTE_MSG: "Aucune progression en ligne"
 STR_UPLOAD_PROMPT: "Envoyer position actuelle ?"
 STR_UPLOAD_SUCCESS: "Progression envoyée !"
 STR_SYNC_FAILED_MSG: "Échec de la synchro"
+STR_SAVE_PROGRESS_FAILED: "Échec de l'enregistrement"
 STR_SECTION_PREFIX: "Section "
 STR_UPLOAD: "Envoyer"
 STR_BOOK_S_STYLE: "Style du livre"
@@ -292,7 +304,10 @@ STR_NO_FOOTNOTES: "Aucune note sur cette page"
 STR_LINK: "[lien]"
 STR_SCREENSHOT_BUTTON: "Capture d'écran"
 STR_AUTO_TURN_ENABLED: "Tourne-page auto : "
-STR_AUTO_TURN_PAGES_PER_MIN: "Tourne-page auto (pages par minute)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervalle du tourne-page auto (secondes)"
+STR_AUTO_TURN_STEP_HINT: "Gauche/Droite : 1 s  Haut/Bas : 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Gauche/Droite : 1 min  Haut/Bas : 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Configurer boutons façade"
 STR_READING_STATS: "Statistiques de lecture"
 STR_BOOKMARKS: "Signets"
diff --git a/lib/I18n/translations/german.yaml b/lib/I18n/translations/german.yaml
index 574c24f6..ea24d6df 100644
--- a/lib/I18n/translations/german.yaml
+++ b/lib/I18n/translations/german.yaml
@@ -68,9 +68,16 @@ STR_EXTRA_SPACING: "Absatzabstand"
 STR_TEXT_AA: "Schriftglättung"
 STR_SHORT_PWR_BTN: "Aktion bei kurzem Druck"
 STR_ORIENTATION: "Leseausrichtung"
-STR_SIDE_BTN_LAYOUT: "Layout"
+STR_SIDE_BTN_LAYOUT: "Seitliche Tasten (Lesen)"
+STR_ORIENTATION_AWARE: "Ausrichtungsabhängig"
+STR_NAV_BUTTONS: "Navigationstasten"
+STR_ALL_BUTTONS: "Alle Tasten"
 STR_LONG_PRESS_SKIP: "Langes Drücken springt Kap."
 STR_SIDE_BTN_LONG_PRESS: "Aktion bei langem Druck"
+STR_LONG_PRESS_BEHAVIOR: "Verhalten bei langem Tastendruck"
+STR_LONG_PRESS_BEHAVIOR_OFF: "AUS"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Kapitel überspringen"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Ausrichtung ändern"
 STR_FONT_FAMILY: "Lese-Schriftfamilie"
 STR_FONT_SIZE: "Schriftgröße"
 STR_LINE_SPACING: "Lese-Zeilenabstand"
@@ -182,6 +189,7 @@ STR_ERROR_GENERAL_FAILURE: "Fehler: Allgemeiner Fehler"
 STR_ERROR_NETWORK_NOT_FOUND: "Fehler: Kein Netzwerk"
 STR_ERROR_CONNECTION_TIMEOUT: "Fehler: Zeitüberschreitung"
 STR_SD_CARD: "SD-Karte"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Home-Taste lang drücken, um versteckte Dateien umzuschalten"
 STR_BACK: "« Zurück"
 STR_EXIT: "« Verlassen"
 STR_HOME: "« Start"
@@ -225,7 +233,6 @@ STR_TITLE: "Titel"
 STR_BATTERY: "Batterie"
 STR_UI_THEME: "System-Design"
 STR_THEME_CLASSIC: "Klassisch"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Anti-Verblassen"
@@ -234,6 +241,9 @@ STR_REMAP_FRONT_BUTTONS_READER: "Vordere Tasten belegen (Lesen)"
 STR_OPDS_BROWSER: "OPDS-Browser"
 STR_COVER_CUSTOM: "Umschlag + Eigenes"
 STR_MENU_RECENT_BOOKS: "Zuletzt gelesen"
+STR_RECENT_BOOKS_VIEW: "Ansicht der letzten Bücher"
+STR_LIST_VIEW: "Liste"
+STR_GRID_VIEW: "Raster"
 STR_NO_RECENT_BOOKS: "Keine Bücher"
 STR_CALIBRE_DESC: "Calibre-Übertragung (WLAN)"
 STR_FORGET_AND_REMOVE: "WLAN entfernen & Passwort löschen?"
@@ -256,6 +266,7 @@ STR_GO_TO_PERCENT: "Gehe zu %"
 STR_GO_HOME_BUTTON: "Zum Anfang"
 STR_SYNC_PROGRESS: "Fortschritt synchronisieren"
 STR_DELETE_CACHE: "Buch-Cache leeren"
+STR_BOOK_CACHE_DELETED: "Buch-Cache gelöscht"
 STR_DISPLAY_QR: "Seite als QR anzeigen"
 STR_DELETE: "Löschen"
 STR_REMOVE: "Entfernen"
@@ -283,6 +294,7 @@ STR_NO_REMOTE_MSG: "Kein externer Fortschritt"
 STR_UPLOAD_PROMPT: "Aktuelle Position hochladen?"
 STR_UPLOAD_SUCCESS: "Hochgeladen!"
 STR_SYNC_FAILED_MSG: "Fehlgeschlagen"
+STR_SAVE_PROGRESS_FAILED: "Fortschritt konnte nicht gespeichert werden"
 STR_SECTION_PREFIX: "Abschnitt"
 STR_UPLOAD: "Hochladen"
 STR_BOOK_S_STYLE: "Buch-Stil"
@@ -294,7 +306,10 @@ STR_FOOTNOTES: "Fußnoten"
 STR_NO_FOOTNOTES: "Keine Fußnoten auf dieser Seite"
 STR_LINK: "[Link]"
 STR_AUTO_TURN_ENABLED: "Auto-Umblättern aktiv: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Auto-Umblättern (Seiten/Min.)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervall für Auto-Umblättern (Sek.)"
+STR_AUTO_TURN_STEP_HINT: "links/rechts: 1 s  hoch/runter: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u Min."
+STR_SLEEP_TIMER_STEP_HINT: "Links/Rechts: 1 Min.  Hoch/Runter: 5 Min."
 STR_IMAGES: "Bilder"
 STR_IMAGES_DISPLAY: "Darstellung"
 STR_IMAGES_PLACEHOLDER: "Platzhalter"
diff --git a/lib/I18n/translations/hungarian.yaml b/lib/I18n/translations/hungarian.yaml
index 6e4cac8d..22023d68 100644
--- a/lib/I18n/translations/hungarian.yaml
+++ b/lib/I18n/translations/hungarian.yaml
@@ -73,6 +73,9 @@ STR_IMAGES_SUPPRESS: "Elnyomás"
 STR_SHORT_PWR_BTN: "Rövid bekapcsológomb nyomás"
 STR_ORIENTATION: "Olvasási irány"
 STR_SIDE_BTN_LAYOUT: "Oldalsó gomb elrendezés (olvasó)"
+STR_ORIENTATION_AWARE: "Tájolásfüggő"
+STR_NAV_BUTTONS: "Navigációs gombok"
+STR_ALL_BUTTONS: "Minden gomb"
 STR_LONG_PRESS_SKIP: "Hosszú nyomás - fejezet ugrás"
 STR_FONT_FAMILY: "Olvasó betűkészlet"
 STR_FONT_SIZE: "Olvasó betűméret"
@@ -181,6 +184,7 @@ STR_ERROR_GENERAL_FAILURE: "Hiba: Általános hiba"
 STR_ERROR_NETWORK_NOT_FOUND: "Hiba: Hálózat nem található"
 STR_ERROR_CONNECTION_TIMEOUT: "Hiba: Kapcsolat időtúllépés"
 STR_SD_CARD: "SD kártya"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Tartsd nyomva a Főoldalgombot a rejtett fájlok váltásához"
 STR_BACK: "« Vissza"
 STR_EXIT: "« Kilépés"
 STR_HOME: "« Főoldal"
@@ -224,7 +228,6 @@ STR_TITLE: "Cím"
 STR_BATTERY: "Akkumulátor"
 STR_UI_THEME: "Felhasználói felület téma"
 STR_THEME_CLASSIC: "Klasszikus"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Napfény halványulás javítás"
 STR_REMAP_FRONT_BUTTONS: "Elülső gombok átállítása"
@@ -232,6 +235,9 @@ STR_OPDS_BROWSER: "OPDS böngésző"
 STR_COVER_CUSTOM: "Borító + Egyéni"
 STR_PAGE_OVERLAY: "Oldalátfedés"
 STR_MENU_RECENT_BOOKS: "Legutóbbi könyvek"
+STR_RECENT_BOOKS_VIEW: "Legutóbbi könyvek nézete"
+STR_LIST_VIEW: "Lista"
+STR_GRID_VIEW: "Rács"
 STR_NO_RECENT_BOOKS: "Nincsenek legutóbbi könyvek"
 STR_CALIBRE_DESC: "Calibre wireless eszköz átvitel használata"
 STR_FORGET_AND_REMOVE: "Hálózat elfelejtése és mentett jelszó törlése?"
@@ -254,6 +260,7 @@ STR_GO_TO_PERCENT: "Ugrás %-ra"
 STR_GO_HOME_BUTTON: "Főoldalra"
 STR_SYNC_PROGRESS: "Haladás szinkronizálása"
 STR_DELETE_CACHE: "Könyv gyorsítótár törlése"
+STR_BOOK_CACHE_DELETED: "Könyv gyorsítótára törölve"
 STR_DELETE: "Törlés"
 STR_DISPLAY_QR: "Oldal megjelenítése QR-ként"
 STR_CHAPTER_PREFIX: "Fejezet: "
@@ -280,6 +287,7 @@ STR_NO_REMOTE_MSG: "Nem található távoli haladás"
 STR_UPLOAD_PROMPT: "Jelenlegi pozíció feltöltése?"
 STR_UPLOAD_SUCCESS: "Haladás feltöltve!"
 STR_SYNC_FAILED_MSG: "Szinkronizálás sikertelen"
+STR_SAVE_PROGRESS_FAILED: "A haladás mentése sikertelen"
 STR_SECTION_PREFIX: "Szakasz "
 STR_UPLOAD: "Feltöltés"
 STR_BOOK_S_STYLE: "Könyv stílusa"
@@ -291,7 +299,10 @@ STR_NO_FOOTNOTES: "Nincsenek lábjegyzetek ezen az oldalon"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Képernyőkép készítése"
 STR_AUTO_TURN_ENABLED: "Automatikus lapozás bekapcsolva: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Automatikus lapozás (oldal/perc)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Automatikus lapozási időköz (másodperc)"
+STR_AUTO_TURN_STEP_HINT: "Bal/Jobb: 1 mp  Fel/Le: 5 mp"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u perc"
+STR_SLEEP_TIMER_STEP_HINT: "Bal/Jobb: 1 perc  Fel/Le: 5 perc"
 STR_REMAP_FRONT_BUTTONS_READER: "Elülső gombok átállítása"
 STR_READING_STATS: "Olvasási statisztikák"
 STR_BOOKMARKS: "Könyvjelzők"
diff --git a/lib/I18n/translations/italian.yaml b/lib/I18n/translations/italian.yaml
index 6a9ff6cf..6fb9d8a0 100644
--- a/lib/I18n/translations/italian.yaml
+++ b/lib/I18n/translations/italian.yaml
@@ -73,6 +73,9 @@ STR_IMAGES_SUPPRESS: "Nascondi"
 STR_SHORT_PWR_BTN: "Pressione breve tasto accensione"
 STR_ORIENTATION: "Orientamento lettura"
 STR_SIDE_BTN_LAYOUT: "Pulsanti laterali (lettore)"
+STR_ORIENTATION_AWARE: "In base all'orientamento"
+STR_NAV_BUTTONS: "Pulsanti navigazione"
+STR_ALL_BUTTONS: "Tutti i pulsanti"
 STR_LONG_PRESS_SKIP: "Pressione lunga: salta capitolo"
 STR_FONT_FAMILY: "Font lettore"
 STR_FONT_SIZE: "Dimensione font lettore"
@@ -181,6 +184,7 @@ STR_ERROR_GENERAL_FAILURE: "Errore: operazione non riuscita"
 STR_ERROR_NETWORK_NOT_FOUND: "Errore: rete non trovata"
 STR_ERROR_CONNECTION_TIMEOUT: "Errore: timeout connessione"
 STR_SD_CARD: "Scheda SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Tenere premuto Home per mostrare/nascondere i file nascosti"
 STR_BACK: "« Indietro"
 STR_EXIT: "« Esci"
 STR_HOME: "« Home"
@@ -224,7 +228,6 @@ STR_TITLE: "Titolo"
 STR_BATTERY: "Batteria"
 STR_UI_THEME: "Tema interfaccia"
 STR_THEME_CLASSIC: "Classico"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_LYRA_EXTENDED: "Lyra esteso"
 STR_SUNLIGHT_FADING_FIX: "Correzione luce solare"
 STR_REMAP_FRONT_BUTTONS: "Rimappa pulsanti frontali"
@@ -232,6 +235,9 @@ STR_OPDS_BROWSER: "Browser OPDS"
 STR_COVER_CUSTOM: "Copertina + Wallpaper"
 STR_PAGE_OVERLAY: "Sovrapposizione pagina"
 STR_MENU_RECENT_BOOKS: "Libri recenti"
+STR_RECENT_BOOKS_VIEW: "Vista libri recenti"
+STR_LIST_VIEW: "Elenco"
+STR_GRID_VIEW: "Griglia"
 STR_NO_RECENT_BOOKS: "Nessun libro recente"
 STR_CALIBRE_DESC: "Trasferimento wireless con Calibre"
 STR_FORGET_AND_REMOVE: "Eliminare la rete e la password salvata?"
@@ -254,6 +260,7 @@ STR_GO_TO_PERCENT: "Vai al %"
 STR_GO_HOME_BUTTON: "Vai alla home"
 STR_SYNC_PROGRESS: "Sincronizza avanzamento"
 STR_DELETE_CACHE: "Elimina cache libro"
+STR_BOOK_CACHE_DELETED: "Cache libro eliminata"
 STR_DELETE: "Elimina"
 STR_DISPLAY_QR: "Mostra pagina come QR"
 STR_CHAPTER_PREFIX: "Capitolo: "
@@ -280,6 +287,7 @@ STR_NO_REMOTE_MSG: "Nessun avanzamento remoto trovato"
 STR_UPLOAD_PROMPT: "Inviare la posizione attuale?"
 STR_UPLOAD_SUCCESS: "Avanzamenti inviati!"
 STR_SYNC_FAILED_MSG: "Sincronizzazione non riuscita"
+STR_SAVE_PROGRESS_FAILED: "Impossibile salvare il progresso"
 STR_SECTION_PREFIX: "Sezione "
 STR_UPLOAD: "Carica"
 STR_BOOK_S_STYLE: "Stile libro"
@@ -291,7 +299,10 @@ STR_NO_FOOTNOTES: "Nessuna nota in questa pagina"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Screenshot"
 STR_AUTO_TURN_ENABLED: "Cambio pagina automatico: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Cambio pagina automatico (pag/min)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervallo di cambio pagina automatico (secondi)"
+STR_AUTO_TURN_STEP_HINT: "Sinistra/Destra: 1 s  Su/Giù: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Sinistra/Destra: 1 min  Su/Giù: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Rimappa pulsanti frontali"
 STR_READING_STATS: "Statistiche di lettura"
 STR_BOOKMARKS: "Segnalibri"
diff --git a/lib/I18n/translations/kazakh.yaml b/lib/I18n/translations/kazakh.yaml
index 5f090d18..53ee2cc6 100644
--- a/lib/I18n/translations/kazakh.yaml
+++ b/lib/I18n/translations/kazakh.yaml
@@ -68,6 +68,9 @@ STR_TEXT_AA: "Мәтін сырғытпасы"
 STR_SHORT_PWR_BTN: "Қуат түймесін қысқа басу"
 STR_ORIENTATION: "Оқу бағдары"
 STR_SIDE_BTN_LAYOUT: "Бүйірлік түймелер орналасуы (оқырман)"
+STR_ORIENTATION_AWARE: "Бағдарға қарай"
+STR_NAV_BUTTONS: "Навигация түймелері"
+STR_ALL_BUTTONS: "Барлық түймелер"
 STR_LONG_PRESS_SKIP: "Ұзақ басу арқылы тарау өткізу"
 STR_FONT_FAMILY: "Оқырман қаріп тобы"
 STR_FONT_SIZE: "Интерфейс қаріп өлшемі"
@@ -175,6 +178,7 @@ STR_ERROR_GENERAL_FAILURE: "Қате: Жалпы сәтсіздік"
 STR_ERROR_NETWORK_NOT_FOUND: "Қате: Желі табылмады"
 STR_ERROR_CONNECTION_TIMEOUT: "Қате: Қосылу уақыты өтті"
 STR_SD_CARD: "SD карта"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Жасырын файлдарды ауыстыру үшін Басты түймесін ұзақ басыңыз"
 STR_BACK: "« Артқа"
 STR_EXIT: "« Шығу"
 STR_HOME: "« Басты"
@@ -200,7 +204,9 @@ STR_SLEEP_COVER_FILTER: "Ұйқы экраны мұқаба сүзгісі"
 STR_FILTER_CONTRAST: "Контраст"
 STR_UI_THEME: "Интерфейс тақырыбы"
 STR_THEME_CLASSIC: "Классикалық"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Соңғы кітаптар көрінісі"
+STR_LIST_VIEW: "Тізім"
+STR_GRID_VIEW: "Тор"
 STR_THEME_LYRA_EXTENDED: "Lyra кеңейтілген"
 STR_SUNLIGHT_FADING_FIX: "Күн сәулесінен солу түзету"
 STR_REMAP_FRONT_BUTTONS: "Алдыңғы түймелерді қайта баптау"
@@ -230,6 +236,7 @@ STR_GO_TO_PERCENT: "%-ке өту"
 STR_GO_HOME_BUTTON: "Басты бетке өту"
 STR_SYNC_PROGRESS: "Үлгерімді синхрондау"
 STR_DELETE_CACHE: "Кітап кэшін жою"
+STR_BOOK_CACHE_DELETED: "Кітап кэші жойылды"
 STR_CHAPTER_PREFIX: "Тарау: "
 STR_PAGES_SEPARATOR: " бет  |  "
 STR_BOOK_PREFIX: "Кітап: "
@@ -254,6 +261,7 @@ STR_NO_REMOTE_MSG: "Қашықтағы үлгерім табылмады"
 STR_UPLOAD_PROMPT: "Ағымдағы орынды жүктеп салу керек пе?"
 STR_UPLOAD_SUCCESS: "Үлгерім жүктеп салынды!"
 STR_SYNC_FAILED_MSG: "Синхрондау сәтсіз"
+STR_SAVE_PROGRESS_FAILED: "Прогресті сақтау мүмкін болмады"
 STR_SECTION_PREFIX: "Бөлім "
 STR_UPLOAD: "Жүктеп салу"
 STR_BOOK_S_STYLE: "Кітап стилі"
@@ -290,7 +298,10 @@ STR_NO_FOOTNOTES: "Бұл бетте түсіндірме жазбалар жо
 STR_LINK: "[сілтеме]"
 STR_SCREENSHOT_BUTTON: "Скриншот түсіру"
 STR_AUTO_TURN_ENABLED: "Автоматты бет аудару қосулы: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Автоматты бет аудару (минутына бет саны)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Автоматты бет аудару аралығы (секунд)"
+STR_AUTO_TURN_STEP_HINT: "Сол/Оң: 1 с  Жоғары/Төмен: 5 с"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u мин"
+STR_SLEEP_TIMER_STEP_HINT: "Сол/Оң: 1 мин  Жоғары/Төмен: 5 мин"
 STR_REMAP_FRONT_BUTTONS_READER: "Алдыңғы түймелерді қайта баптау"
 STR_READING_STATS: "Оқу статистикасы"
 STR_BOOKMARKS: "Бетбелгілер"
diff --git a/lib/I18n/translations/lithuanian.yaml b/lib/I18n/translations/lithuanian.yaml
index 9e3098f5..425f659a 100644
--- a/lib/I18n/translations/lithuanian.yaml
+++ b/lib/I18n/translations/lithuanian.yaml
@@ -73,6 +73,9 @@ STR_IMAGES_SUPPRESS: "Slėpti"
 STR_SHORT_PWR_BTN: "Trumpas įjungimo pasp."
 STR_ORIENTATION: "Orientacija"
 STR_SIDE_BTN_LAYOUT: "Šoniniai mygtukai"
+STR_ORIENTATION_AWARE: "Pagal orientaciją"
+STR_NAV_BUTTONS: "Navigacijos mygtukai"
+STR_ALL_BUTTONS: "Visi mygtukai"
 STR_LONG_PRESS_SKIP: "Praleisti skyrių (ilgai)"
 STR_FONT_FAMILY: "Šriftas"
 STR_FONT_SIZE: "Šrifto dydis"
@@ -181,6 +184,7 @@ STR_ERROR_GENERAL_FAILURE: "Bendra klaida"
 STR_ERROR_NETWORK_NOT_FOUND: "Tinklas nerastas"
 STR_ERROR_CONNECTION_TIMEOUT: "Baigėsi laikas"
 STR_SD_CARD: "SD kortelė"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Ilgai spauskite Pradžia, kad perjungtumėte paslėptus failus"
 STR_BACK: "« Atgal"
 STR_EXIT: "« Išeiti"
 STR_HOME: "« Pradžia"
@@ -224,7 +228,6 @@ STR_TITLE: "Pavadinimas"
 STR_BATTERY: "Baterija"
 STR_UI_THEME: "UI tema"
 STR_THEME_CLASSIC: "Klasikinė"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_LYRA_EXTENDED: "Lyra Ext."
 STR_SUNLIGHT_FADING_FIX: "Blyškumo pataisa"
 STR_REMAP_FRONT_BUTTONS: "Keisti mygtukus"
@@ -232,6 +235,9 @@ STR_OPDS_BROWSER: "OPDS naršyklė"
 STR_COVER_CUSTOM: "Viršelis + Kita"
 STR_PAGE_OVERLAY: "Puslapio perdanga"
 STR_MENU_RECENT_BOOKS: "Paskutinės"
+STR_RECENT_BOOKS_VIEW: "Neseniai atvertų knygų vaizdas"
+STR_LIST_VIEW: "Sąrašas"
+STR_GRID_VIEW: "Tinklelis"
 STR_NO_RECENT_BOOKS: "Paskutinių nėra"
 STR_CALIBRE_DESC: "Calibre belaidis ryšys"
 STR_FORGET_AND_REMOVE: "Pamiršti tinklą?"
@@ -254,6 +260,7 @@ STR_GO_TO_PERCENT: "Eiti į %"
 STR_GO_HOME_BUTTON: "Pradžia"
 STR_SYNC_PROGRESS: "Sinchr. progresą"
 STR_DELETE_CACHE: "Trinti talpyklą"
+STR_BOOK_CACHE_DELETED: "Knygos talpykla ištrinta"
 STR_DELETE: "Trinti"
 STR_DISPLAY_QR: "QR kodas"
 STR_CHAPTER_PREFIX: "Sk: "
@@ -280,6 +287,7 @@ STR_NO_REMOTE_MSG: "Progresų nerasta"
 STR_UPLOAD_PROMPT: "Įkelti poziciją?"
 STR_UPLOAD_SUCCESS: "Įkelta!"
 STR_SYNC_FAILED_MSG: "Nepavyko"
+STR_SAVE_PROGRESS_FAILED: "Nepavyko išsaugoti progreso"
 STR_SECTION_PREFIX: "Dalis "
 STR_UPLOAD: "Įkelti"
 STR_BOOK_S_STYLE: "Knygos stilius"
@@ -291,7 +299,10 @@ STR_NO_FOOTNOTES: "Šiame psl. išnašų nėra"
 STR_LINK: "[nuoroda]"
 STR_SCREENSHOT_BUTTON: "Ekrano nuotrauka"
 STR_AUTO_TURN_ENABLED: "Auto-vertimas: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Auto-vertimas (psl/min)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Automatinio vertimo intervalas (sek.)"
+STR_AUTO_TURN_STEP_HINT: "Kairė/Dešinė: 1 s | Viršus/Apačia: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min."
+STR_SLEEP_TIMER_STEP_HINT: "Kairė/Dešinė: 1 min.  Viršus/Apačia: 5 min."
 STR_REMAP_FRONT_BUTTONS_READER: "Keisti mygtukus"
 STR_READING_STATS: "Skaitymo statistika"
 STR_BOOKMARKS: "Žymelės"
diff --git a/lib/I18n/translations/polish.yaml b/lib/I18n/translations/polish.yaml
index 34108cec..d636cd34 100644
--- a/lib/I18n/translations/polish.yaml
+++ b/lib/I18n/translations/polish.yaml
@@ -73,7 +73,14 @@ STR_IMAGES_SUPPRESS: "Pomijaj"
 STR_SHORT_PWR_BTN: "Krótkie naciśnięcie zasilania"
 STR_ORIENTATION: "Układ czytania"
 STR_SIDE_BTN_LAYOUT: "Układ przycisków bocznych"
-STR_LONG_PRESS_SKIP: "Przytrzymaj aby przeskoczyć rozdział"
+STR_ORIENTATION_AWARE: "Zależnie od orientacji"
+STR_NAV_BUTTONS: "Przyciski nawigacji"
+STR_ALL_BUTTONS: "Wszystkie przyciski"
+STR_LONG_PRESS_SKIP: "Przytrzymaj, aby przeskoczyć rozdział"
+STR_LONG_PRESS_BEHAVIOR: "Funkcja długiego przyciśnięcia"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Wył."
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Przeskocz rozdział"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Orientacja ekranu"
 STR_FONT_FAMILY: "Czcionka"
 STR_FONT_SIZE: "Rozmiar czcionki"
 STR_LINE_SPACING: "Odstępy między wierszami"
@@ -181,6 +188,7 @@ STR_ERROR_GENERAL_FAILURE: "Błąd: Ogólny"
 STR_ERROR_NETWORK_NOT_FOUND: "Błąd: Sieci nie znaleziono"
 STR_ERROR_CONNECTION_TIMEOUT: "Błąd: Przekroczono limit czasu połączenia"
 STR_SD_CARD: "Karta SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Przytrzymaj Home, aby przełączyć ukryte pliki"
 STR_BACK: "« Wstecz"
 STR_EXIT: "« Wyjdź"
 STR_HOME: "« Home"
@@ -224,7 +232,9 @@ STR_TITLE: "Tytuł"
 STR_BATTERY: "Bateria"
 STR_UI_THEME: "Skórka UI"
 STR_THEME_CLASSIC: "Classic"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Widok ostatnich książek"
+STR_LIST_VIEW: "Lista"
+STR_GRID_VIEW: "Siatka"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Przeciwdziałanie blaknięciu od słońca"
 STR_REMAP_FRONT_BUTTONS: "Skonfiguruj przednie przyciski"
@@ -254,6 +264,7 @@ STR_GO_TO_PERCENT: "Idź do %"
 STR_GO_HOME_BUTTON: "Wróć do głównego ekranu"
 STR_SYNC_PROGRESS: "Postęp synchronizacji"
 STR_DELETE_CACHE: "Usuń pamięć podręczną książek"
+STR_BOOK_CACHE_DELETED: "Pamięć podręczna książki usunięta"
 STR_DELETE: "Usuń"
 STR_DISPLAY_QR: "Pokaż stronę jako kod QR"
 STR_CHAPTER_PREFIX: "Rozdział: "
@@ -280,6 +291,7 @@ STR_NO_REMOTE_MSG: "Nie znaleziono zdalnego postępu"
 STR_UPLOAD_PROMPT: "Wysłać obecną pozycję?"
 STR_UPLOAD_SUCCESS: "Postęp wysłany!"
 STR_SYNC_FAILED_MSG: "Synchronizacja nieudana"
+STR_SAVE_PROGRESS_FAILED: "Nie udało się zapisać postępu"
 STR_SECTION_PREFIX: "Sekcja "
 STR_UPLOAD: "Wyślij"
 STR_BOOK_S_STYLE: "Styl książki"
@@ -293,7 +305,10 @@ STR_NO_FOOTNOTES: "Brak przypisów na tej stronie"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Zrób zrzut ekranu"
 STR_AUTO_TURN_ENABLED: "Auto-kartkowanie: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Auto-kartkowanie (str./min)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interwał auto-kartkowania (sekundy)"
+STR_AUTO_TURN_STEP_HINT: "Lewo/Prawo: 1 s  Góra/Dół: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Lewo/Prawo: 1 min  Góra/Dół: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Skonfiguruj przednie przyciski (czytnik)"
 STR_READING_STATS: "Statystyki czytania"
 STR_BOOKMARKS: "Zakładki"
@@ -302,5 +317,26 @@ STR_LONG_PRESS_MENU_ACTION: "Akcja menu po przytrzymaniu"
 STR_CYCLE_PAGE_TURN: "Auto-kartkowanie"
 STR_LOW_MEMORY_IMAGES_TITLE: "Rozdział wczytany bez obrazów"
 STR_LOW_MEMORY_IMAGES_BODY: "Dostępnej pamięci było za mało, aby wyodrębnić obrazy dla tego rozdziału."
+STR_AUTO_TURN_PAGES_PER_MIN: "Auto-kartkowanie (str./min)"
+STR_DOWNLOAD_FONTS: "Pobierz czcionki"
+STR_FONT_DOWNLOAD: "Pobierz czcionkę"
+STR_LOADING_FONT_LIST: "Ładowanie listy czcionek..."
+STR_NO_FONTS_AVAILABLE: "Brak dostępnych czcionek"
+STR_FONT_INSTALLED: "Czcionka zainstalowana!"
+STR_FONT_INSTALL_FAILED: "Instalacja czcionki nieudana"
+STR_INSTALLED: "Zainstalowany"
+STR_CONFIRM_DOWNLOAD_PROMPT: "Pobrać?"
+STR_SD_CARD_FULL: "Za mało pamięci na karcie SD"
+STR_FILES_LABEL: "Pliki: "
+STR_SIZE_LABEL: "Rozmiar: "
+STR_REDOWNLOAD: "Re-download"
+STR_DOWNLOAD_ALL: "Pobierz wszystkie"
+STR_UPDATE_ALL: "Uaktualnij wszystkie"
+STR_ALL_FONTS_INSTALLED: "Wszystkie czcionki zainstalowane!"
+STR_UPDATE_AVAILABLE: "Uaktualnij"
+STR_CRASH_TITLE: "Awaria systemu"
+STR_CRASH_DESCRIPTION: "Szczegółowy raport zapisany do crash_report.txt. Prosimy o dołączenie tego pliku do zgłoszenia błędu."
+STR_CRASH_REASON: "Powód awarii:"
+STR_CRASH_NO_REASON: "(Nie odnotowano powodu)"
 STR_TILT_PAGE_TURN: "Kartkowanie przechyłem"
 STR_BOOKMARK_LIMIT_REACHED: "Osiągnięto limit zakładek"
diff --git a/lib/I18n/translations/portuguese.yaml b/lib/I18n/translations/portuguese.yaml
index 5895e3c4..c2436ab5 100644
--- a/lib/I18n/translations/portuguese.yaml
+++ b/lib/I18n/translations/portuguese.yaml
@@ -69,7 +69,13 @@ STR_TEXT_AA: "Suavização de texto"
 STR_SHORT_PWR_BTN: "Clique curto botão ligar"
 STR_ORIENTATION: "Orientação de leitura"
 STR_SIDE_BTN_LAYOUT: "Disposição botões laterais"
-STR_LONG_PRESS_SKIP: "Pular capítulo com pressão longa"
+STR_ORIENTATION_AWARE: "Sensível à orientação"
+STR_NAV_BUTTONS: "Botões de navegação"
+STR_ALL_BUTTONS: "Todos os botões"
+STR_LONG_PRESS_BEHAVIOR: "Comportamento do botão de premir e segurar"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Desligado"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Saltar capítulo"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Alterar orientação"
 STR_FONT_FAMILY: "Fonte do leitor"
 STR_FONT_SIZE: "Tam. fonte UI"
 STR_LINE_SPACING: "Espaçamento entre linhas"
@@ -176,6 +182,7 @@ STR_ERROR_GENERAL_FAILURE: "Erro: falha geral"
 STR_ERROR_NETWORK_NOT_FOUND: "Erro: rede não encontrada"
 STR_ERROR_CONNECTION_TIMEOUT: "Erro: tempo limite conexão"
 STR_SD_CARD: "Cartão SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Mantenha Início pressionado para alternar arquivos ocultos"
 STR_BACK: "« Voltar"
 STR_EXIT: "« Sair"
 STR_HOME: "« Início"
@@ -201,7 +208,9 @@ STR_SLEEP_COVER_FILTER: "Filtro capa tela repouso"
 STR_FILTER_CONTRAST: "Contraste"
 STR_UI_THEME: "Tema da interface"
 STR_THEME_CLASSIC: "Clássico"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Vista de livros recentes"
+STR_LIST_VIEW: "Lista"
+STR_GRID_VIEW: "Grade"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Ajuste desbotamento ao sol"
@@ -232,6 +241,7 @@ STR_GO_TO_PERCENT: "Ir para %"
 STR_GO_HOME_BUTTON: "Ir para o início"
 STR_SYNC_PROGRESS: "Sincronizar progresso"
 STR_DELETE_CACHE: "Excluir cache do livro"
+STR_BOOK_CACHE_DELETED: "Cache do livro excluído"
 STR_DELETE: "Excluir"
 STR_CHAPTER_PREFIX: "Capítulo:"
 STR_PAGES_SEPARATOR: "páginas  |"
@@ -257,6 +267,7 @@ STR_NO_REMOTE_MSG: "Nenhum progresso remoto encontrado"
 STR_UPLOAD_PROMPT: "Enviar posição atual?"
 STR_UPLOAD_SUCCESS: "Progresso enviado!"
 STR_SYNC_FAILED_MSG: "Falha na sincronização"
+STR_SAVE_PROGRESS_FAILED: "Não foi possível salvar o progresso"
 STR_SECTION_PREFIX: "Seção"
 STR_UPLOAD: "Enviar"
 STR_BOOK_S_STYLE: "Estilo do livro"
@@ -265,11 +276,15 @@ STR_BIONIC_READING: "Leitura focada"
 STR_OPDS_SERVER_URL: "URL do servidor OPDS"
 STR_SCREENSHOT_BUTTON: "Capturar tela"
 STR_REMAP_FRONT_BUTTONS_READER: "Remapear botões frontais"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervalo da virada automática de página (segundos)"
+STR_AUTO_TURN_STEP_HINT: "Esq/Dir: 1 s  Cima/Baixo: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Esq/Dir: 1 min  Cima/Baixo: 5 min"
 STR_READING_STATS: "Estatísticas de leitura"
 STR_BOOKMARKS: "Marcadores"
 STR_OPDS_SERVERS: "Servidores OPDS"
 STR_LONG_PRESS_MENU_ACTION: "Ação do menu por pressão longa"
-STR_CYCLE_PAGE_TURN: "Viragem automática"
+STR_CYCLE_PAGE_TURN: "Virada automática"
 STR_LOW_MEMORY_IMAGES_TITLE: "Capítulo carregado sem imagens"
 STR_LOW_MEMORY_IMAGES_BODY: "A memória disponível era insuficiente para extrair as imagens deste capítulo."
 STR_TILT_PAGE_TURN: "Virar página por inclinação"
diff --git a/lib/I18n/translations/romanian.yaml b/lib/I18n/translations/romanian.yaml
index 23bde906..7b773dfd 100644
--- a/lib/I18n/translations/romanian.yaml
+++ b/lib/I18n/translations/romanian.yaml
@@ -73,7 +73,13 @@ STR_IMAGES_SUPPRESS: "Suprimare"
 STR_SHORT_PWR_BTN: "Apăsare scurtă întrerupător"
 STR_ORIENTATION: "Orientare lectură"
 STR_SIDE_BTN_LAYOUT: "Aspect butoane laterale (lectură)"
-STR_LONG_PRESS_SKIP: "Sărire capitol la apăsare lungă"
+STR_ORIENTATION_AWARE: "În funcție de orientare"
+STR_NAV_BUTTONS: "Butoane navigare"
+STR_ALL_BUTTONS: "Toate butoanele"
+STR_LONG_PRESS_BEHAVIOR: "Comportament buton apăsat lung"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Dezactivat"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Sărire capitol"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Schimbă orientarea"
 STR_FONT_FAMILY: "Familie font lectură"
 STR_FONT_SIZE: "Dimensiune font"
 STR_LINE_SPACING: "Spaţiere între rânduri"
@@ -181,6 +187,7 @@ STR_ERROR_GENERAL_FAILURE: "Eroare: Eşec general"
 STR_ERROR_NETWORK_NOT_FOUND: "Eroare: Reţea negăsită"
 STR_ERROR_CONNECTION_TIMEOUT: "Eroare: Timp de conectare depăşit"
 STR_SD_CARD: "Card SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Apăsaţi lung Acasă pentru a comuta fişierele ascunse"
 STR_BACK: "« Înapoi"
 STR_EXIT: "« Ieşire"
 STR_HOME: "« Acasă"
@@ -224,7 +231,9 @@ STR_TITLE: "Titlu"
 STR_BATTERY: "Baterie"
 STR_UI_THEME: "Tema UI"
 STR_THEME_CLASSIC: "Clasic"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Vizualizare cărţi recente"
+STR_LIST_VIEW: "Listă"
+STR_GRID_VIEW: "Grilă"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Corecţie estompare lumină"
 STR_REMAP_FRONT_BUTTONS: "Remapare butoane frontale"
@@ -254,6 +263,7 @@ STR_GO_TO_PERCENT: "Săriţi la %"
 STR_GO_HOME_BUTTON: "Acasă"
 STR_SYNC_PROGRESS: "Progres sincronizare"
 STR_DELETE_CACHE: "Ştergere cache cărţi"
+STR_BOOK_CACHE_DELETED: "Cache-ul cărții a fost șters"
 STR_DELETE: "Ştergeți"
 STR_DISPLAY_QR: "Afişați pagina ca cod QR"
 STR_CHAPTER_PREFIX: "Capitol: "
@@ -280,6 +290,7 @@ STR_NO_REMOTE_MSG: "Niciun progres remote găsit"
 STR_UPLOAD_PROMPT: "Încărcaţi poziţia curentă?"
 STR_UPLOAD_SUCCESS: "Progres încărcat!"
 STR_SYNC_FAILED_MSG: "Sincronizare eşuată"
+STR_SAVE_PROGRESS_FAILED: "Nu s-a putut salva progresul"
 STR_SECTION_PREFIX: "Secţiune "
 STR_UPLOAD: "Încărcare"
 STR_BOOK_S_STYLE: "Stilul cărţii"
@@ -291,7 +302,10 @@ STR_NO_FOOTNOTES: "Nicio notă de subsol"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Captură ecran"
 STR_AUTO_TURN_ENABLED: "Răsfoire automată: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Pagini pe minut"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval răsfoire automată (secunde)"
+STR_AUTO_TURN_STEP_HINT: "Stânga/Dreapta: 1 s  Sus/Jos: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Stânga/Dreapta: 1 min  Sus/Jos: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Remapare butoane frontale"
 STR_READING_STATS: "Statistici de lectură"
 STR_BOOKMARKS: "Semne de carte"
diff --git a/lib/I18n/translations/russian.yaml b/lib/I18n/translations/russian.yaml
index 7d39ea28..588298ac 100644
--- a/lib/I18n/translations/russian.yaml
+++ b/lib/I18n/translations/russian.yaml
@@ -73,7 +73,14 @@ STR_IMAGES_SUPPRESS: "Скрыть"
 STR_SHORT_PWR_BTN: "Короткое нажатие PWR"
 STR_ORIENTATION: "Ориентация чтения"
 STR_SIDE_BTN_LAYOUT: "Боковые кнопки"
-STR_LONG_PRESS_SKIP: "Долгое нажатие - смена главы"
+STR_ORIENTATION_AWARE: "С учетом ориентации"
+STR_NAV_BUTTONS: "Кнопки навигации"
+STR_ALL_BUTTONS: "Все кнопки"
+STR_LONG_PRESS_SKIP: "Долгое нажатие — пропуск главы"
+STR_LONG_PRESS_BEHAVIOR: "Долгое нажатие"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Ничего"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Пропуск главы"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Изменить ориентацию"
 STR_FONT_FAMILY: "Шрифт чтения"
 STR_FONT_SIZE: "Размер шрифта интерфейса"
 STR_LINE_SPACING: "Межстрочный интервал"
@@ -181,6 +188,7 @@ STR_ERROR_GENERAL_FAILURE: "Ошибка: Общая ошибка"
 STR_ERROR_NETWORK_NOT_FOUND: "Ошибка: Сеть не найдена"
 STR_ERROR_CONNECTION_TIMEOUT: "Ошибка: Тайм-аут соединения"
 STR_SD_CARD: "SD-карта"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Удерживайте кнопку Главная, чтобы переключить скрытые файлы"
 STR_BACK: "« Назад"
 STR_EXIT: "« Выход"
 STR_HOME: "« Главная"
@@ -224,7 +232,9 @@ STR_TITLE: "Заглавие"
 STR_BATTERY: "Батарея"
 STR_UI_THEME: "Тема интерфейса"
 STR_THEME_CLASSIC: "Классическая"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Вид недавних книг"
+STR_LIST_VIEW: "Список"
+STR_GRID_VIEW: "Сетка"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SUNLIGHT_FADING_FIX: "Компенсация выцветания"
@@ -258,6 +268,7 @@ STR_GO_TO_PERCENT: "Перейти к %"
 STR_GO_HOME_BUTTON: "На главную"
 STR_SYNC_PROGRESS: "Синхронизировать прогресс"
 STR_DELETE_CACHE: "Удалить кэш книги"
+STR_BOOK_CACHE_DELETED: "Кэш книги удалён"
 STR_DELETE: "Удалить"
 STR_CHAPTER_PREFIX: "Глава: "
 STR_DISPLAY_QR: "Показать страницу в виде QR-кода"
@@ -284,6 +295,7 @@ STR_NO_REMOTE_MSG: "Удалённый прогресс не найден"
 STR_UPLOAD_PROMPT: "Отправить текущую позицию?"
 STR_UPLOAD_SUCCESS: "Прогресс отправлен!"
 STR_SYNC_FAILED_MSG: "Ошибка синхронизации"
+STR_SAVE_PROGRESS_FAILED: "Не удалось сохранить прогресс"
 STR_SECTION_PREFIX: "Раздел "
 STR_UPLOAD: "Отправить"
 STR_BOOK_S_STYLE: "Стиль книги"
@@ -292,7 +304,10 @@ STR_BIONIC_READING: "Фокусное чтение"
 STR_OPDS_SERVER_URL: "URL OPDS сервера"
 STR_SCREENSHOT_BUTTON: "Сделать снимок экрана"
 STR_AUTO_TURN_ENABLED: "Автоперелистывание: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Автоперелистывание (стр./мин)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Интервал автоперелистывания (секунды)"
+STR_AUTO_TURN_STEP_HINT: "Влево/Вправо: 1 с  Вверх/Вниз: 5 с"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u мин"
+STR_SLEEP_TIMER_STEP_HINT: "Влево/Вправо: 1 мин  Вверх/Вниз: 5 мин"
 STR_TILT_PAGE_TURN: "Перелистывание наклоном"
 STR_ADD_SERVER: "Добавить сервер"
 STR_SERVER_NAME: "Имя сервера"
diff --git a/lib/I18n/translations/slovenian.yaml b/lib/I18n/translations/slovenian.yaml
index 99293015..19a72d00 100644
--- a/lib/I18n/translations/slovenian.yaml
+++ b/lib/I18n/translations/slovenian.yaml
@@ -73,6 +73,9 @@ STR_IMAGES_SUPPRESS: "Zatdi"
 STR_SHORT_PWR_BTN: "Kratek pritisk na gumb za vklop"
 STR_ORIENTATION: "Orientacija branja"
 STR_SIDE_BTN_LAYOUT: "Razpored stranskih gumbov"
+STR_ORIENTATION_AWARE: "Glede na usmerjenost"
+STR_NAV_BUTTONS: "Navigacijski gumbi"
+STR_ALL_BUTTONS: "Vsi gumbi"
 STR_LONG_PRESS_SKIP: "Dolgi pritisk za preskok poglavja"
 STR_FONT_FAMILY: "Pisava bralnika"
 STR_FONT_SIZE: "Velikost pisave"
@@ -181,6 +184,7 @@ STR_ERROR_GENERAL_FAILURE: "Napaka: Splošna napaka"
 STR_ERROR_NETWORK_NOT_FOUND: "Napaka: Omrežje ni najdeno"
 STR_ERROR_CONNECTION_TIMEOUT: "Napaka: Časovna omejitev povezave"
 STR_SD_CARD: "SD kartica"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Dolgo pritisnite Domov za preklop skritih datotek"
 STR_BACK: "« Nazaj"
 STR_EXIT: "« Izhod"
 STR_HOME: "« Domov"
@@ -224,7 +228,9 @@ STR_TITLE: "Naslov"
 STR_BATTERY: "Baterija"
 STR_UI_THEME: "Tema uporabniškega vmesnika"
 STR_THEME_CLASSIC: "Klasična"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Pogled zadnjih knjig"
+STR_LIST_VIEW: "Seznam"
+STR_GRID_VIEW: "Mreža"
 STR_THEME_LYRA_EXTENDED: "Lyra razširjena"
 STR_SUNLIGHT_FADING_FIX: "Popravek bledenja na soncu"
 STR_REMAP_FRONT_BUTTONS: "Prenastavi sprednje gumbe"
@@ -254,6 +260,7 @@ STR_GO_TO_PERCENT: "Pojdi na %"
 STR_GO_HOME_BUTTON: "Pojdi domov"
 STR_SYNC_PROGRESS: "Sinhroniziraj napredek"
 STR_DELETE_CACHE: "Izbriši predpomnilnik knjige"
+STR_BOOK_CACHE_DELETED: "Predpomnilnik knjige izbrisan"
 STR_DELETE: "Izbriši"
 STR_DISPLAY_QR: "Prikaži stran kot QR"
 STR_CHAPTER_PREFIX: "Poglavje: "
@@ -280,6 +287,7 @@ STR_NO_REMOTE_MSG: "Oddaljen napredek ni bil najden"
 STR_UPLOAD_PROMPT: "Naložim trenutno pozicijo?"
 STR_UPLOAD_SUCCESS: "Napredek naložen!"
 STR_SYNC_FAILED_MSG: "Sinhronizacija ni uspela"
+STR_SAVE_PROGRESS_FAILED: "Napredka ni bilo mogoče shraniti"
 STR_SECTION_PREFIX: "Razdelek "
 STR_UPLOAD: "Naloži"
 STR_BOOK_S_STYLE: "Slog knjige"
@@ -291,7 +299,10 @@ STR_NO_FOOTNOTES: "Na tej strani ni opomb"
 STR_LINK: "[povezava]"
 STR_SCREENSHOT_BUTTON: "Naredi posnetek zaslona"
 STR_AUTO_TURN_ENABLED: "Samodejno obračanje: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Samodejno obračanje (strani na minuto)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Interval samodejnega obračanja (sekunde)"
+STR_AUTO_TURN_STEP_HINT: "Levo/desno: 1 s  Gor/dol: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Levo/desno: 1 min  Gor/dol: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Prenastavi sprednje gumbe"
 STR_READING_STATS: "Statistika branja"
 STR_BOOKMARKS: "Zaznamki"
diff --git a/lib/I18n/translations/spanish.yaml b/lib/I18n/translations/spanish.yaml
index bba860c0..3502fe3c 100644
--- a/lib/I18n/translations/spanish.yaml
+++ b/lib/I18n/translations/spanish.yaml
@@ -73,7 +73,13 @@ STR_IMAGES_SUPPRESS: "Ocultar"
 STR_SHORT_PWR_BTN: "Toque corto botón encendido"
 STR_ORIENTATION: "Orientación"
 STR_SIDE_BTN_LAYOUT: "Función botones laterales (lector)"
-STR_LONG_PRESS_SKIP: "Saltar capítulo (pulsación larga)"
+STR_ORIENTATION_AWARE: "Según orientación"
+STR_NAV_BUTTONS: "Botones navegación"
+STR_ALL_BUTTONS: "Todos los botones"
+STR_LONG_PRESS_BEHAVIOR: "Comportamiento al mantener pulsado el botón"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivado"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Saltar capítulo"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Cambio de orientación"
 STR_FONT_FAMILY: "Tipografía"
 STR_FONT_SIZE: "Tamaño"
 STR_LINE_SPACING: "Interlineado"
@@ -181,6 +187,7 @@ STR_ERROR_GENERAL_FAILURE: "Error: Fallo general"
 STR_ERROR_NETWORK_NOT_FOUND: "Error: Red no encontrada"
 STR_ERROR_CONNECTION_TIMEOUT: "Error: Tiempo de conexión agotado"
 STR_SD_CARD: "Tarjeta microSD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Mantenga pulsado Inicio para alternar archivos ocultos"
 STR_BACK: "« Atrás"
 STR_EXIT: "« Salir"
 STR_HOME: "« Inicio"
@@ -224,7 +231,6 @@ STR_TITLE: "Título"
 STR_BATTERY: "Batería"
 STR_UI_THEME: "Interfaz"
 STR_THEME_CLASSIC: "Clásico"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_LYRA_EXTENDED: "Lyra Extendido"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_SUNLIGHT_FADING_FIX: "Corrección de desvanecimiento"
@@ -233,6 +239,9 @@ STR_OPDS_BROWSER: "Navegador OPDS"
 STR_COVER_CUSTOM: "Portada + Pers."
 STR_PAGE_OVERLAY: "Superposición de página"
 STR_MENU_RECENT_BOOKS: "Libros recientes"
+STR_RECENT_BOOKS_VIEW: "Vista de libros recientes"
+STR_LIST_VIEW: "Lista"
+STR_GRID_VIEW: "Cuadrícula"
 STR_NO_RECENT_BOOKS: "No hay libros recientes"
 STR_CALIBRE_DESC: "Transferir contenido a este dispositivo"
 STR_FORGET_AND_REMOVE: "¿Desea olvidar la red y la contraseña guardada?"
@@ -255,6 +264,7 @@ STR_GO_TO_PERCENT: "Ir a %"
 STR_GO_HOME_BUTTON: "Volver al menú Inicio"
 STR_SYNC_PROGRESS: "Sincronizar progreso de lectura"
 STR_DELETE_CACHE: "Borrar caché del libro"
+STR_BOOK_CACHE_DELETED: "Caché del libro borrado"
 STR_DELETE: "Borrar"
 STR_DISPLAY_QR: "Mostrar página como QR"
 STR_CHAPTER_PREFIX: "Cap.: "
@@ -281,6 +291,7 @@ STR_NO_REMOTE_MSG: "No se encontró progreso remoto"
 STR_UPLOAD_PROMPT: "¿Subir posición actual?"
 STR_UPLOAD_SUCCESS: "¡Progreso subido!"
 STR_SYNC_FAILED_MSG: "Fallo de sincronización"
+STR_SAVE_PROGRESS_FAILED: "No se pudo guardar el progreso"
 STR_SECTION_PREFIX: "Secc.:"
 STR_UPLOAD: "Subir"
 STR_BOOK_S_STYLE: "Estilo del libro"
@@ -293,7 +304,10 @@ STR_LINK: "[enlace]"
 STR_SCREENSHOT_BUTTON: "Tomar captura de pantalla"
 STR_TILT_PAGE_TURN: "Pasar página inclinando"
 STR_AUTO_TURN_ENABLED: "Avance activado: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Avance auto. (pág./min)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervalo de avance auto. (segundos)"
+STR_AUTO_TURN_STEP_HINT: "Izq./Dcha.: 1 s  |  Subir/Bajar: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Izq./Dcha.: 1 min  Subir/Bajar: 5 min"
 STR_REMAP_FRONT_BUTTONS_READER: "Reconfigurar botones frontales"
 STR_READING_STATS: "Estadísticas de lectura"
 STR_BOOKMARKS: "Marcadores"
diff --git a/lib/I18n/translations/swedish.yaml b/lib/I18n/translations/swedish.yaml
index 18c6c9ff..84459a60 100644
--- a/lib/I18n/translations/swedish.yaml
+++ b/lib/I18n/translations/swedish.yaml
@@ -73,7 +73,14 @@ STR_IMAGES_SUPPRESS: "Dölj"
 STR_SHORT_PWR_BTN: "Kort strömknappsklick"
 STR_ORIENTATION: "Läsrikting"
 STR_SIDE_BTN_LAYOUT: "Sidoknappslayout (Läsare)"
-STR_LONG_PRESS_SKIP: "Lång-tryck Kapitelskippning"
+STR_ORIENTATION_AWARE: "Orienteringsanpassad"
+STR_NAV_BUTTONS: "Navigeringsknappar"
+STR_ALL_BUTTONS: "Alla knappar"
+STR_LONG_PRESS_SKIP: "Långtryck: Hoppa över kapitel"
+STR_LONG_PRESS_BEHAVIOR: "Beteende vid lång knapptryckning"
+STR_LONG_PRESS_BEHAVIOR_OFF: "AV"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Hoppa över kapitel"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Ändra orientering"
 STR_FONT_FAMILY: "Eboksläsarens typsnittsfamilj"
 STR_FONT_SIZE: "Eboksläsarens typsnittsstorlek"
 STR_LINE_SPACING: "Eboksläsarens linjemellanrum"
@@ -168,6 +175,7 @@ STR_NO_UPDATE: "Ingen uppdatering tillgänglig"
 STR_UPDATE_FAILED: "Uppdatering misslyckades"
 STR_UPDATE_COMPLETE: "Uppdatering färdig"
 STR_POWER_ON_HINT: "Tryck och håll strömknappen för att sätta på igen"
+STR_RESTARTING_HINT: "Startar om... Om enheten inte startar om, håll ner strömknappen i några sekunder."
 STR_NO_ENTRIES: "Inga poster funna"
 STR_DOWNLOADING: "Laddar ner…"
 STR_DOWNLOAD_FAILED: "Nedladdning misslyckades"
@@ -184,6 +192,7 @@ STR_ERROR_GENERAL_FAILURE: "Fel: Generellt fel"
 STR_ERROR_NETWORK_NOT_FOUND: "Fel: Nätverk hittades inte"
 STR_ERROR_CONNECTION_TIMEOUT: "Fel: Anslutningstimeout"
 STR_SD_CARD: "SD-kort"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Håll Hem för att växla dolda filer"
 STR_BACK: "« Bak"
 STR_EXIT: "« Avsluta"
 STR_HOME: "« Hem"
@@ -225,9 +234,14 @@ STR_EXAMPLE_BOOK: "Boktitel"
 STR_PREVIEW: "Förhandsgranskning"
 STR_TITLE: "Titel"
 STR_BATTERY: "Batteri"
+STR_XTC_STATUS_BAR: "XTC-statusfält"
+STR_BOTTOM: "Botten"
+STR_TOP: "Överst"
 STR_UI_THEME: "Användargränssnittstema"
 STR_THEME_CLASSIC: "Klassisk"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Vy för senaste böcker"
+STR_LIST_VIEW: "Lista"
+STR_GRID_VIEW: "Rutnät"
 STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra utökad"
 STR_SUNLIGHT_FADING_FIX: "Fix för solskensmattning"
@@ -259,6 +273,7 @@ STR_GO_TO_PERCENT: "Gå till %"
 STR_GO_HOME_BUTTON: "Gå Hem"
 STR_SYNC_PROGRESS: "Synkroniseringsframsteg"
 STR_DELETE_CACHE: "Radera bokcache"
+STR_BOOK_CACHE_DELETED: "Bokcache raderad"
 STR_DELETE: "Radera"
 STR_DISPLAY_QR: "Visa sida som QR-kod"
 STR_CHAPTER_PREFIX: "Kapitel:"
@@ -285,12 +300,14 @@ STR_NO_REMOTE_MSG: "Inga fjärrframsteg funna"
 STR_UPLOAD_PROMPT: "Ladda upp nuvarande position?"
 STR_UPLOAD_SUCCESS: "Framsteg uppladdade!"
 STR_SYNC_FAILED_MSG: "Synkronisering misslyckades"
+STR_SAVE_PROGRESS_FAILED: "Kunde inte spara framsteg"
 STR_SECTION_PREFIX: "Sektion"
 STR_UPLOAD: "Uppladdning"
 STR_BOOK_S_STYLE: "Bokstil"
 STR_EMBEDDED_STYLE: "Inbäddad stil"
 STR_BIONIC_READING: "Fokusläsning"
 STR_OPDS_SERVER_URL: "OPDS-serveradress"
+STR_SET_SLEEP_COVER: "Ställ in omslag"
 STR_FOOTNOTES: "Fotnoter"
 STR_NO_FOOTNOTES: "Inga fotnoter på den här sidan"
 STR_LINK: "[länk]"
@@ -302,7 +319,27 @@ STR_DELETE_SERVER: "Ta bort server"
 STR_DELETE_CONFIRM: "Vill du ta bort den här servern?"
 STR_OPDS_SERVERS: "OPDS-servrar"
 STR_AUTO_TURN_ENABLED: "Automatisk vändning aktiverad: "
+STR_AUTO_TURN_INTERVAL_SECONDS: "Intervall för automatisk vändning (sekunder)"
+STR_AUTO_TURN_STEP_HINT: "Vänster/Höger: 1 s Upp/Ner: 5 s"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
+STR_SLEEP_TIMER_STEP_HINT: "Vänster/Höger: 1 min  Upp/Ner: 5 min"
 STR_AUTO_TURN_PAGES_PER_MIN: "Automatisk vändning (sidor per minut)"
+STR_MANAGE_FONTS: "Hantera teckensnitt"
+STR_FONT_BROWSER: "Teckensnittsbläddrare"
+STR_LOADING_FONT_LIST: "Laddar teckensnittslista..."
+STR_NO_FONTS_AVAILABLE: "Inga teckensnitt tillgängliga"
+STR_FONT_INSTALLED: "Teckensnitt installerat!"
+STR_FONT_INSTALL_FAILED: "Installationen av teckensnitt misslyckades"
+STR_INSTALLED: "Installerad"
+STR_CONFIRM_DOWNLOAD_PROMPT: "Nedladdning?"
+STR_SD_CARD_FULL: "Otillräckligt utrymme på SD-kortet"
+STR_FILES_LABEL: "Filer: "
+STR_SIZE_LABEL: "Storlek: "
+STR_REDOWNLOAD: "Ladda ner igen"
+STR_DOWNLOAD_ALL: "Ladda ner alla"
+STR_UPDATE_ALL: "Uppdatera alla"
+STR_ALL_FONTS_INSTALLED: "Alla teckensnitt installerade!"
+STR_UPDATE_AVAILABLE: "Uppdatering"
 STR_CRASH_TITLE: "Systemkrasch"
 STR_CRASH_DESCRIPTION: "En detaljerad rapport sparades till crash_report.txt. Vänligen inkludera den här filen i din felrapport."
 STR_CRASH_REASON: "Orsak till kraschen:"
@@ -331,3 +368,16 @@ STR_CYCLE_PAGE_TURN: "Automatisk vändning"
 STR_LOW_MEMORY_IMAGES_TITLE: "Kapitel inläst utan bilder"
 STR_LOW_MEMORY_IMAGES_BODY: "Det fanns för lite tillgängligt minne för att extrahera bilderna i det här kapitlet."
 STR_BOOKMARK_LIMIT_REACHED: "Bokmärkesgränsen har nåtts"
+STR_SD_FIRMWARE_UPDATE: "Uppdatering av firmware från SD-kort"
+STR_SELECT_FIRMWARE_FILE: "Välj firmwarefil (.bin)"
+STR_NO_BIN_FILES: "Inga .bin-filer hittades"
+STR_VALIDATING_FIRMWARE: "Validerar firmware..."
+STR_INVALID_FIRMWARE: "Ogiltig firmwarefil"
+STR_FIRMWARE_TOO_LARGE: "Firmware för stor för partitionen"
+STR_FIRMWARE_TOO_SMALL: "Firmwarefilen är för liten"
+STR_FIRMWARE_UPDATE_PROMPT: "Uppdatera firmware?"
+STR_FIRMWARE_FILE_OPEN_FAILED: "Kan inte öppna filen"
+STR_FIRMWARE_WRITE_FAILED: "Skrivning till firmware misslyckades"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Stäng inte av!"
+STR_RECOVERY_MODE: "Återställningsläge"
+STR_RECOVERY_MODE_HINT: "Placera firmware.bin i SD-kortroten och välj den"
diff --git a/lib/I18n/translations/turkish.yaml b/lib/I18n/translations/turkish.yaml
index de2d9f76..1d709897 100644
--- a/lib/I18n/translations/turkish.yaml
+++ b/lib/I18n/translations/turkish.yaml
@@ -68,7 +68,9 @@ STR_TEXT_AA: "Metin Yumuşatma (AA)"
 STR_SHORT_PWR_BTN: "Kısa Güç Tuşu Tıklaması"
 STR_ORIENTATION: "Okuma Yönü"
 STR_SIDE_BTN_LAYOUT: "Yan Tuş Dizilimi (okuyucu)"
-STR_LONG_PRESS_SKIP: "Uzun Basışla Bölüm Atla"
+STR_ORIENTATION_AWARE: "Yöne duyarlı"
+STR_NAV_BUTTONS: "Gezinme tuşları"
+STR_ALL_BUTTONS: "Tüm tuşlar"
 STR_FONT_FAMILY: "Okuyucu Yazı Tipi Ailesi"
 STR_FONT_SIZE: "Arayüz Yazı Boyutu"
 STR_LINE_SPACING: "Okuyucu Satır Aralığı"
@@ -176,6 +178,7 @@ STR_ERROR_GENERAL_FAILURE: "Hata: Genel hata"
 STR_ERROR_NETWORK_NOT_FOUND: "Hata: Ağ bulunamadı"
 STR_ERROR_CONNECTION_TIMEOUT: "Hata: Bağlantı zaman aşımı"
 STR_SD_CARD: "SD kart"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Gizli dosyaları açıp kapatmak için Ana Sayfaya uzun basın"
 STR_BACK: "« Geri"
 STR_EXIT: "« Çıkış"
 STR_HOME: "« Ana Sayfa"
@@ -201,7 +204,9 @@ STR_SLEEP_COVER_FILTER: "Uyku Ekranı Kapak Filtresi"
 STR_FILTER_CONTRAST: "Kontrast"
 STR_UI_THEME: "Arayüz Teması"
 STR_THEME_CLASSIC: "Klasik"
-STR_THEME_LYRA: "Lyra"
+STR_RECENT_BOOKS_VIEW: "Son Kitaplar Görünümü"
+STR_LIST_VIEW: "Liste Görünümü"
+STR_GRID_VIEW: "Izgara Görünümü"
 STR_THEME_LYRA_EXTENDED: "Lyra Genişletilmiş"
 STR_SUNLIGHT_FADING_FIX: "Güneş Işığı Solma Düzeltmesi"
 STR_REMAP_FRONT_BUTTONS: "Ön Tuşları Yeniden Ata"
@@ -231,6 +236,7 @@ STR_GO_TO_PERCENT: "%'ye git"
 STR_GO_HOME_BUTTON: "Ana Sayfaya Git"
 STR_SYNC_PROGRESS: "Okuma İlerlemesini Senkronize Et"
 STR_DELETE_CACHE: "Kitap Önbelleğini Sil"
+STR_BOOK_CACHE_DELETED: "Kitap önbelleği silindi"
 STR_CHAPTER_PREFIX: "Bölüm: "
 STR_PAGES_SEPARATOR: " sayfa  |  "
 STR_BOOK_PREFIX: "Kitap: "
@@ -255,6 +261,7 @@ STR_NO_REMOTE_MSG: "Uzak ilerleme bulunamadı"
 STR_UPLOAD_PROMPT: "Mevcut konumu yükle?"
 STR_UPLOAD_SUCCESS: "İlerleme yüklendi!"
 STR_SYNC_FAILED_MSG: "Senkronizasyon başarısız"
+STR_SAVE_PROGRESS_FAILED: "İlerleme kaydedilemedi"
 STR_SECTION_PREFIX: "Bölüm "
 STR_UPLOAD: "Yükle"
 STR_BOOK_S_STYLE: "Kitabın Stili"
@@ -262,7 +269,10 @@ STR_EMBEDDED_STYLE: "Gömülü Stil"
 STR_BIONIC_READING: "Odaklanmış Okuma"
 STR_OPDS_SERVER_URL: "OPDS Sunucu Adresi"
 STR_AUTO_TURN_ENABLED: "Otomatik Çevirme Etkin: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Otomatik Çevirme (Dakikada Sayfa)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Otomatik Çevirme Aralığı (saniye)"
+STR_AUTO_TURN_STEP_HINT: "Sol/Sağ: 1 sn  Yukarı/Aşağı: 5 sn"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u dk"
+STR_SLEEP_TIMER_STEP_HINT: "Sol/Sağ: 1 dk  Yukarı/Aşağı: 5 dk"
 STR_BATTERY: "Pil"
 STR_BOOK: "Kitap"
 STR_BOOK_PROGRESS_PERCENTAGE: "Kitap İlerleme Yüzdesi"
diff --git a/lib/I18n/translations/ukrainian.yaml b/lib/I18n/translations/ukrainian.yaml
index 53fd5f93..35271f8c 100644
--- a/lib/I18n/translations/ukrainian.yaml
+++ b/lib/I18n/translations/ukrainian.yaml
@@ -26,7 +26,7 @@ STR_LOADING: "Завантаження..."
 STR_LOADING_POPUP: "Завантаження"
 STR_WIFI_NETWORKS: "Мережі WiFi"
 STR_NO_NETWORKS: "Мереж не знайдено"
-STR_NETWORKS_FOUND: "мереж %zu "
+STR_NETWORKS_FOUND: "мереж %zu"
 STR_SCANNING: "Сканування..."
 STR_CONNECTING: "Підключення..."
 STR_CONNECTED: "Підключено!"
@@ -73,7 +73,13 @@ STR_IMAGES_SUPPRESS: "Приховати"
 STR_SHORT_PWR_BTN: "Короткий натиск кн. живл."
 STR_ORIENTATION: "Орієнтація читання"
 STR_SIDE_BTN_LAYOUT: "Схема бічних кнопок"
-STR_LONG_PRESS_SKIP: "Наступ. розділ (утримув.)"
+STR_ORIENTATION_AWARE: "З урахуванням орієнтації"
+STR_NAV_BUTTONS: "Кнопки навігації"
+STR_ALL_BUTTONS: "Усі кнопки"
+STR_LONG_PRESS_BEHAVIOR: "Поведінка при довгому настику"
+STR_LONG_PRESS_BEHAVIOR_OFF: "Немає"
+STR_LONG_PRESS_BEHAVIOR_SKIP: "Наступ. розділ (утримув.)"
+STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Зміна орієнтації екрану"
 STR_FONT_FAMILY: "Шрифт"
 STR_FONT_SIZE: "Розмір шрифту"
 STR_LINE_SPACING: "Міжрядковий інтервал"
@@ -81,27 +87,27 @@ STR_SCREEN_MARGIN: "Відступи від країв"
 STR_PARA_ALIGNMENT: "Вирівнювання тексту"
 STR_HYPHENATION: "Перенесення слів"
 STR_TIME_TO_SLEEP: "Перехід в режим сну"
+STR_SHOW_HIDDEN_FILES: "Показати приховані файли"
 STR_REFRESH_FREQ: "Частота оновлення екрану"
 STR_KOREADER_SYNC: "Синхронізація KOReader"
-STR_CHECK_UPDATES: "Перевірити оновлення"
+STR_CHECK_UPDATES: "Перевірити оновлення системи"
 STR_LANGUAGE: "Мова"
-STR_SHOW_HIDDEN_FILES: "Показати приховані файли"
 STR_CLEAR_READING_CACHE: "Очистити кеш книг"
 STR_USERNAME: "Ім'я користувача"
 STR_PASSWORD: "Пароль"
-STR_SYNC_SERVER_URL: "URL сервера синхронізації"
-STR_DOCUMENT_MATCHING: "Зіставлення документів"
+STR_SYNC_SERVER_URL: "URL для синхронізації"
+STR_DOCUMENT_MATCHING: "Порівняння документів"
 STR_AUTHENTICATE: "Автентифікувати"
 STR_KOREADER_USERNAME: "Ім'я користувача KOReader"
 STR_KOREADER_PASSWORD: "Пароль KOReader"
 STR_FILENAME: "Ім'я файлу"
-STR_BINARY: "Двійковий"
-STR_SET_CREDENTIALS_FIRST: "Спочатку встановіть облікові дані"
+STR_BINARY: "Побайтово"
+STR_SET_CREDENTIALS_FIRST: "Спочатку вкажіть облікові дані"
 STR_WIFI_CONN_FAILED: "Помилка підключення WiFi"
 STR_AUTHENTICATING: "Автентифікація..."
 STR_AUTH_SUCCESS: "Успішно автентифіковано!"
 STR_KOREADER_AUTH: "Автентифікація KOReader"
-STR_SYNC_READY: "Синхронізація KOReader готова до використання"
+STR_SYNC_READY: "Синхронізація KOReader активована"
 STR_AUTH_FAILED: "Помилка автентифікації"
 STR_DONE: "Готово"
 STR_CLEAR_CACHE_WARNING_1: "Це очистить усі кешовані дані книг."
@@ -168,6 +174,7 @@ STR_NO_UPDATE: "Оновлень немає"
 STR_UPDATE_FAILED: "Оновлення не вдалося"
 STR_UPDATE_COMPLETE: "Оновлення завершено"
 STR_POWER_ON_HINT: "Натисніть і утримуйте кнопку живлення, щоб увімкнути"
+STR_RESTARTING_HINT: "Перезавантаження... Якщо пристрій не перезавантажується, утримуйте кнопку живлення кілька секунд."
 STR_NO_ENTRIES: "Записів не знайдено"
 STR_DOWNLOADING: "Завантаження..."
 STR_DOWNLOAD_FAILED: "Завантаження не вдалося"
@@ -176,12 +183,15 @@ STR_UNNAMED: "Без назви"
 STR_NO_SERVER_URL: "URL сервера не налаштовано"
 STR_FETCH_FEED_FAILED: "Не вдалося отримати стрічку"
 STR_PARSE_FEED_FAILED: "Не вдалося розпарсити стрічку"
+STR_NEXT_PAGE: "Наступна с.»"
+STR_PREV_PAGE: "« Попередня с."
 STR_NETWORK_PREFIX: "Мережа: "
 STR_IP_ADDRESS_PREFIX: "IP адреса: "
 STR_ERROR_GENERAL_FAILURE: "Помилка: Загальна помилка"
 STR_ERROR_NETWORK_NOT_FOUND: "Помилка: Мережу не знайдено"
 STR_ERROR_CONNECTION_TIMEOUT: "Помилка: Таймаут підключення"
 STR_SD_CARD: "SD картка"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Утримуйте кнопку Додому, щоб перемкнути приховані файли"
 STR_BACK: "« Назад"
 STR_EXIT: "« Вихід"
 STR_HOME: "« Додому"
@@ -195,14 +205,14 @@ STR_OPEN: "Відкрити"
 STR_DOWNLOAD: "Завант."
 STR_RETRY: "Повтор."
 STR_YES: "Так"
+STR_NO: "Ні"
 STR_SHOW: "Показати"
 STR_HIDE: "Сховати"
-STR_NO: "Ні"
 STR_STATE_ON: "УВІМК"
 STR_STATE_OFF: "ВИМК"
 STR_NOT_SET: "Не встановлено"
-STR_DIR_LEFT: "Ліво"
-STR_DIR_RIGHT: "Право"
+STR_DIR_LEFT: "Вліво"
+STR_DIR_RIGHT: "Вправо"
 STR_DIR_UP: "Вгору"
 STR_DIR_DOWN: "Вниз"
 STR_OK_BUTTON: "OK"
@@ -223,13 +233,21 @@ STR_EXAMPLE_BOOK: "Назва книги"
 STR_PREVIEW: "Перегляд"
 STR_TITLE: "Назва"
 STR_BATTERY: "Акумулятор"
+STR_XTC_STATUS_BAR: "XTC Рядок прогресу"
+STR_BOTTOM: "Низ"
+STR_TOP: "Верх"
 STR_UI_THEME: "Тема інтерфейсу"
 STR_THEME_CLASSIC: "Класична"
 STR_THEME_LYRA: "Lyra"
+STR_THEME_ROUNDEDRAFF: "RoundedRaff"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
+STR_RECENT_BOOKS_VIEW: "Вигляд нещодавніх книг"
+STR_LIST_VIEW: "Список"
+STR_GRID_VIEW: "Сітка"
 STR_SUNLIGHT_FADING_FIX: "Виправлення вицвітання на сонці"
 STR_REMAP_FRONT_BUTTONS: "Налаштувати передні кнопки"
 STR_OPDS_BROWSER: "Браузер OPDS"
+STR_SEARCH: "Пошук"
 STR_COVER_CUSTOM: "Обкл. + власне"
 STR_PAGE_OVERLAY: "Накладання сторінки"
 STR_MENU_RECENT_BOOKS: "Останні книги"
@@ -249,19 +267,20 @@ STR_REMAP_RESET_HINT: "Бічна кнопка Вгору: Скинути до 
 STR_REMAP_CANCEL_HINT: "Бічна кнопка Вниз: Скасувати налаштування"
 STR_HW_BACK_LABEL: "Назад (1-ша кнопка)"
 STR_HW_CONFIRM_LABEL: "Підтвердити (2-га кнопка)"
-STR_HW_LEFT_LABEL: "Ліво (3-тя кнопка)"
-STR_HW_RIGHT_LABEL: "Право (4-та кнопка)"
+STR_HW_LEFT_LABEL: "Вліво (3-тя кнопка)"
+STR_HW_RIGHT_LABEL: "Вправо (4-та кнопка)"
 STR_GO_TO_PERCENT: "Перейти до %"
 STR_GO_HOME_BUTTON: "На головну"
 STR_SYNC_PROGRESS: "Прогрес синхронізації"
 STR_DELETE_CACHE: "Видалити кеш книги"
+STR_BOOK_CACHE_DELETED: "Кеш книги видалено"
 STR_DELETE: "Видалити"
 STR_DISPLAY_QR: "Показати сторінку як QR-код"
 STR_CHAPTER_PREFIX: "Розділ: "
 STR_PAGES_SEPARATOR: " сторінок  |  "
 STR_BOOK_PREFIX: "Книга: "
 STR_CALIBRE_URL_HINT: "Для Calibre додайте /opds до вашої URL"
-STR_PERCENT_STEP_HINT: "Ліво/Право: 1%  Вгору/Вниз: 10%"
+STR_PERCENT_STEP_HINT: "Вліво/Вправо: 1%  Вгору/Вниз: 10%"
 STR_SYNCING_TIME: "Синхронізація часу..."
 STR_CALC_HASH: "Обчислення хешу документа..."
 STR_HASH_FAILED: "Не вдалося обчислити хеш документа"
@@ -281,25 +300,83 @@ STR_NO_REMOTE_MSG: "Віддаленого прогресу не знайден
 STR_UPLOAD_PROMPT: "Завантажити поточну позицію?"
 STR_UPLOAD_SUCCESS: "Прогрес завантажено!"
 STR_SYNC_FAILED_MSG: "Синхронізація не вдалася"
+STR_SAVE_PROGRESS_FAILED: "Не вдалося зберегти прогрес"
 STR_SECTION_PREFIX: "Розділ "
 STR_UPLOAD: "Завантажити"
 STR_BOOK_S_STYLE: "Стиль книги"
 STR_EMBEDDED_STYLE: "Вбудований стиль"
 STR_BIONIC_READING: "Фокусне читання"
 STR_OPDS_SERVER_URL: "URL сервера OPDS"
+STR_SET_SLEEP_COVER: "Як обкл."
 STR_FOOTNOTES: "Примітки"
 STR_NO_FOOTNOTES: "На цій сторінці немає приміток"
 STR_LINK: "[посилання]"
 STR_SCREENSHOT_BUTTON: "Знімок екрана"
+STR_ADD_SERVER: "Додати сервер"
+STR_SERVER_NAME: "Назва сервера"
+STR_NO_SERVERS: "Не налаштовано жодного сервера OPDS"
+STR_DELETE_SERVER: "Видалити сервер"
+STR_DELETE_CONFIRM: "Видалити цей сервер?"
+STR_OPDS_SERVERS: "Сервери OPDS"
 STR_AUTO_TURN_ENABLED: "Автоперегортання увімк: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Автоперегортання (ст/хв)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Інтервал автоперегортання (секунди)"
+STR_AUTO_TURN_STEP_HINT: "Вліво/Вправо: 1 с  Вгору/Вниз: 5 с"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u хв"
+STR_SLEEP_TIMER_STEP_HINT: "Вліво/Вправо: 1 хв  Вгору/Вниз: 5 хв"
 STR_REMAP_FRONT_BUTTONS_READER: "Налаштувати передні кнопки"
 STR_READING_STATS: "Статистика читання"
 STR_BOOKMARKS: "Закладки"
-STR_OPDS_SERVERS: "Сервери OPDS"
 STR_LONG_PRESS_MENU_ACTION: "Дія меню при утримуванні"
 STR_CYCLE_PAGE_TURN: "Автоперегортання"
 STR_LOW_MEMORY_IMAGES_TITLE: "Розділ завантажено без зображень"
 STR_LOW_MEMORY_IMAGES_BODY: "Доступної пам'яті було замало, щоб витягти зображення для цього розділу."
+STR_BOOKMARK_LIMIT_REACHED: "Досягнуто ліміту закладок"
+STR_MANAGE_FONTS: "Керування шрифтами"
+STR_FONT_BROWSER: "Перегляд шрифтів"
+STR_LOADING_FONT_LIST: "Оновлення списку шрифтів..."
+STR_NO_FONTS_AVAILABLE: "Шрифти недоступні"
+STR_FONT_INSTALLED: "Шрифт встановлено!"
+STR_FONT_INSTALL_FAILED: "Не вдалося встановити шрифт"
+STR_INSTALLED: "Встановлено"
+STR_CONFIRM_DOWNLOAD_PROMPT: "Завантажити?"
+STR_SD_CARD_FULL: "Недостатньо місця на SD-карті"
+STR_FILES_LABEL: "Файли: "
+STR_SIZE_LABEL: "Розмір: "
+STR_REDOWNLOAD: "Завантажити повторно"
+STR_DOWNLOAD_ALL: "Завантажити все"
+STR_UPDATE_ALL: "Оновити все"
+STR_ALL_FONTS_INSTALLED: "Всі шрифти встановлено!"
+STR_UPDATE_AVAILABLE: "Оновити"
+STR_CRASH_TITLE: "Збій Системи"
+STR_CRASH_DESCRIPTION: "Дані про збій збережено в crash_report.txt. Додайте цей файл до вашого звіту про помилку."
+STR_CRASH_REASON: "Причина збою:"
+STR_CRASH_NO_REASON: "(Причину не вказано)"
 STR_TILT_PAGE_TURN: "Перегортання нахилом"
-STR_BOOKMARK_LIMIT_REACHED: "Досягнуто ліміт закладок"
+STR_KB_HINT_MOVE_CURSOR: "Натисніть ВЛІВО / ВПРАВО для переміщення курсору"
+STR_KB_HINT_RETURN_CURSOR: "Натисніть ВЛІВО для повернення до курсору"
+STR_KB_HINT_HIDE_PASSWORD: "Затисніть ВПРАВО, натисніть [***], щоб приховати пароль"
+STR_KB_HINT_SHOW_PASSWORD: "Затисніть ВПРАВО, натисніть [abc], щоб показати пароль"
+STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Натисніть [***], щоб приховати пароль"
+STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Натисніть [abc], щоб показати пароль"
+STR_KB_HINT_EDIT_ENTRY: "Затисніть ВГОРУ для редагування"
+STR_KB_TIPS: "Поради:"
+STR_KB_HINT_RETURN_KEYBOARD: "Натисніть ВНИЗ, щоб повернутися до клавіатури"
+STR_KB_HINT_EXIT_URL_MODE: "Натисніть [ABC] для виходу з режиму URL"
+STR_KB_HINT_CLEAR_TEXT: "Затисніть <--, щоб видалити весь текст"
+STR_KB_HINT_SECONDARY_CHAR: "Затисніть ВИБРАТИ для додаткових символів"
+STR_KB_HINT_UPPER_SECONDARY: "Затисніть ВИБРАТИ для ВЕЛИКИХ літер / символів"
+STR_KB_HINT_LOWER_SECONDARY: "Затисніть ВИБРАТИ для малих літер / символів"
+STR_KB_HINT_URL_SNIPPETS: "Натисніть URL для вибору шаблонів"
+STR_SD_FIRMWARE_UPDATE: "Оновлення системи з SD-карти"
+STR_SELECT_FIRMWARE_FILE: "Оберіть файл оновлення (.bin)"
+STR_NO_BIN_FILES: "Не знайдено .bin файлів"
+STR_VALIDATING_FIRMWARE: "Перевірка цілісності файлу..."
+STR_INVALID_FIRMWARE: "Невірний файл оновлення системи"
+STR_FIRMWARE_TOO_LARGE: "Файл оновлення системи не вміщується в розділ пам'яті"
+STR_FIRMWARE_TOO_SMALL: "Файл оновлення системи занадто малий"
+STR_FIRMWARE_UPDATE_PROMPT: "Оновити систему?"
+STR_FIRMWARE_FILE_OPEN_FAILED: "Неможливо відкрити файл"
+STR_FIRMWARE_WRITE_FAILED: "Помилка запису прошивки"
+STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Не вимикайте пристрій!"
+STR_RECOVERY_MODE: "Режим відновлення"
+STR_RECOVERY_MODE_HINT: "Помістіть firmware.bin у корінь SD-карти та виберіть його"
diff --git a/lib/I18n/translations/vietnamese.yaml b/lib/I18n/translations/vietnamese.yaml
index e97984fd..8ffb6738 100644
--- a/lib/I18n/translations/vietnamese.yaml
+++ b/lib/I18n/translations/vietnamese.yaml
@@ -74,6 +74,9 @@ STR_IMAGES_SUPPRESS: "Ẩn"
 STR_SHORT_PWR_BTN: "Hành động nhấn ngắn"
 STR_ORIENTATION: "Hướng đọc"
 STR_SIDE_BTN_LAYOUT: "Bố cục"
+STR_ORIENTATION_AWARE: "Theo hướng xoay"
+STR_NAV_BUTTONS: "Nút điều hướng"
+STR_ALL_BUTTONS: "Tất cả nút"
 STR_LONG_PRESS_SKIP: "Nhấn giữ để bỏ qua chương"
 STR_SIDE_BTN_LONG_PRESS: "Hành động nhấn giữ"
 STR_CHAPTER_SKIP_OPT: "Bỏ qua chương"
@@ -188,6 +191,7 @@ STR_ERROR_GENERAL_FAILURE: "Lỗi: lỗi chung"
 STR_ERROR_NETWORK_NOT_FOUND: "Lỗi: không tìm thấy mạng"
 STR_ERROR_CONNECTION_TIMEOUT: "Lỗi: quá thời gian kết nối"
 STR_SD_CARD: "Thẻ SD"
+STR_TOGGLE_HIDDEN_FILES_HINT: "Nhấn giữ Trang chủ để bật/tắt tệp ẩn"
 STR_BACK: "« Quay lại"
 STR_EXIT: "« Thoát"
 STR_HOME: "« Trang chủ"
@@ -250,12 +254,14 @@ STR_PREVIEW: "Xem trước"
 STR_TITLE: "Tiêu đề"
 STR_BATTERY: "Pin"
 STR_THEME_CLASSIC: "Cổ điển"
-STR_THEME_LYRA: "Lyra"
 STR_THEME_LYRA_EXTENDED: "Lyra Extended"
 STR_SEARCH: "Tìm kiếm"
 STR_COVER_CUSTOM: "Bìa + Tùy chỉnh"
 STR_PAGE_OVERLAY: "Lớp phủ trang"
 STR_NO_RECENT_BOOKS: "Không có sách gần đây"
+STR_RECENT_BOOKS_VIEW: "Chế độ xem sách gần đây"
+STR_LIST_VIEW: "Danh sách"
+STR_GRID_VIEW: "Lưới"
 STR_CALIBRE_DESC: "Dùng chuyển sách không dây từ Calibre"
 STR_FORGET_AND_REMOVE: "Quên mạng này và xóa mật khẩu đã lưu?"
 STR_FORGET_BUTTON: "Quên"
@@ -277,6 +283,7 @@ STR_GO_TO_PERCENT: "Đi tới %"
 STR_GO_HOME_BUTTON: "Về trang chủ"
 STR_SYNC_PROGRESS: "Đồng bộ tiến độ"
 STR_DELETE_CACHE: "Xóa bộ nhớ đệm sách"
+STR_BOOK_CACHE_DELETED: "Đã xóa bộ nhớ đệm sách"
 STR_DELETE: "Xóa"
 STR_DISPLAY_QR: "Hiện trang dưới dạng QR"
 STR_CHAPTER_PREFIX: "Chương: "
@@ -314,7 +321,10 @@ STR_NO_FOOTNOTES: "Không có chú thích ở trang này"
 STR_LINK: "[link]"
 STR_SCREENSHOT_BUTTON: "Chụp màn hình"
 STR_AUTO_TURN_ENABLED: "Lật trang tự động: "
-STR_AUTO_TURN_PAGES_PER_MIN: "Khoảng lật trang tự động (giây)"
+STR_AUTO_TURN_INTERVAL_SECONDS: "Khoảng thời gian lật trang tự động (giây)"
+STR_AUTO_TURN_STEP_HINT: "Trái/Phải: 1 giây  Lên/Xuống: 5 giây"
+STR_SLEEP_TIMER_VALUE_FORMAT: "%u phút"
+STR_SLEEP_TIMER_STEP_HINT: "Trái/Phải: 1 phút  Lên/Xuống: 5 phút"
 STR_MARK_FINISHED: "Đánh dấu là đã đọc xong"
 STR_MARK_UNFINISHED: "Bỏ đánh dấu đã đọc xong"
 STR_MARK_FINISHED_PROMPT_TITLE: "Đánh dấu là đã đọc xong?"
diff --git a/lib/JpegToBmpConverter/JpegToBmpConverter.cpp b/lib/JpegToBmpConverter/JpegToBmpConverter.cpp
index c37dae68..1c57d156 100644
--- a/lib/JpegToBmpConverter/JpegToBmpConverter.cpp
+++ b/lib/JpegToBmpConverter/JpegToBmpConverter.cpp
@@ -4,10 +4,11 @@
 #include <HalStorage.h>
 #include <JPEGDEC.h>
 #include <Logging.h>
+#include <Memory.h>
 
+#include <algorithm>
 #include <cstdio>
 #include <cstring>
-#include <new>
 
 #include "BitmapHelpers.h"
 
@@ -211,26 +212,26 @@ struct BmpConvertCtx {
 
   // Accumulates one MCU row (up to MAX_MCU_HEIGHT source rows × srcWidth pixels)
   // Filled column-by-column as JPEGDEC callbacks arrive for the same MCU row
-  uint8_t* mcuBuf;
+  std::unique_ptr<uint8_t[]> mcuBuf;
 
   // Y-axis area averaging accumulators (needsScaling only)
   int currentOutY;
   uint32_t nextOutY_srcStart;  // 16.16 fixed-point boundary for the next output row
-  uint32_t* rowAccum;
-  uint32_t* rowCount;
+  std::unique_ptr<uint32_t[]> rowAccum;
+  std::unique_ptr<uint32_t[]> rowCount;
 
-  uint8_t* bmpRow;
+  std::unique_ptr<uint8_t[]> bmpRow;
 
-  AtkinsonDitherer* atkinsonDitherer;
-  FloydSteinbergDitherer* fsDitherer;
-  Atkinson1BitDitherer* atkinson1BitDitherer;
+  std::unique_ptr<AtkinsonDitherer> atkinsonDitherer;
+  std::unique_ptr<FloydSteinbergDitherer> fsDitherer;
+  std::unique_ptr<Atkinson1BitDitherer> atkinson1BitDitherer;
 
   bool error;
 };
 
 // Write a fully-assembled output row (grayscale bytes, length outWidth) to BMP
 static void writeOutputRow(BmpConvertCtx* ctx, const uint8_t* srcRow, int outY) {
-  memset(ctx->bmpRow, 0, ctx->bytesPerRow);
+  memset(ctx->bmpRow.get(), 0, ctx->bytesPerRow);
 
   if (USE_8BIT_OUTPUT && !ctx->oneBit) {
     for (int x = 0; x < ctx->outWidth; x++) {
@@ -262,12 +263,12 @@ static void writeOutputRow(BmpConvertCtx* ctx, const uint8_t* srcRow, int outY)
       ctx->fsDitherer->nextRow();
   }
 
-  ctx->bmpOut->write(ctx->bmpRow, ctx->bytesPerRow);
+  ctx->bmpOut->write(ctx->bmpRow.get(), ctx->bytesPerRow);
 }
 
 // Flush one scaled output row from Y-axis accumulators and advance currentOutY
 static void flushScaledRow(BmpConvertCtx* ctx) {
-  memset(ctx->bmpRow, 0, ctx->bytesPerRow);
+  memset(ctx->bmpRow.get(), 0, ctx->bytesPerRow);
 
   if (USE_8BIT_OUTPUT && !ctx->oneBit) {
     for (int x = 0; x < ctx->outWidth; x++) {
@@ -301,7 +302,7 @@ static void flushScaledRow(BmpConvertCtx* ctx) {
       ctx->fsDitherer->nextRow();
   }
 
-  ctx->bmpOut->write(ctx->bmpRow, ctx->bytesPerRow);
+  ctx->bmpOut->write(ctx->bmpRow.get(), ctx->bytesPerRow);
   ctx->currentOutY++;
 }
 
@@ -324,7 +325,7 @@ int bmpDrawCallback(JPEGDRAW* pDraw) {
   for (int r = 0; r < blockH && r < MAX_MCU_HEIGHT; r++) {
     const int copyW = (blockX + validW <= ctx->srcWidth) ? validW : (ctx->srcWidth - blockX);
     if (copyW <= 0) continue;
-    memcpy(ctx->mcuBuf + r * ctx->srcWidth + blockX, pixels + r * stride, copyW);
+    memcpy(ctx->mcuBuf.get() + r * ctx->srcWidth + blockX, pixels + r * stride, copyW);
   }
 
   // Wait for the last MCU column before processing any rows
@@ -335,7 +336,7 @@ int bmpDrawCallback(JPEGDRAW* pDraw) {
   const int safeEndRow = blockY + std::min(blockH, MAX_MCU_HEIGHT);
 
   for (int y = blockY; y < safeEndRow && y < ctx->srcHeight; y++) {
-    const uint8_t* srcRow = ctx->mcuBuf + (y - blockY) * ctx->srcWidth;
+    const uint8_t* srcRow = ctx->mcuBuf.get() + (y - blockY) * ctx->srcWidth;
 
     if (!ctx->needsScaling) {
       // 1:1 — outWidth == srcWidth, write directly
@@ -365,8 +366,8 @@ int bmpDrawCallback(JPEGDRAW* pDraw) {
         flushScaledRow(ctx);
         ctx->nextOutY_srcStart = static_cast<uint32_t>(ctx->currentOutY + 1) * ctx->scaleY_fp;
         if (srcY_fp >= ctx->nextOutY_srcStart) continue;
-        memset(ctx->rowAccum, 0, ctx->outWidth * sizeof(uint32_t));
-        memset(ctx->rowCount, 0, ctx->outWidth * sizeof(uint32_t));
+        memset(ctx->rowAccum.get(), 0, ctx->outWidth * sizeof(uint32_t));
+        memset(ctx->rowCount.get(), 0, ctx->outWidth * sizeof(uint32_t));
       }
     }
   }
@@ -374,6 +375,43 @@ int bmpDrawCallback(JPEGDRAW* pDraw) {
   return ctx->error ? 0 : 1;
 }
 
+// Scans JPEG markers for SOF2 (progressive DCT) — JPEGDEC only handles baseline/sequential.
+static bool isProgressiveJpeg(FsFile& file) {
+  file.seek(0);
+  uint8_t buf[2];
+  if (file.read(buf, 2) != 2 || buf[0] != 0xFF || buf[1] != 0xD8) {
+    file.seek(0);
+    return false;
+  }
+  while (file.available() >= 2) {
+    uint8_t b;
+    if (file.read(&b, 1) != 1 || b != 0xFF) break;
+    // skip fill bytes (JPEG allows 0xFF padding before a marker byte)
+    do {
+      if (file.read(&b, 1) != 1) {
+        file.seek(0);
+        return false;
+      }
+    } while (b == 0xFF);
+    const uint8_t marker = b;
+    if (marker == 0xC2) {
+      LOG_DBG("JPG", "Detected progressive JPEG (SOF2)");
+      file.seek(0);
+      return true;
+    }
+    if (marker == 0xC0 || marker == 0xC1 || marker == 0xC3) {
+      file.seek(0);
+      return false;
+    }
+    if (marker == 0xD9) break;
+    if (file.read(buf, 2) != 2) break;
+    const int segLen = (static_cast<int>(buf[0]) << 8) | buf[1];
+    if (segLen < 2 || !file.seek(file.position() + segLen - 2)) break;
+  }
+  file.seek(0);
+  return false;
+}
+
 }  // namespace
 
 // Internal implementation with configurable target size and bit depth
@@ -386,25 +424,30 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
     return false;
   }
 
+  // Progressive JPEGs (SOF2) must use JPEG_SCALE_EIGHTH — the only mode safe with the MCU_SKIP patch.
+  // The 1/8-scale output is then passed through the custom scaler to reach the target dimensions.
+  const bool progressive = isProgressiveJpeg(jpegFile);
+
   s_jpegFile = &jpegFile;
 
-  JPEGDEC* jpeg = new (std::nothrow) JPEGDEC();
+  const auto jpeg = makeUniqueNoThrow<JPEGDEC>();
   if (!jpeg) {
-    LOG_ERR("JPG", "Failed to allocate JPEG decoder");
+    LOG_ERR("JPG", "OOM: JPEG decoder");
     return false;
   }
 
   int rc = jpeg->open("", bmpJpegOpen, bmpJpegClose, bmpJpegRead, bmpJpegSeek, bmpDrawCallback);
   if (rc != 1) {
     LOG_ERR("JPG", "JPEG open failed (err=%d)", jpeg->getLastError());
-    delete jpeg;
     return false;
   }
 
+  const ScopedCleanup cleanup{[&jpeg]() { jpeg->close(); }};
+
   const int srcWidth = jpeg->getWidth();
   const int srcHeight = jpeg->getHeight();
 
-  LOG_DBG("JPG", "JPEG dimensions: %dx%d", srcWidth, srcHeight);
+  LOG_DBG("JPG", "JPEG dimensions: %dx%d%s", srcWidth, srcHeight, progressive ? " (progressive)" : "");
 
   constexpr int MAX_IMAGE_WIDTH = 2048;
   constexpr int MAX_IMAGE_HEIGHT = 3072;
@@ -412,21 +455,23 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
   if (srcWidth <= 0 || srcHeight <= 0 || srcWidth > MAX_IMAGE_WIDTH || srcHeight > MAX_IMAGE_HEIGHT) {
     LOG_DBG("JPG", "Image too large or invalid (%dx%d), max supported: %dx%d", srcWidth, srcHeight, MAX_IMAGE_WIDTH,
             MAX_IMAGE_HEIGHT);
-    jpeg->close();
-    delete jpeg;
     return false;
   }
 
+  const int effectiveSrcW = progressive ? (srcWidth + 7) / 8 : srcWidth;
+  const int effectiveSrcH = progressive ? (srcHeight + 7) / 8 : srcHeight;
+  const int decodeFlags = progressive ? JPEG_SCALE_EIGHTH : 0;
+
   // Calculate output dimensions (pre-scale to fit display exactly)
-  int outWidth = srcWidth;
-  int outHeight = srcHeight;
+  int outWidth = effectiveSrcW;
+  int outHeight = effectiveSrcH;
   uint32_t scaleX_fp = 65536;  // 1.0 in 16.16 fixed point
   uint32_t scaleY_fp = 65536;
   bool needsScaling = false;
 
-  if (targetWidth > 0 && targetHeight > 0 && (srcWidth != targetWidth || srcHeight != targetHeight)) {
-    const float scaleToFitWidth = static_cast<float>(targetWidth) / srcWidth;
-    const float scaleToFitHeight = static_cast<float>(targetHeight) / srcHeight;
+  if (targetWidth > 0 && targetHeight > 0 && (effectiveSrcW != targetWidth || effectiveSrcH != targetHeight)) {
+    const float scaleToFitWidth = static_cast<float>(targetWidth) / effectiveSrcW;
+    const float scaleToFitHeight = static_cast<float>(targetHeight) / effectiveSrcH;
     float scale = 1.0f;
     if (crop) {
       scale = (scaleToFitWidth > scaleToFitHeight) ? scaleToFitWidth : scaleToFitHeight;
@@ -434,17 +479,17 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
       scale = (scaleToFitWidth < scaleToFitHeight) ? scaleToFitWidth : scaleToFitHeight;
     }
 
-    outWidth = static_cast<int>(srcWidth * scale);
-    outHeight = static_cast<int>(srcHeight * scale);
+    outWidth = static_cast<int>(effectiveSrcW * scale);
+    outHeight = static_cast<int>(effectiveSrcH * scale);
     if (outWidth < 1) outWidth = 1;
     if (outHeight < 1) outHeight = 1;
 
-    scaleX_fp = (static_cast<uint32_t>(srcWidth) << 16) / outWidth;
-    scaleY_fp = (static_cast<uint32_t>(srcHeight) << 16) / outHeight;
+    scaleX_fp = (static_cast<uint32_t>(effectiveSrcW) << 16) / outWidth;
+    scaleY_fp = (static_cast<uint32_t>(effectiveSrcH) << 16) / outHeight;
     needsScaling = true;
 
-    LOG_DBG("JPG", "Scaling %dx%d -> %dx%d (target %dx%d)", srcWidth, srcHeight, outWidth, outHeight, targetWidth,
-            targetHeight);
+    LOG_DBG("JPG", "Scaling %dx%d -> %dx%d (target %dx%d)", effectiveSrcW, effectiveSrcH, outWidth, outHeight,
+            targetWidth, targetHeight);
   }
 
   // Write BMP header with output dimensions
@@ -462,8 +507,8 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
 
   BmpConvertCtx ctx = {};
   ctx.bmpOut = &bmpOut;
-  ctx.srcWidth = srcWidth;
-  ctx.srcHeight = srcHeight;
+  ctx.srcWidth = effectiveSrcW;
+  ctx.srcHeight = effectiveSrcH;
   ctx.outWidth = outWidth;
   ctx.outHeight = outHeight;
   ctx.oneBit = oneBit;
@@ -473,67 +518,67 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
   ctx.scaleY_fp = scaleY_fp;
   ctx.error = false;
 
-  // RAII guard: frees all heap resources on any return path
-  struct Cleanup {
-    BmpConvertCtx& ctx;
-    JPEGDEC* jpeg;
-    ~Cleanup() {
-      delete[] ctx.rowAccum;
-      delete[] ctx.rowCount;
-      delete ctx.atkinsonDitherer;
-      delete ctx.fsDitherer;
-      delete ctx.atkinson1BitDitherer;
-      free(ctx.mcuBuf);
-      free(ctx.bmpRow);
-      jpeg->close();
-      delete jpeg;
-    }
-  } cleanup{ctx, jpeg};
-
-  // MCU row buffer: MAX_MCU_HEIGHT rows × srcWidth columns of grayscale
-  ctx.mcuBuf = static_cast<uint8_t*>(malloc(MAX_MCU_HEIGHT * srcWidth));
+  // MCU row buffer: MAX_MCU_HEIGHT rows × ctx.srcWidth columns of grayscale.
+  ctx.mcuBuf = makeUniqueNoThrow<uint8_t[]>(MAX_MCU_HEIGHT * effectiveSrcW);
   if (!ctx.mcuBuf) {
-    LOG_ERR("JPG", "Failed to allocate MCU buffer (%d bytes)", MAX_MCU_HEIGHT * srcWidth);
+    LOG_ERR("JPG", "OOM: MCU buffer (%d bytes)", MAX_MCU_HEIGHT * effectiveSrcW);
     return false;
   }
-  memset(ctx.mcuBuf, 0, MAX_MCU_HEIGHT * srcWidth);
+  memset(ctx.mcuBuf.get(), 0, MAX_MCU_HEIGHT * effectiveSrcW);
 
-  ctx.bmpRow = static_cast<uint8_t*>(malloc(bytesPerRow));
+  ctx.bmpRow = makeUniqueNoThrow<uint8_t[]>(bytesPerRow);
   if (!ctx.bmpRow) {
-    LOG_ERR("JPG", "Failed to allocate BMP row buffer");
+    LOG_ERR("JPG", "OOM: BMP row buffer");
     return false;
   }
 
   if (needsScaling) {
-    ctx.rowAccum = new (std::nothrow) uint32_t[outWidth]();
-    ctx.rowCount = new (std::nothrow) uint32_t[outWidth]();
+    ctx.rowAccum = makeUniqueNoThrow<uint32_t[]>(outWidth);
+    ctx.rowCount = makeUniqueNoThrow<uint32_t[]>(outWidth);
     if (!ctx.rowAccum || !ctx.rowCount) {
-      LOG_ERR("JPG", "Failed to allocate scaling buffers");
+      LOG_ERR("JPG", "OOM: scaling buffers");
       return false;
     }
     ctx.nextOutY_srcStart = scaleY_fp;
   }
 
   if (oneBit) {
-    ctx.atkinson1BitDitherer = new (std::nothrow) Atkinson1BitDitherer(outWidth);
+    ctx.atkinson1BitDitherer = makeUniqueNoThrow<Atkinson1BitDitherer>(outWidth);
+    if (!ctx.atkinson1BitDitherer) {
+      LOG_ERR("JPG", "OOM: Atkinson1BitDitherer");
+      return false;
+    }
   } else if (!USE_8BIT_OUTPUT) {
     if (USE_ATKINSON) {
-      ctx.atkinsonDitherer = new (std::nothrow) AtkinsonDitherer(outWidth);
+      ctx.atkinsonDitherer = makeUniqueNoThrow<AtkinsonDitherer>(outWidth);
+      if (!ctx.atkinsonDitherer) {
+        LOG_ERR("JPG", "OOM: AtkinsonDitherer");
+        return false;
+      }
     } else if (USE_FLOYD_STEINBERG) {
-      ctx.fsDitherer = new (std::nothrow) FloydSteinbergDitherer(outWidth);
+      ctx.fsDitherer = makeUniqueNoThrow<FloydSteinbergDitherer>(outWidth);
+      if (!ctx.fsDitherer) {
+        LOG_ERR("JPG", "OOM: FloydSteinbergDitherer");
+        return false;
+      }
     }
   }
 
   jpeg->setPixelType(EIGHT_BIT_GRAYSCALE);
   jpeg->setUserPointer(&ctx);
 
-  rc = jpeg->decode(0, 0, 0);
+  rc = jpeg->decode(0, 0, decodeFlags);
 
   if (rc != 1 || ctx.error) {
     LOG_ERR("JPG", "JPEG decode failed (rc=%d, err=%d)", rc, jpeg->getLastError());
     return false;
   }
 
+  if (ctx.needsScaling && ctx.currentOutY < ctx.outHeight) {
+    LOG_ERR("JPG", "JPEG decode incomplete: %d/%d output rows written", ctx.currentOutY, ctx.outHeight);
+    return false;
+  }
+
   LOG_DBG("JPG", "Successfully converted JPEG to BMP");
   return true;
 }
diff --git a/lib/KOReaderSync/ChapterXPathResolver.cpp b/lib/KOReaderSync/ChapterXPathResolver.cpp
index 5751a1db..5928ebd7 100644
--- a/lib/KOReaderSync/ChapterXPathResolver.cpp
+++ b/lib/KOReaderSync/ChapterXPathResolver.cpp
@@ -49,13 +49,14 @@ struct PathSegment {
   int index;
 };
 
-std::string buildParagraphXPath(const int spineIndex, const std::vector<PathSegment>& path, const int charOffset) {
+std::string buildParagraphXPath(const int spineIndex, const std::vector<PathSegment>& path, const int textNodeIndex,
+                                const size_t charOffset) {
   std::string xpath = "/body/DocFragment[" + std::to_string(spineIndex + 1) + "]/body";
   for (const auto& segment : path) {
     xpath += "/" + segment.name + "[" + std::to_string(segment.index) + "]";
   }
-  if (charOffset > 0) {
-    xpath += "/text()." + std::to_string(charOffset);
+  if (textNodeIndex > 0 && charOffset > 0) {
+    xpath += "/text()[" + std::to_string(textNodeIndex) + "]." + std::to_string(charOffset);
   }
   return xpath;
 }
@@ -280,7 +281,7 @@ class XPathParagraphResolver final : public Print {
     if (name == "p") {
       paragraphCount++;
       if (paragraphCount == targetParagraph) {
-        xpath = buildParagraphXPath(spineIndex, path, 0);
+        xpath = buildParagraphXPath(spineIndex, path, 0, 0);
         stopped = true;
         XML_StopParser(parser, XML_FALSE);
       }
@@ -410,10 +411,14 @@ class XPathProgressResolver final : public Print {
     const int siblingIndex = parentStates.back().nextIndex(name);
     path.push_back({name, siblingIndex});
     parentStates.emplace_back();
+    textNodeIndexStack.push_back(0);
+    pendingTextNode = true;
 
     if (name == "p") {
       paragraphDepth++;
-      paragraphVisibleChars = 0;
+    }
+    if (name == "li") {
+      liDepth++;
     }
 
     depth++;
@@ -431,14 +436,23 @@ class XPathProgressResolver final : public Print {
       insideBody = false;
       parentStates.clear();
       path.clear();
+      textNodeIndexStack.clear();
       return;
     }
 
     if (name == "p" && paragraphDepth > 0) {
       paragraphDepth--;
-      paragraphVisibleChars = 0;
+    }
+    if (name == "li" && liDepth > 0) {
+      liDepth--;
     }
 
+    if (!textNodeIndexStack.empty()) {
+      textNodeIndexStack.pop_back();
+    }
+    if (paragraphDepth > 0 || liDepth > 0) {
+      pendingTextNode = true;
+    }
     if (!path.empty()) {
       path.pop_back();
     }
@@ -448,23 +462,38 @@ class XPathProgressResolver final : public Print {
   }
 
   void onCharacterData(const XML_Char* data, const int len) {
-    if (!insideBody || paragraphDepth <= 0 || len <= 0 || stopped) {
+    if (!insideBody || (paragraphDepth <= 0 && liDepth <= 0) || len <= 0 || stopped) {
       return;
     }
 
     const size_t codepointCount = countUtf8Codepoints(data, len);
+    if (codepointCount == 0) {
+      return;
+    }
+
+    // Start a new text node on first non-empty content after any element boundary.
+    // Only counting non-empty nodes matches KOReader's text()[N] indexing behavior,
+    // which skips empty text nodes created by bare <a id="anchor"/> anchors.
+    if (pendingTextNode) {
+      if (!textNodeIndexStack.empty()) {
+        textNodeIndexStack.back()++;
+      }
+      textNodeStartChars = visibleChars;
+      pendingTextNode = false;
+    }
+
     const size_t nextVisibleChars = visibleChars + codepointCount;
     if (targetVisibleChar <= nextVisibleChars) {
       const size_t delta = targetVisibleChar - visibleChars;
-      const int charOffset = static_cast<int>(paragraphVisibleChars + delta);
-      xpath = buildParagraphXPath(spineIndex, path, std::max(1, charOffset));
+      const int texNode = textNodeIndexStack.empty() ? 0 : textNodeIndexStack.back();
+      const size_t charOff = visibleChars - textNodeStartChars + delta;
+      xpath = buildParagraphXPath(spineIndex, path, texNode, charOff);
       stopped = true;
       XML_StopParser(parser, XML_FALSE);
       return;
     }
 
     visibleChars = nextVisibleChars;
-    paragraphVisibleChars += codepointCount;
   }
 
   XML_Parser parser = nullptr;
@@ -472,11 +501,14 @@ class XPathProgressResolver final : public Print {
   bool parseOk = true;
   bool insideBody = false;
   bool stopped = false;
+  bool pendingTextNode = true;
   int depth = 0;
   int bodyDepth = -1;
   int paragraphDepth = 0;
+  int liDepth = 0;
   size_t visibleChars = 0;
-  size_t paragraphVisibleChars = 0;
+  size_t textNodeStartChars = 0;
+  std::vector<int> textNodeIndexStack;
   std::vector<ParentState> parentStates;
   std::vector<PathSegment> path;
   std::string xpath;
diff --git a/lib/KOReaderSync/KOReaderCredentialStore.cpp b/lib/KOReaderSync/KOReaderCredentialStore.cpp
index 896b1160..f7528c5a 100644
--- a/lib/KOReaderSync/KOReaderCredentialStore.cpp
+++ b/lib/KOReaderSync/KOReaderCredentialStore.cpp
@@ -6,7 +6,7 @@
 #include <ObfuscationUtils.h>
 #include <Serialization.h>
 
-#include "../../src/JsonSettingsIO.h"
+#include "KOReaderJsonIO.h"
 
 // Initialize the static instance
 KOReaderCredentialStore KOReaderCredentialStore::instance;
@@ -36,7 +36,7 @@ void legacyDeobfuscate(std::string& data) {
 
 bool KOReaderCredentialStore::saveToFile() const {
   Storage.mkdir("/.crosspoint");
-  return JsonSettingsIO::saveKOReader(*this, KOREADER_FILE_JSON);
+  return KOReaderJsonIO::save(*this, KOREADER_FILE_JSON);
 }
 
 bool KOReaderCredentialStore::loadFromFile() {
@@ -45,7 +45,7 @@ bool KOReaderCredentialStore::loadFromFile() {
     String json = Storage.readFile(KOREADER_FILE_JSON);
     if (!json.isEmpty()) {
       bool resave = false;
-      bool result = JsonSettingsIO::loadKOReader(*this, json.c_str(), &resave);
+      bool result = KOReaderJsonIO::load(*this, json.c_str(), &resave);
       if (result && resave) {
         saveToFile();
         LOG_DBG("KRS", "Resaved KOReader credentials to update format");
diff --git a/lib/KOReaderSync/KOReaderCredentialStore.h b/lib/KOReaderSync/KOReaderCredentialStore.h
index 89e008d0..c2ea515d 100644
--- a/lib/KOReaderSync/KOReaderCredentialStore.h
+++ b/lib/KOReaderSync/KOReaderCredentialStore.h
@@ -8,12 +8,6 @@ enum class DocumentMatchMethod : uint8_t {
   BINARY = 1,    // Match by partial MD5 of file content (more accurate, but files must be identical)
 };
 
-class KOReaderCredentialStore;
-namespace JsonSettingsIO {
-bool saveKOReader(const KOReaderCredentialStore& store, const char* path);
-bool loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave);
-}  // namespace JsonSettingsIO
-
 /**
  * Singleton class for storing KOReader sync credentials on the SD card.
  * Passwords are XOR-obfuscated with the device's unique hardware MAC address
@@ -33,9 +27,6 @@ class KOReaderCredentialStore {
 
   bool loadFromBinaryFile();
 
-  friend bool JsonSettingsIO::saveKOReader(const KOReaderCredentialStore&, const char*);
-  friend bool JsonSettingsIO::loadKOReader(KOReaderCredentialStore&, const char*, bool*);
-
  public:
   // Delete copy constructor and assignment
   KOReaderCredentialStore(const KOReaderCredentialStore&) = delete;
diff --git a/lib/KOReaderSync/KOReaderJsonIO.cpp b/lib/KOReaderSync/KOReaderJsonIO.cpp
new file mode 100644
index 00000000..05bfc119
--- /dev/null
+++ b/lib/KOReaderSync/KOReaderJsonIO.cpp
@@ -0,0 +1,51 @@
+#include "KOReaderJsonIO.h"
+
+#include <ArduinoJson.h>
+#include <HalStorage.h>
+#include <Logging.h>
+#include <ObfuscationUtils.h>
+
+#include "KOReaderCredentialStore.h"
+
+namespace KOReaderJsonIO {
+
+bool save(const KOReaderCredentialStore& store, const char* path) {
+  JsonDocument doc;
+  doc["username"] = store.getUsername();
+  doc["password_obf"] = obfuscation::obfuscateToBase64(store.getPassword());
+  doc["serverUrl"] = store.getServerUrl();
+  doc["matchMethod"] = static_cast<uint8_t>(store.getMatchMethod());
+
+  String json;
+  serializeJson(doc, json);
+  return Storage.writeFile(path, json);
+}
+
+bool load(KOReaderCredentialStore& store, const char* json, bool* needsResave) {
+  if (needsResave) *needsResave = false;
+  JsonDocument doc;
+  auto error = deserializeJson(doc, json);
+  if (error) {
+    LOG_ERR("KRS", "JSON parse error: %s", error.c_str());
+    return false;
+  }
+
+  std::string user = doc["username"] | std::string("");
+
+  bool ok = false;
+  std::string pass = obfuscation::deobfuscateFromBase64(doc["password_obf"] | "", &ok);
+  if (!ok || pass.empty()) {
+    pass = doc["password"] | std::string("");
+    if (!pass.empty() && needsResave) *needsResave = true;
+  }
+
+  store.setCredentials(user, pass);
+  store.setServerUrl(doc["serverUrl"] | std::string(""));
+
+  uint8_t method = doc["matchMethod"] | (uint8_t)0;
+  store.setMatchMethod(static_cast<DocumentMatchMethod>(method));
+
+  return true;
+}
+
+}  // namespace KOReaderJsonIO
diff --git a/lib/KOReaderSync/KOReaderJsonIO.h b/lib/KOReaderSync/KOReaderJsonIO.h
new file mode 100644
index 00000000..c8d8eb81
--- /dev/null
+++ b/lib/KOReaderSync/KOReaderJsonIO.h
@@ -0,0 +1,8 @@
+#pragma once
+
+class KOReaderCredentialStore;
+
+namespace KOReaderJsonIO {
+bool save(const KOReaderCredentialStore& store, const char* path);
+bool load(KOReaderCredentialStore& store, const char* json, bool* needsResave);
+}  // namespace KOReaderJsonIO
diff --git a/lib/KOReaderSync/KOReaderSyncClient.cpp b/lib/KOReaderSync/KOReaderSyncClient.cpp
index a78ae108..9a86724f 100644
--- a/lib/KOReaderSync/KOReaderSyncClient.cpp
+++ b/lib/KOReaderSync/KOReaderSyncClient.cpp
@@ -10,11 +10,11 @@
 #include <WiFi.h>
 #include <WiFiClientSecure.h>
 #else
-#include <base64.h>
 #include <esp_crt_bundle.h>
 #include <esp_http_client.h>
 #endif
 
+#include <cstring>
 #include <ctime>
 #include <memory>
 
@@ -27,6 +27,59 @@ namespace {
 constexpr char DEVICE_NAME[] = "CrossPoint";
 constexpr char DEVICE_ID[] = "crosspoint-reader";
 
+const char* classifyJsonBody(const char* body) {
+  if (!body || body[0] == '\0') return "empty response";
+
+  const char* cursor = body;
+  while (*cursor == ' ' || *cursor == '\t' || *cursor == '\r' || *cursor == '\n') {
+    cursor++;
+  }
+
+  if (*cursor == '\0') return "blank response";
+  if (*cursor == '<') return "HTML response";
+  if (*cursor != '{' && *cursor != '[') return "non-JSON response";
+  return "malformed JSON";
+}
+
+void logJsonParseFailure(const char* context, DeserializationError error, const char* body) {
+  char preview[97];
+  size_t i = 0;
+  if (body) {
+    for (; i < sizeof(preview) - 1 && body[i] != '\0'; i++) {
+      const char c = body[i];
+      preview[i] = (c == '\r' || c == '\n' || c == '\t') ? ' ' : c;
+    }
+  }
+  preview[i] = '\0';
+
+  LOG_ERR("KOSync", "%s JSON parse failed: %s (%s, preview=\"%s\")", context, error.c_str(), classifyJsonBody(body),
+          preview);
+}
+
+KOReaderSyncClient::Error validateAuthResponse(const char* body) {
+  JsonDocument doc;
+  const DeserializationError error = deserializeJson(doc, body ? body : "");
+  if (error) {
+    logJsonParseFailure("Auth", error, body);
+    return KOReaderSyncClient::JSON_ERROR;
+  }
+
+  const char* authorized = doc["authorized"] | "";
+  if (std::strcmp(authorized, "OK") != 0) {
+    LOG_ERR("KOSync", "Auth response missing authorized=OK");
+    return KOReaderSyncClient::INVALID_AUTH_RESPONSE;
+  }
+
+  return KOReaderSyncClient::OK;
+}
+
+// Cloudflare tunnels send a 3-cert Google Trust Services chain. During the TLS handshake
+// mbedTLS makes many small allocations that collectively consume ~48KB of heap. With only
+// ~50KB free after WiFi connects, the session drove min-free-ever down to 2600 bytes before
+// failing with MBEDTLS_ERR_X509_ALLOC_FAILED (-0x2880). Check total free heap (not max
+// contiguous block) because the failure mode is aggregate exhaustion, not one large alloc.
+constexpr uint32_t MIN_HEAP_FOR_TLS = 55000;
+
 #ifdef SIMULATOR
 void addAuthHeaders(HTTPClient& http) {
   http.addHeader("Accept", "application/vnd.koreader.v1+json");
@@ -93,6 +146,11 @@ esp_http_client_handle_t createClient(const char* url, ResponseBuffer* buf,
   config.buffer_size_tx = HTTP_BUF_SIZE;
   config.crt_bundle_attach = esp_crt_bundle_attach;
 
+  // HTTP Basic Auth for Calibre-Web-Automated compatibility
+  config.username = KOREADER_STORE.getUsername().c_str();
+  config.password = KOREADER_STORE.getPassword().c_str();
+  config.auth_type = HTTP_AUTH_TYPE_BASIC;
+
   esp_http_client_handle_t client = esp_http_client_init(&config);
   if (!client) return nullptr;
 
@@ -105,16 +163,6 @@ esp_http_client_handle_t createClient(const char* url, ResponseBuffer* buf,
     return nullptr;
   }
 
-  // HTTP Basic Auth for Calibre-Web-Automated compatibility
-  std::string credentials = KOREADER_STORE.getUsername() + ":" + KOREADER_STORE.getPassword();
-  String encoded = base64::encode(reinterpret_cast<const uint8_t*>(credentials.data()), credentials.size());
-  std::string authHeader = "Basic " + std::string(encoded.c_str());
-  if (esp_http_client_set_header(client, "Authorization", authHeader.c_str()) != ESP_OK) {
-    LOG_ERR("KOSync", "Failed to set Authorization header");
-    esp_http_client_cleanup(client);
-    return nullptr;
-  }
-
   return client;
 }
 #endif
@@ -128,7 +176,12 @@ KOReaderSyncClient::Error KOReaderSyncClient::authenticate() {
   }
 
   std::string url = KOREADER_STORE.getBaseUrl() + "/users/auth";
-  LOG_DBG("KOSync", "Authenticating: %s (heap: %u)", url.c_str(), (unsigned)ESP.getFreeHeap());
+  const uint32_t freeHeap = ESP.getFreeHeap();
+  LOG_DBG("KOSync", "Authenticating: %s (heap: %u)", url.c_str(), (unsigned)freeHeap);
+  if (freeHeap < MIN_HEAP_FOR_TLS) {
+    LOG_ERR("KOSync", "Insufficient heap for TLS handshake: %u bytes free (need %u)", freeHeap, MIN_HEAP_FOR_TLS);
+    return LOW_MEMORY;
+  }
 
 #ifdef SIMULATOR
   HTTPClient http;
@@ -146,11 +199,17 @@ KOReaderSyncClient::Error KOReaderSyncClient::authenticate() {
 
   const int httpCode = http.GET();
   lastHttpCode = httpCode;
-  http.end();
 
   LOG_DBG("KOSync", "Auth response: %d", httpCode);
 
-  if (httpCode == 200) return OK;
+  if (httpCode == 200) {
+    String responseBody = http.getString();
+    http.end();
+    return validateAuthResponse(responseBody.c_str());
+  }
+
+  http.end();
+
   if (httpCode == 401) return AUTH_FAILED;
   if (httpCode < 0) return NETWORK_ERROR;
   return SERVER_ERROR;
@@ -170,7 +229,7 @@ KOReaderSyncClient::Error KOReaderSyncClient::authenticate() {
   LOG_DBG("KOSync", "Auth response: %d (err: %d)", httpCode, err);
 
   if (err != ESP_OK) return NETWORK_ERROR;
-  if (httpCode == 200) return OK;
+  if (httpCode == 200) return validateAuthResponse(buf.data);
   if (httpCode == 401) return AUTH_FAILED;
   return SERVER_ERROR;
 #endif
@@ -185,7 +244,12 @@ KOReaderSyncClient::Error KOReaderSyncClient::getProgress(const std::string& doc
   }
 
   std::string url = KOREADER_STORE.getBaseUrl() + "/syncs/progress/" + documentHash;
-  LOG_DBG("KOSync", "Getting progress: %s (heap: %u)", url.c_str(), (unsigned)ESP.getFreeHeap());
+  const uint32_t freeHeap = ESP.getFreeHeap();
+  LOG_DBG("KOSync", "Getting progress: %s (heap: %u)", url.c_str(), (unsigned)freeHeap);
+  if (freeHeap < MIN_HEAP_FOR_TLS) {
+    LOG_ERR("KOSync", "Insufficient heap for TLS handshake: %u bytes free (need %u)", freeHeap, MIN_HEAP_FOR_TLS);
+    return LOW_MEMORY;
+  }
 
 #ifdef SIMULATOR
   HTTPClient http;
@@ -212,7 +276,7 @@ KOReaderSyncClient::Error KOReaderSyncClient::getProgress(const std::string& doc
     const DeserializationError error = deserializeJson(doc, responseBody);
 
     if (error) {
-      LOG_ERR("KOSync", "JSON parse failed: %s", error.c_str());
+      logJsonParseFailure("Get progress", error, responseBody.c_str());
       return JSON_ERROR;
     }
 
@@ -256,7 +320,7 @@ KOReaderSyncClient::Error KOReaderSyncClient::getProgress(const std::string& doc
     const DeserializationError error = deserializeJson(doc, buf.data);
 
     if (error) {
-      LOG_ERR("KOSync", "JSON parse failed: %s", error.c_str());
+      logJsonParseFailure("Get progress", error, buf.data);
       return JSON_ERROR;
     }
 
@@ -285,7 +349,12 @@ KOReaderSyncClient::Error KOReaderSyncClient::updateProgress(const KOReaderProgr
   }
 
   std::string url = KOREADER_STORE.getBaseUrl() + "/syncs/progress";
-  LOG_DBG("KOSync", "Updating progress: %s (heap: %u)", url.c_str(), (unsigned)ESP.getFreeHeap());
+  const uint32_t freeHeap = ESP.getFreeHeap();
+  LOG_DBG("KOSync", "Updating progress: %s (heap: %u)", url.c_str(), (unsigned)freeHeap);
+  if (freeHeap < MIN_HEAP_FOR_TLS) {
+    LOG_ERR("KOSync", "Insufficient heap for TLS handshake: %u bytes free (need %u)", freeHeap, MIN_HEAP_FOR_TLS);
+    return LOW_MEMORY;
+  }
 
   // Build JSON body
   JsonDocument doc;
@@ -371,6 +440,10 @@ const char* KOReaderSyncClient::errorString(Error error) {
       return "JSON parse error";
     case NOT_FOUND:
       return "No progress found";
+    case INVALID_AUTH_RESPONSE:
+      return "Invalid auth response";
+    case LOW_MEMORY:
+      return "Not enough memory for sync - please retry";
     default:
       return "Unknown error";
   }
diff --git a/lib/KOReaderSync/KOReaderSyncClient.h b/lib/KOReaderSync/KOReaderSyncClient.h
index 7832ef8f..953fb2da 100644
--- a/lib/KOReaderSync/KOReaderSyncClient.h
+++ b/lib/KOReaderSync/KOReaderSyncClient.h
@@ -29,7 +29,17 @@ struct KOReaderProgress {
  */
 class KOReaderSyncClient {
  public:
-  enum Error { OK = 0, NO_CREDENTIALS, NETWORK_ERROR, AUTH_FAILED, SERVER_ERROR, JSON_ERROR, NOT_FOUND };
+  enum Error {
+    OK = 0,
+    NO_CREDENTIALS,
+    NETWORK_ERROR,
+    AUTH_FAILED,
+    SERVER_ERROR,
+    JSON_ERROR,
+    NOT_FOUND,
+    INVALID_AUTH_RESPONSE,
+    LOW_MEMORY
+  };
 
   /**
    * Authenticate with the sync server (validate credentials).
diff --git a/lib/KOReaderSync/ProgressMapper.cpp b/lib/KOReaderSync/ProgressMapper.cpp
index 10633a30..b89c90ef 100644
--- a/lib/KOReaderSync/ProgressMapper.cpp
+++ b/lib/KOReaderSync/ProgressMapper.cpp
@@ -39,58 +39,154 @@ int parseCharOffset(const std::string& xpath) {
   return val;
 }
 
+// Parse the N from text()[N] in the XPath (1-based; defaults to 1 if absent or 1).
+int parseTextNodeIndex(const std::string& xpath) {
+  const size_t textPos = xpath.rfind("text()[");
+  if (textPos == std::string::npos) return 1;
+  const size_t numStart = textPos + 7;  // strlen("text()[")
+  const size_t numEnd = xpath.find(']', numStart);
+  if (numEnd == std::string::npos || numEnd == numStart) return 1;
+  int val = 0;
+  for (size_t i = numStart; i < numEnd; i++) {
+    if (xpath[i] < '0' || xpath[i] > '9') return 1;
+    val = val * 10 + (xpath[i] - '0');
+  }
+  return val > 0 ? val : 1;
+}
+
+// Parsed representation of one step in the XPath ancestry.
+struct XPathStep {
+  char tag[12];      // element name, null-terminated
+  int siblingIndex;  // 1-based sibling index, or 0 if unspecified (treat as 1)
+};
+
+static constexpr int MAX_XPATH_DEPTH = 16;
+
+// Parse the XPath segment between /body/DocFragment[N]/body/ and text()[N].offset
+// into an ordered sequence of steps. Returns step count, 0 on failure.
+// Example input: "/body/DocFragment[1]/body/div[1]/ul/li[4]/text()[1].51"
+// Fills steps with: {div,1}, {ul,1}, {li,4}
+int parseXPathSteps(const std::string& xpath, XPathStep steps[MAX_XPATH_DEPTH]) {
+  static const char kBodyFrag[] = "/body/DocFragment[";
+  const size_t fragPos = xpath.find(kBodyFrag);
+  if (fragPos == std::string::npos) return 0;
+  const size_t afterBracket = xpath.find(']', fragPos + strlen(kBodyFrag));
+  if (afterBracket == std::string::npos) return 0;
+  static const char kBody[] = "/body/";
+  if (xpath.compare(afterBracket + 1, strlen(kBody), kBody) != 0) return 0;
+  size_t pos = afterBracket + 1 + strlen(kBody);
+
+  const size_t textPos = xpath.rfind("/text()");
+  if (textPos == std::string::npos || textPos <= pos) return 0;
+
+  int count = 0;
+  while (pos < textPos && count < MAX_XPATH_DEPTH) {
+    const size_t slash = xpath.find('/', pos);
+    const size_t segEnd = (slash < textPos) ? slash : textPos;
+
+    XPathStep& step = steps[count];
+    const size_t bracket = xpath.find('[', pos);
+    const size_t nameEnd = (bracket != std::string::npos && bracket < segEnd) ? bracket : segEnd;
+    const size_t nameLen = nameEnd - pos;
+    if (nameLen == 0 || nameLen >= sizeof(step.tag)) return 0;
+    memcpy(step.tag, xpath.c_str() + pos, nameLen);
+    step.tag[nameLen] = '\0';
+
+    if (bracket != std::string::npos && bracket < segEnd) {
+      const size_t closeBracket = xpath.find(']', bracket + 1);
+      if (closeBracket == std::string::npos || closeBracket > segEnd) return 0;
+      int idx = 0;
+      for (size_t i = bracket + 1; i < closeBracket; i++) {
+        if (xpath[i] < '0' || xpath[i] > '9') return 0;
+        idx = idx * 10 + (xpath[i] - '0');
+      }
+      step.siblingIndex = idx;
+    } else {
+      step.siblingIndex = 1;
+    }
+
+    count++;
+    pos = (slash < textPos) ? slash + 1 : textPos;
+  }
+  return count;
+}
+
 class ParagraphStreamer final : public Print {
   size_t bytesWritten = 0;
   bool globalInTag = false;
   bool globalInEntity = false;
-  enum { IDLE, SAW_LT, SAW_LT_P } pState = IDLE;
   static constexpr size_t MAX_ENTITY_SIZE = 16;
   char entityBuffer[MAX_ENTITY_SIZE] = {};
   size_t entityLen = 0;
 
-  // Forward mode: count paragraphs at a byte offset
+  // Forward mode: count <p> paragraphs at a byte offset (legacy, used by generateXPath)
   size_t fwdTarget;
   int fwdResult = 0;
   bool fwdCaptured = false;
 
-  // Reverse mode: find position of Nth paragraph + char offset
-  int revParagraph;
+  // Reverse mode shared state
   int revChar;
-  int pCount = 0;
   bool revPFound = false;
   bool revDone = false;
-  int revVisChars = 0;        // Visible chars counted WITHIN target paragraph
-  size_t totalVisChars = 0;   // Total visible chars in entire file
-  size_t targetVisChars = 0;  // Visible chars from start of file to target position
+  int revVisChars = 0;
+  size_t totalVisChars = 0;
+  size_t targetVisChars = 0;
 
-  void onP() {
-    pCount++;
-    if (!revPFound && revParagraph > 0 && pCount >= revParagraph) {
-      revPFound = true;
-      revVisChars = 0;
-      if (revChar <= 0) {
-        targetVisChars = totalVisChars;
-        revDone = true;
-      }
-    }
-  }
+  // --- Legacy reverse mode (paragraph index only, no ancestry) ---
+  int revParagraph = 0;
+  int pCount = 0;
+  int paragraphAtMatch = 0;
+  int liCount = 0;
+  int liCountAtMatch = 0;
+  int targetTextNode = 1;
+  int currentTextNode = 0;
+  int paragraphHtmlDepth = -1;
+
+  // --- Ancestry-aware reverse mode ---
+  const XPathStep* steps = nullptr;
+  int stepCount = 0;
+  int siblingCounters[MAX_XPATH_DEPTH] = {};
+  bool insideStep[MAX_XPATH_DEPTH] = {};
+  int htmlDepth = 0;
+  int stepEnteredAtDepth[MAX_XPATH_DEPTH] = {};
+
+  // Tag name accumulation
+  enum TagParseState { TAG_IDLE, TAG_IN_NAME, TAG_ATTRS } tagState = TAG_IDLE;
+  bool tagIsClose = false;
+  char tagName[12] = {};
+  int tagNameLen = 0;
+
+  int matchedDepth = 0;
+
+  // Anchor ID capture
+  static constexpr int MAX_ANCHOR_ID = 64;
+  char capturedAnchorId[MAX_ANCHOR_ID] = {};
+  int capturedAnchorIdLen = 0;
+  bool capturingAnchorTag = false;
+  enum IdScanState { ID_SCAN, ID_I, ID_D, ID_EQ, ID_IN_VALUE_D, ID_IN_VALUE_S } idState = ID_SCAN;
+  bool inAttrQuote =
+      false;  // true while inside a quoted attribute value (prevents '/' from being treated as self-close)
+  char attrQuoteChar = 0;
 
   void onVisibleCodepoint() {
     totalVisChars++;
     if (revPFound && !revDone) {
-      revVisChars++;
-      if (revVisChars >= revChar) {
-        targetVisChars = totalVisChars;
-        revDone = true;
+      // Ancestry mode: count only while inside the fully-matched element and in the target text node.
+      // Legacy mode: count only while still inside the matched paragraph and in the target text node.
+      const bool inTargetNode = (stepCount > 0) ? (matchedDepth == stepCount && currentTextNode == targetTextNode)
+                                                : (paragraphHtmlDepth >= 0 && currentTextNode == targetTextNode);
+      if (inTargetNode) {
+        revVisChars++;
+        if (revVisChars >= revChar) {
+          targetVisChars = totalVisChars;
+          revDone = true;
+        }
       }
     }
   }
 
   void onVisibleText(const char* text) {
-    if (!text) {
-      return;
-    }
-
+    if (!text) return;
     const unsigned char* ptr = reinterpret_cast<const unsigned char*>(text);
     while (*ptr != 0) {
       utf8NextCodepoint(&ptr);
@@ -99,26 +195,229 @@ class ParagraphStreamer final : public Print {
   }
 
   void flushEntityAsLiteral() {
-    for (size_t i = 0; i < entityLen; i++) {
-      onVisibleCodepoint();
-    }
+    for (size_t i = 0; i < entityLen; i++) onVisibleCodepoint();
   }
 
   void finishEntity() {
     entityBuffer[entityLen] = '\0';
     const char* resolved = lookupHtmlEntity(entityBuffer, entityLen);
-    if (resolved) {
+    if (resolved)
       onVisibleText(resolved);
-    } else {
+    else
       flushEntityAsLiteral();
-    }
     globalInEntity = false;
     entityLen = 0;
   }
 
+  void onLegacyP() {
+    pCount++;
+    if (!revPFound && revParagraph > 0 && pCount >= revParagraph) {
+      revPFound = true;
+      revVisChars = 0;
+      paragraphHtmlDepth = htmlDepth;
+      currentTextNode = 1;
+      if (revChar <= 0 && targetTextNode <= 1) {
+        targetVisChars = totalVisChars;
+        revDone = true;
+      }
+    }
+  }
+
+  void onOpenTag() {
+    htmlDepth++;
+
+    if (stepCount == 0) {
+      if (strcasecmp(tagName, "p") == 0) onLegacyP();
+      return;
+    }
+
+    // Capture <a id> inside the fully-matched element even after target char is found
+    if (revPFound && matchedDepth == stepCount && capturedAnchorIdLen == 0 && strcasecmp(tagName, "a") == 0) {
+      capturingAnchorTag = true;
+      idState = ID_SCAN;
+    }
+
+    if (revDone) return;
+
+    if (strcasecmp(tagName, "p") == 0) pCount++;
+    if (strcasecmp(tagName, "li") == 0) liCount++;
+
+    if (matchedDepth < stepCount) {
+      const XPathStep& target = steps[matchedDepth];
+      if (strcasecmp(tagName, target.tag) == 0) {
+        // Count only direct children of the previously matched ancestor step.
+        // For step 0 any depth is valid; subsequent steps must be exactly one level deeper.
+        const bool atCorrectDepth = (matchedDepth == 0) || (htmlDepth == stepEnteredAtDepth[matchedDepth - 1] + 1);
+        if (!atCorrectDepth) return;
+        siblingCounters[matchedDepth]++;
+        if (siblingCounters[matchedDepth] == target.siblingIndex) {
+          insideStep[matchedDepth] = true;
+          stepEnteredAtDepth[matchedDepth] = htmlDepth;
+          matchedDepth++;
+          if (matchedDepth == stepCount) {
+            paragraphAtMatch = pCount;
+            liCountAtMatch = liCount;
+            revPFound = true;
+            capturedAnchorIdLen = 0;
+            revVisChars = 0;
+            currentTextNode = 1;  // Reset text node counter for this element
+            if (revChar <= 0 && targetTextNode <= 1) {
+              targetVisChars = totalVisChars;
+              revDone = true;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  void onCloseTag() {
+    // Legacy mode: each direct child element closing advances the text node index.
+    if (stepCount == 0 && revPFound && !revDone && paragraphHtmlDepth >= 0 && htmlDepth == paragraphHtmlDepth + 1) {
+      currentTextNode++;
+      if (currentTextNode == targetTextNode && revChar <= 0) {
+        targetVisChars = totalVisChars;
+        revDone = true;
+      }
+    }
+    // Legacy mode: stop tracking when the matched paragraph itself closes.
+    if (stepCount == 0 && revPFound && !revDone && paragraphHtmlDepth >= 0 && htmlDepth == paragraphHtmlDepth) {
+      revPFound = false;
+      paragraphHtmlDepth = -1;
+    }
+
+    // Ancestry mode: advance text node when a direct child of the fully-matched element closes.
+    if (stepCount > 0 && matchedDepth == stepCount && revPFound && !revDone) {
+      const int elementDepth = stepEnteredAtDepth[stepCount - 1];
+      if (htmlDepth == elementDepth + 1) {
+        currentTextNode++;
+        if (currentTextNode == targetTextNode && revChar <= 0) {
+          targetVisChars = totalVisChars;
+          revDone = true;
+        }
+      }
+    }
+
+    if (stepCount > 0 && matchedDepth > 0) {
+      const int step = matchedDepth - 1;
+      if (insideStep[step] && htmlDepth == stepEnteredAtDepth[step]) {
+        insideStep[step] = false;
+        matchedDepth--;
+        // If the fully-matched element just closed without finding the target, abort.
+        if (matchedDepth < stepCount && revPFound && !revDone) {
+          revPFound = false;
+        }
+        for (int i = matchedDepth + 1; i < stepCount; i++) {
+          siblingCounters[i] = 0;
+          insideStep[i] = false;
+          stepEnteredAtDepth[i] = -1;
+        }
+      }
+    }
+    if (htmlDepth > 0) htmlDepth--;
+  }
+
+  void processByteInTag(uint8_t c) {
+    switch (tagState) {
+      case TAG_IDLE:
+        if (c == '/') {
+          tagIsClose = true;
+          tagState = TAG_IN_NAME;
+        } else if (c != '!' && c != '?') {
+          tagIsClose = false;
+          tagName[0] = static_cast<char>(c);
+          tagNameLen = 1;
+          tagState = TAG_IN_NAME;
+        }
+        break;
+      case TAG_IN_NAME:
+        if (c == '>' || c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '/') {
+          tagName[tagNameLen] = '\0';
+          if (tagNameLen > 0) {
+            if (tagIsClose)
+              onCloseTag();
+            else
+              onOpenTag();
+            // Self-closing open tag (<br/>). Don't double-fire for close tags (</br/>).
+            if (c == '/' && !tagIsClose) onCloseTag();
+          }
+          tagNameLen = 0;
+          tagState = (c == '>') ? TAG_IDLE : TAG_ATTRS;
+        } else if (tagNameLen + 1 < static_cast<int>(sizeof(tagName))) {
+          tagName[tagNameLen++] = static_cast<char>(c);
+        }
+        break;
+      case TAG_ATTRS:
+        // Track quoted attribute values so '/' inside them is not mistaken for self-closing.
+        if (!inAttrQuote) {
+          if (c == '"' || c == '\'') {
+            inAttrQuote = true;
+            attrQuoteChar = c;
+          }
+        } else if (c == attrQuoteChar) {
+          inAttrQuote = false;
+          attrQuoteChar = 0;
+        }
+        if (capturingAnchorTag) {
+          switch (idState) {
+            case ID_SCAN:
+              idState = (c == 'i' || c == 'I') ? ID_I : ID_SCAN;
+              break;
+            case ID_I:
+              idState = (c == 'd' || c == 'D') ? ID_D : ID_SCAN;
+              break;
+            case ID_D:
+              idState = (c == '=') ? ID_EQ : ID_SCAN;
+              break;
+            case ID_EQ:
+              if (c == '"')
+                idState = ID_IN_VALUE_D;
+              else if (c == '\'')
+                idState = ID_IN_VALUE_S;
+              break;
+            case ID_IN_VALUE_D:
+              if (c == '"') {
+                capturedAnchorId[capturedAnchorIdLen] = '\0';
+                capturingAnchorTag = false;
+              } else if (capturedAnchorIdLen + 1 < MAX_ANCHOR_ID)
+                capturedAnchorId[capturedAnchorIdLen++] = c;
+              break;
+            case ID_IN_VALUE_S:
+              if (c == '\'') {
+                capturedAnchorId[capturedAnchorIdLen] = '\0';
+                capturingAnchorTag = false;
+              } else if (capturedAnchorIdLen + 1 < MAX_ANCHOR_ID)
+                capturedAnchorId[capturedAnchorIdLen++] = c;
+              break;
+          }
+        }
+        // Only treat '/' as self-closing when outside a quoted attribute value.
+        if (c == '/' && !inAttrQuote) {
+          onCloseTag();
+          capturingAnchorTag = false;
+        }
+        break;
+    }
+  }
+
  public:
-  explicit ParagraphStreamer(size_t targetByte) : fwdTarget(targetByte), revParagraph(0), revChar(0) {}
-  ParagraphStreamer(int paragraph, int charOff) : fwdTarget(SIZE_MAX), revParagraph(paragraph), revChar(charOff) {}
+  explicit ParagraphStreamer(size_t targetByte) : fwdTarget(targetByte), revChar(0) {
+    memset(stepEnteredAtDepth, -1, sizeof(stepEnteredAtDepth));
+  }
+
+  ParagraphStreamer(int paragraph, int charOff, int textNodeIdx = 1)
+      : fwdTarget(SIZE_MAX), revChar(charOff), revParagraph(paragraph), targetTextNode(textNodeIdx) {
+    memset(stepEnteredAtDepth, -1, sizeof(stepEnteredAtDepth));
+  }
+
+  ParagraphStreamer(const XPathStep* xpathSteps, int xpathStepCount, int charOff, int textNodeIdx = 1)
+      : fwdTarget(SIZE_MAX),
+        revChar(charOff),
+        steps(xpathSteps),
+        stepCount(xpathStepCount),
+        targetTextNode(textNodeIdx) {
+    memset(stepEnteredAtDepth, -1, sizeof(stepEnteredAtDepth));
+  }
 
   size_t write(uint8_t c) override {
     if (!fwdCaptured && bytesWritten >= fwdTarget) {
@@ -135,7 +434,6 @@ class ParagraphStreamer final : public Print {
         globalInEntity = false;
         entityLen = 0;
       }
-
       if (globalInEntity) {
         if (c == ';') {
           finishEntity();
@@ -145,36 +443,42 @@ class ParagraphStreamer final : public Print {
           entityLen = 0;
         }
       }
-    } else if (c == '<') {
+      return 1;
+    }
+
+    if (c == '<') {
       globalInTag = true;
+      tagState = TAG_IDLE;
+      tagNameLen = 0;
+      tagIsClose = false;
+      capturingAnchorTag = false;
+      idState = ID_SCAN;
+      inAttrQuote = false;
+      attrQuoteChar = 0;
     } else if (c == '>') {
       globalInTag = false;
-    } else if (!globalInTag) {
+      inAttrQuote = false;
+      if (tagState == TAG_IN_NAME && tagNameLen > 0) {
+        tagName[tagNameLen] = '\0';
+        if (tagIsClose)
+          onCloseTag();
+        else
+          onOpenTag();
+        tagNameLen = 0;
+      }
+      tagState = TAG_IDLE;
+    } else if (globalInTag) {
+      processByteInTag(c);
+    } else {
       if (c == '&') {
         globalInEntity = true;
         entityBuffer[0] = '&';
         entityLen = 1;
       } else {
         const bool startsCodepoint = (c & 0xC0) != 0x80;
-        if (startsCodepoint) {
-          onVisibleCodepoint();
-        }
+        if (startsCodepoint) onVisibleCodepoint();
       }
     }
-
-    // Paragraph detection
-    switch (pState) {
-      case IDLE:
-        if (c == '<') pState = SAW_LT;
-        break;
-      case SAW_LT:
-        pState = (c == 'p' || c == 'P') ? SAW_LT_P : ((c == '<') ? SAW_LT : IDLE);
-        break;
-      case SAW_LT_P:
-        if (c == '>' || c == '/' || c == ' ' || c == '\t' || c == '\n' || c == '\r') onP();
-        pState = (c == '<') ? SAW_LT : IDLE;
-        break;
-    }
     return 1;
   }
 
@@ -183,10 +487,14 @@ class ParagraphStreamer final : public Print {
     return size;
   }
 
- public:
   int paragraphCount() const { return fwdCaptured ? fwdResult : pCount; }
+  int getParagraphAtMatch() const { return paragraphAtMatch; }
+  int getListItemAtMatch() const { return liCountAtMatch; }
+  const char* getCapturedAnchorId() const { return capturedAnchorIdLen > 0 ? capturedAnchorId : nullptr; }
   size_t totalBytes() const { return bytesWritten; }
   bool found() const { return revDone || revPFound; }
+  size_t getTotalVisChars() const { return totalVisChars; }
+  size_t getTargetVisChars() const { return targetVisChars; }
   float progress() const {
     return totalVisChars > 0 ? static_cast<float>(targetVisChars) / static_cast<float>(totalVisChars) : 0.0f;
   }
@@ -200,12 +508,14 @@ bool streamSpine(const std::shared_ptr<Epub>& epub, int spineIndex, ParagraphStr
 
 KOReaderPosition ProgressMapper::toKOReader(const std::shared_ptr<Epub>& epub, const CrossPointPosition& pos) {
   KOReaderPosition result;
-  float intra = (pos.totalPages > 0) ? static_cast<float>(pos.pageNumber) / static_cast<float>(pos.totalPages) : 0.0f;
+  float intra =
+      (pos.totalPages > 1) ? static_cast<float>(pos.pageNumber) / static_cast<float>(pos.totalPages - 1) : 0.0f;
   result.percentage = epub->calculateProgress(pos.spineIndex, intra);
-  if (pos.hasParagraphIndex && pos.paragraphIndex > 0) {
+  // Progress-based XPath correctly handles both <p> and <li> positions.
+  result.xpath = ChapterXPathResolver::findXPathForProgress(epub, pos.spineIndex, intra);
+  // Fall back to paragraph-index lookup when progress-based resolution fails.
+  if (result.xpath.empty() && pos.hasParagraphIndex && pos.paragraphIndex > 0) {
     result.xpath = ChapterXPathResolver::findXPathForParagraph(epub, pos.spineIndex, pos.paragraphIndex);
-  } else {
-    result.xpath = ChapterXPathResolver::findXPathForProgress(epub, pos.spineIndex, intra);
   }
   if (result.xpath.empty()) {
     result.xpath = generateXPath(epub, pos.spineIndex, intra);
@@ -228,11 +538,13 @@ CrossPointPosition ProgressMapper::toCrossPoint(const std::shared_ptr<Epub>& epu
   const int docFrag = parseIndex(koPos.xpath, "/body/DocFragment[");
   const int xpathP = parseIndex(koPos.xpath, "/p[", true);
   const int xpathChar = parseCharOffset(koPos.xpath);
+  const int xpathTextNode = parseTextNodeIndex(koPos.xpath);
   const int xpathSpine = (docFrag >= 1) ? (docFrag - 1) : -1;
-  if (xpathP > 0) {
-    result.paragraphIndex = static_cast<uint16_t>(xpathP);
-    result.hasParagraphIndex = true;
-  }
+
+  XPathStep xpathSteps[MAX_XPATH_DEPTH];
+  const int xpathStepCount = parseXPathSteps(koPos.xpath, xpathSteps);
+  // Use ancestry mode whenever the XPath has a structured path (always more accurate than global counting).
+  const bool useAncestry = xpathStepCount > 0;
 
   if (xpathSpine >= 0 && xpathSpine < spineCount) {
     result.spineIndex = xpathSpine;
@@ -261,11 +573,37 @@ CrossPointPosition ProgressMapper::toCrossPoint(const std::shared_ptr<Epub>& epu
   if (spineSize == 0 || result.totalPages == 0) return result;
 
   float intra = 0.0f;
-  if (xpathP > 0) {
-    ParagraphStreamer s(xpathP, xpathChar);
+  if (useAncestry) {
+    ParagraphStreamer s(xpathSteps, xpathStepCount, xpathChar, xpathTextNode);
+    if (streamSpine(epub, result.spineIndex, s) && s.found()) {
+      intra = s.progress();
+      const int pAtMatch = s.getParagraphAtMatch();
+      if (pAtMatch > 0) {
+        result.paragraphIndex = static_cast<uint16_t>(pAtMatch);
+        result.hasParagraphIndex = true;
+      }
+      if (xpathStepCount > 0 && strcasecmp(xpathSteps[xpathStepCount - 1].tag, "li") == 0) {
+        const int liAtMatch = s.getListItemAtMatch();
+        if (liAtMatch > 0) {
+          result.liIndex = static_cast<uint16_t>(liAtMatch);
+          result.hasLiIndex = true;
+        }
+      }
+      const char* anchorId = s.getCapturedAnchorId();
+      if (anchorId) {
+        strncpy(result.xpathAnchorId, anchorId, sizeof(result.xpathAnchorId) - 1);
+      }
+      LOG_DBG("PM", "XPath ancestry(%s[%d])/text()[%d]+%d -> %.1f%% (target=%zu total=%zu p~%d li~%d anchor=%s)",
+              xpathSteps[xpathStepCount - 1].tag, xpathSteps[xpathStepCount - 1].siblingIndex, xpathTextNode, xpathChar,
+              intra * 100, s.getTargetVisChars(), s.getTotalVisChars(), pAtMatch,
+              result.hasLiIndex ? static_cast<int>(result.liIndex) : 0, anchorId ? anchorId : "none");
+    }
+  } else if (xpathP > 0) {
+    ParagraphStreamer s(xpathP, xpathChar, xpathTextNode);
     if (streamSpine(epub, result.spineIndex, s) && s.found()) {
       intra = s.progress();
-      LOG_DBG("PM", "XPath p[%d]+%d -> %.1f%%", xpathP, xpathChar, intra * 100);
+      LOG_DBG("PM", "XPath p[%d]/text()[%d]+%d -> %.1f%% (target=%zu total=%zu)", xpathP, xpathTextNode, xpathChar,
+              intra * 100, s.getTargetVisChars(), s.getTotalVisChars());
     }
   }
   if (intra <= 0.0f) {
@@ -273,7 +611,8 @@ CrossPointPosition ProgressMapper::toCrossPoint(const std::shared_ptr<Epub>& epu
     intra = std::max(0.0f, std::min(1.0f, static_cast<float>(bytesIn) / static_cast<float>(spineSize)));
   }
 
-  result.pageNumber = std::max(0, std::min(static_cast<int>(intra * result.totalPages), result.totalPages - 1));
+  result.pageNumber = std::max(
+      0, std::min(static_cast<int>(intra * static_cast<float>(result.totalPages - 1) + 0.5f), result.totalPages - 1));
   LOG_DBG("PM", "<- KO: %.2f%% %s -> spine=%d page=%d/%d", koPos.percentage * 100, koPos.xpath.c_str(),
           result.spineIndex, result.pageNumber, result.totalPages);
   return result;
diff --git a/lib/KOReaderSync/ProgressMapper.h b/lib/KOReaderSync/ProgressMapper.h
index d262622e..bd6c73c1 100644
--- a/lib/KOReaderSync/ProgressMapper.h
+++ b/lib/KOReaderSync/ProgressMapper.h
@@ -13,6 +13,9 @@ struct CrossPointPosition {
   int totalPages;                  // Total pages in the current spine item
   uint16_t paragraphIndex = 0;     // 1-based synthetic paragraph index from XPath p[N]
   bool hasParagraphIndex = false;  // True when paragraphIndex was resolved from XPath
+  uint16_t liIndex = 0;            // Running <li> count at the matched XPath element
+  bool hasLiIndex = false;         // True when target element is <li> and liIndex was resolved
+  char xpathAnchorId[64] = {};     // First <a id> captured inside the matched XPath element
 };
 
 /**
diff --git a/lib/Memory/Memory.h b/lib/Memory/Memory.h
new file mode 100644
index 00000000..0093a852
--- /dev/null
+++ b/lib/Memory/Memory.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <cstddef>
+#include <memory>
+#include <new>
+#include <type_traits>
+#include <utility>
+
+// Nothrow versions of std::make_unique. Return nullptr on allocation failure
+// instead of calling abort() (the default when exceptions are disabled on ESP32).
+//
+// Single object:
+//   auto obj = makeUniqueNoThrow<PNG>();
+//   if (!obj) { LOG_ERR("TAG", "OOM"); return false; }
+//
+// Array:
+//   auto buf = makeUniqueNoThrow<uint8_t[]>(size);
+//   if (!buf) { LOG_ERR("TAG", "OOM"); return false; }
+//   buf[0] = 0xFF;
+//   someApi(buf.get(), size);
+//
+
+template <typename T, typename... Args>
+  requires(!std::is_array_v<T>)
+std::unique_ptr<T> makeUniqueNoThrow(Args&&... args) {
+  return std::unique_ptr<T>(new (std::nothrow) T(std::forward<Args>(args)...));
+}
+
+template <typename T>
+  requires std::is_unbounded_array_v<T>
+std::unique_ptr<T> makeUniqueNoThrow(size_t count) {
+  using Elem = std::remove_extent_t<T>;
+  return std::unique_ptr<T>(new (std::nothrow) Elem[count]());
+}
+
+// Helper struct to call a cleanup function on exit from any scope.
+// Use with a lambda to avoid unnecessary allocations from std::function/std::bind:
+// Example:
+//   auto jpeg = makeUniqueNoThrow<JPEGDEC>();
+//   ScopedCleanup cleanup{[&jpeg]{ jpeg->close(); }};
+//
+template <typename F>
+struct [[nodiscard]] ScopedCleanup final {
+  const F fn;
+  explicit ScopedCleanup(F f) : fn{std::move(f)} {}
+  ScopedCleanup(const ScopedCleanup&) = delete;
+  ScopedCleanup& operator=(const ScopedCleanup&) = delete;
+  ScopedCleanup(ScopedCleanup&&) = delete;
+  ScopedCleanup& operator=(ScopedCleanup&&) = delete;
+  ~ScopedCleanup() { fn(); }
+};
+
+template <typename F>
+ScopedCleanup(F) -> ScopedCleanup<F>;
diff --git a/lib/MemoryBudget/MemoryBudget.h b/lib/MemoryBudget/MemoryBudget.h
new file mode 100644
index 00000000..7bcfca0d
--- /dev/null
+++ b/lib/MemoryBudget/MemoryBudget.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <Arduino.h>
+#include <Logging.h>
+
+#include <cstdint>
+#include <cstring>
+
+namespace MemoryBudget {
+
+struct HeapSnapshot {
+  uint32_t freeHeap;
+  uint32_t maxAllocHeap;
+};
+
+struct HeapRequirement {
+  uint32_t minFree;
+  uint32_t minMaxAlloc;
+};
+
+// FlexBLE: upstream's defaults of 72 KB free / 48 KB max alloc are tuned for
+// the BLE-off case. With NimBLE eating ~58 KB of heap once a remote is
+// paired, those floors are unreachable, so even text-heavy chapters tripped
+// the "Cannot Load chapter" abort whenever they contained any image. The
+// relaxed floors mirror our parser layout threshold (32/16 KB) — image
+// decode falls back gracefully to "page rendered without images" if a
+// specific allocation does fail mid-decode, which is the same UX as
+// upstream's pre-check skip.
+constexpr uint32_t EPUB_INLINE_IMAGE_MIN_FREE = 56U * 1024U;
+constexpr uint32_t EPUB_INLINE_IMAGE_MIN_MAX_ALLOC = 32U * 1024U;
+constexpr uint32_t EPUB_INLINE_JPEG_MIN_MAX_ALLOC = 28U * 1024U;
+constexpr uint32_t EPUB_INLINE_IMAGE_SD_FONT_RELEASE_MIN_FREE = 120U * 1024U;
+constexpr uint32_t EPUB_INLINE_IMAGE_SD_FONT_RELEASE_MIN_MAX_ALLOC = 80U * 1024U;
+constexpr uint32_t OPTIONAL_EPUB_REBUILD_MIN_FREE = 96U * 1024U;
+constexpr uint32_t OPTIONAL_EPUB_REBUILD_MIN_MAX_ALLOC = 48U * 1024U;
+constexpr uint32_t IMAGE_DECODER_HEADROOM = 16U * 1024U;
+
+inline HeapSnapshot snapshot() { return {ESP.getFreeHeap(), ESP.getMaxAllocHeap()}; }
+
+inline bool hasHeap(const HeapSnapshot heap, const uint32_t minFree, const uint32_t minMaxAlloc) {
+  return heap.freeHeap >= minFree && heap.maxAllocHeap >= minMaxAlloc;
+}
+
+inline char asciiLower(const char c) { return (c >= 'A' && c <= 'Z') ? static_cast<char>(c - 'A' + 'a') : c; }
+
+inline bool endsWithIgnoreCase(const char* value, const char* suffix) {
+  if (!value || !suffix) return false;
+  const size_t valueLen = strlen(value);
+  const size_t suffixLen = strlen(suffix);
+  if (suffixLen > valueLen) return false;
+
+  const char* valueTail = value + valueLen - suffixLen;
+  for (size_t i = 0; i < suffixLen; ++i) {
+    if (asciiLower(valueTail[i]) != asciiLower(suffix[i])) return false;
+  }
+  return true;
+}
+
+inline bool isJpegSource(const char* source) {
+  return endsWithIgnoreCase(source, ".jpg") || endsWithIgnoreCase(source, ".jpeg");
+}
+
+inline HeapRequirement epubInlineImageRequirementForSource(const char* source) {
+  return {EPUB_INLINE_IMAGE_MIN_FREE,
+          isJpegSource(source) ? EPUB_INLINE_JPEG_MIN_MAX_ALLOC : EPUB_INLINE_IMAGE_MIN_MAX_ALLOC};
+}
+
+inline bool shouldReleaseSdFontCachesForEpubInlineImage(const HeapSnapshot heap) {
+  return !hasHeap(heap, EPUB_INLINE_IMAGE_SD_FONT_RELEASE_MIN_FREE, EPUB_INLINE_IMAGE_SD_FONT_RELEASE_MIN_MAX_ALLOC);
+}
+
+inline bool hasHeapForEpubInlineImage(const char* tag, const char* source) {
+  const auto heap = snapshot();
+  const auto requirement = epubInlineImageRequirementForSource(source);
+  if (hasHeap(heap, requirement.minFree, requirement.minMaxAlloc)) {
+    return true;
+  }
+
+  LOG_ERR(tag, "Low heap for inline image (%u free, %u max alloc, need %u/%u); suppressing %s", heap.freeHeap,
+          heap.maxAllocHeap, requirement.minFree, requirement.minMaxAlloc, source ? source : "");
+  return false;
+}
+
+inline bool hasHeapForOptionalEpubRebuild(const char* tag, const char* action, const int spineIndex) {
+  const auto heap = snapshot();
+  if (hasHeap(heap, OPTIONAL_EPUB_REBUILD_MIN_FREE, OPTIONAL_EPUB_REBUILD_MIN_MAX_ALLOC)) {
+    return true;
+  }
+
+  LOG_DBG(tag, "Skipping %s for spine %d: low heap (free=%u, maxAlloc=%u, need free>=%u maxAlloc>=%u)", action,
+          spineIndex, heap.freeHeap, heap.maxAllocHeap, OPTIONAL_EPUB_REBUILD_MIN_FREE,
+          OPTIONAL_EPUB_REBUILD_MIN_MAX_ALLOC);
+  return false;
+}
+
+inline bool hasHeapForImageDecoder(const char* tag, const char* decoderName, const uint32_t decoderApproxBytes) {
+  const auto heap = snapshot();
+  const uint32_t minFree = decoderApproxBytes + IMAGE_DECODER_HEADROOM;
+  if (hasHeap(heap, minFree, decoderApproxBytes)) {
+    return true;
+  }
+
+  LOG_ERR(tag, "Not enough heap for %s decoder (%u free, %u max alloc, need %u/%u)", decoderName, heap.freeHeap,
+          heap.maxAllocHeap, minFree, decoderApproxBytes);
+  return false;
+}
+
+}  // namespace MemoryBudget
diff --git a/lib/Serialization/Serialization.h b/lib/Serialization/Serialization.h
index 1308822f..3659f9ae 100644
--- a/lib/Serialization/Serialization.h
+++ b/lib/Serialization/Serialization.h
@@ -2,6 +2,7 @@
 #include <HalStorage.h>
 
 #include <iostream>
+#include <limits>
 
 namespace serialization {
 template <typename T>
@@ -14,6 +15,11 @@ static void writePod(FsFile& file, const T& value) {
   file.write(reinterpret_cast<const uint8_t*>(&value), sizeof(T));
 }
 
+template <typename T>
+static bool tryWritePod(FsFile& file, const T& value) {
+  return file.write(reinterpret_cast<const uint8_t*>(&value), sizeof(T)) == sizeof(T);
+}
+
 template <typename T>
 static void readPod(std::istream& is, T& value) {
   is.read(reinterpret_cast<char*>(&value), sizeof(T));
@@ -24,6 +30,11 @@ static void readPod(FsFile& file, T& value) {
   file.read(reinterpret_cast<uint8_t*>(&value), sizeof(T));
 }
 
+template <typename T>
+static bool tryReadPod(FsFile& file, T& value) {
+  return file.read(reinterpret_cast<uint8_t*>(&value), sizeof(T)) == sizeof(T);
+}
+
 static void writeString(std::ostream& os, const std::string& s) {
   const uint32_t len = s.size();
   writePod(os, len);
@@ -36,6 +47,11 @@ static void writeString(FsFile& file, const std::string& s) {
   file.write(reinterpret_cast<const uint8_t*>(s.data()), len);
 }
 
+static bool tryWriteString(FsFile& file, const std::string& s) {
+  const uint32_t len = s.size();
+  return tryWritePod(file, len) && (len == 0 || file.write(reinterpret_cast<const uint8_t*>(s.data()), len) == len);
+}
+
 static void readString(std::istream& is, std::string& s) {
   uint32_t len;
   readPod(is, len);
@@ -49,4 +65,17 @@ static void readString(FsFile& file, std::string& s) {
   s.resize(len);
   file.read(&s[0], len);
 }
+
+static bool tryReadString(FsFile& file, std::string& s) {
+  uint32_t len = 0;
+  if (!tryReadPod(file, len)) {
+    return false;
+  }
+  if (static_cast<size_t>(len) > s.max_size() || len > static_cast<uint32_t>(std::numeric_limits<int>::max())) {
+    return false;
+  }
+  s.resize(len);
+  const int readLen = static_cast<int>(len);
+  return len == 0 || file.read(&s[0], readLen) == readLen;
+}
 }  // namespace serialization
diff --git a/lib/Utf8/Utf8.h b/lib/Utf8/Utf8.h
index a3310107..4ac83a6b 100644
--- a/lib/Utf8/Utf8.h
+++ b/lib/Utf8/Utf8.h
@@ -15,6 +15,24 @@ void utf8TruncateChars(std::string& str, size_t numChars);
 // incomplete trailing bytes are excluded.
 int utf8SafeTruncateBuffer(const char* buf, int len);
 
+// Returns true for CJK characters that allow line breaks on either side without hyphenation.
+// Covers CJK Unified Ideographs, Hiragana, Katakana, Hangul Syllables, CJK punctuation,
+// and fullwidth forms — the ranges where word boundaries are implicit per character.
+inline bool utf8IsCjkBreakable(const uint32_t cp) {
+  return (cp >= 0x3000 && cp <= 0x303F)        // CJK Symbols and Punctuation
+         || (cp >= 0x3040 && cp <= 0x309F)     // Hiragana
+         || (cp >= 0x30A0 && cp <= 0x30FF)     // Katakana
+         || (cp >= 0x3400 && cp <= 0x4DBF)     // CJK Extension A
+         || (cp >= 0x4E00 && cp <= 0x9FFF)     // CJK Unified Ideographs
+         || (cp >= 0xAC00 && cp <= 0xD7AF)     // Hangul Syllables
+         || (cp >= 0xF900 && cp <= 0xFAFF)     // CJK Compatibility Ideographs
+         || (cp >= 0xFE30 && cp <= 0xFE4F)     // CJK Compatibility Forms
+         || (cp >= 0xFF01 && cp <= 0xFF60)     // Fullwidth Latin / Punctuation
+         || (cp >= 0xFF65 && cp <= 0xFFEF)     // Halfwidth Katakana / Hangul
+         || (cp >= 0x20000 && cp <= 0x2A6DF)   // CJK Extension B
+         || (cp >= 0x2A700 && cp <= 0x2B73F);  // CJK Extension C
+}
+
 // Returns true for Unicode combining diacritical marks that should not advance the cursor.
 inline bool utf8IsCombiningMark(const uint32_t cp) {
   return (cp >= 0x0300 && cp <= 0x036F)      // Combining Diacritical Marks
diff --git a/lib/Xtc/Xtc.cpp b/lib/Xtc/Xtc.cpp
index 5f0388d2..f04b12b2 100644
--- a/lib/Xtc/Xtc.cpp
+++ b/lib/Xtc/Xtc.cpp
@@ -11,6 +11,23 @@
 #include <HalStorage.h>
 #include <Logging.h>
 
+#include <algorithm>
+
+namespace {
+bool thumbnailHasDimensions(const std::string& path, const uint16_t width, const uint16_t height) {
+  FsFile file;
+  if (!Storage.openFileForRead("XTC", path, file)) {
+    return false;
+  }
+
+  Bitmap bitmap(file);
+  const bool matches =
+      bitmap.parseHeaders() == BmpReaderError::Ok && bitmap.getWidth() == width && bitmap.getHeight() == height;
+  file.close();
+  return matches;
+}
+}  // namespace
+
 bool Xtc::load() {
   LOG_DBG("XTC", "Loading XTC: %s", filepath.c_str());
 
@@ -261,74 +278,80 @@ bool Xtc::generateCoverBmp() const {
 }
 
 std::string Xtc::getThumbBmpPath() const { return cachePath + "/thumb_[HEIGHT].bmp"; }
-std::string Xtc::getThumbBmpPath(int height) const { return cachePath + "/thumb_" + std::to_string(height) + ".bmp"; }
+std::string Xtc::getThumbBmpPath(uint16_t height) const {
+  const uint16_t width = static_cast<uint16_t>(height * 0.6);
+  const std::string newPath = getThumbBmpPath(width, height);
+  if (Storage.exists(newPath.c_str())) {
+    return newPath;
+  }
 
-bool Xtc::generateThumbBmp(int height) const {
-  // Already generated
-  if (Storage.exists(getThumbBmpPath(height).c_str())) {
-    return true;
+  const std::string legacyPath = cachePath + "/thumb_" + std::to_string(height) + ".bmp";
+  if (Storage.exists(legacyPath.c_str())) {
+    return legacyPath;
+  }
+
+  return newPath;
+}
+std::string Xtc::getThumbBmpPath(uint16_t width, uint16_t height) const {
+  return cachePath + "/thumb_" + std::to_string(width) + "x" + std::to_string(height) + ".bmp";
+}
+
+bool Xtc::generateThumbBmp() const {
+  const uint16_t height = getPageHeight();
+  return height > 0 && generateThumbBmp(height);
+}
+
+bool Xtc::generateThumbBmp(uint16_t height) const {
+  return generateThumbBmp(static_cast<uint16_t>(height * 0.6), height);
+}
+
+bool Xtc::generateThumbBmp(uint16_t width, uint16_t height) const {
+  if (width == 0 || height == 0) {
+    LOG_ERR("XTC", "Cannot generate thumb BMP with invalid dimensions: %ux%u", width, height);
+    return false;
+  }
+  const std::string thumbPath = getThumbBmpPath(width, height);
+  const bool thumbExists = Storage.exists(thumbPath.c_str());
+  if (thumbExists) {
+    if (thumbnailHasDimensions(thumbPath, width, height)) {
+      return true;
+    }
   }
 
   if (!loaded || !parser) {
     LOG_ERR("XTC", "Cannot generate thumb BMP, file not loaded");
     return false;
   }
-
   if (parser->getPageCount() == 0) {
     LOG_ERR("XTC", "No pages in XTC file");
     return false;
   }
 
-  // Setup cache directory
   setupCacheDir();
 
-  // Get first page info for cover
   xtc::PageInfo pageInfo;
   if (!parser->getPageInfo(0, pageInfo)) {
     LOG_DBG("XTC", "Failed to get first page info");
     return false;
   }
-
-  // Get bit depth
-  const uint8_t bitDepth = parser->getBitDepth();
-
-  // Calculate target dimensions for thumbnail (fit within 240x400 Continue Reading card)
-  int THUMB_TARGET_WIDTH = height * 0.6;
-  int THUMB_TARGET_HEIGHT = height;
-
-  // Calculate scale factor
-  float scaleX = static_cast<float>(THUMB_TARGET_WIDTH) / pageInfo.width;
-  float scaleY = static_cast<float>(THUMB_TARGET_HEIGHT) / pageInfo.height;
-  float scale = (scaleX > scaleY) ? scaleX : scaleY;  // for cropping
-
-  // Only scale down, never up
-  if (scale >= 1.0f) {
-    // Page is already small enough, just use cover.bmp
-    // Copy cover.bmp to thumb.bmp
-    if (generateCoverBmp()) {
-      FsFile src, dst;
-      if (Storage.openFileForRead("XTC", getCoverBmpPath(), src)) {
-        if (Storage.openFileForWrite("XTC", getThumbBmpPath(height), dst)) {
-          uint8_t buffer[512];
-          while (src.available()) {
-            size_t bytesRead = src.read(buffer, sizeof(buffer));
-            dst.write(buffer, bytesRead);
-          }
-        }
-      }
-      LOG_DBG("XTC", "Copied cover to thumb (no scaling needed)");
-      return Storage.exists(getThumbBmpPath(height).c_str());
-    }
+  if (pageInfo.width == 0 || pageInfo.height == 0) {
+    LOG_ERR("XTC", "Cannot generate thumb BMP with invalid page dimensions: %ux%u", pageInfo.width, pageInfo.height);
     return false;
   }
+  if (thumbExists) {
+    Storage.remove(thumbPath.c_str());
+  }
 
-  uint16_t thumbWidth = static_cast<uint16_t>(pageInfo.width * scale);
-  uint16_t thumbHeight = static_cast<uint16_t>(pageInfo.height * scale);
+  const uint8_t bitDepth = parser->getBitDepth();
+  const uint16_t THUMB_TARGET_WIDTH = width;
+  const uint16_t THUMB_TARGET_HEIGHT = height;
 
-  LOG_DBG("XTC", "Generating thumb BMP: %dx%d -> %dx%d (scale: %.3f)", pageInfo.width, pageInfo.height, thumbWidth,
-          thumbHeight, scale);
+  const float scaleX = static_cast<float>(THUMB_TARGET_WIDTH) / pageInfo.width;
+  const float scaleY = static_cast<float>(THUMB_TARGET_HEIGHT) / pageInfo.height;
+  const float scale = std::max(scaleX, scaleY);
+  const uint16_t thumbWidth = THUMB_TARGET_WIDTH;
+  const uint16_t thumbHeight = THUMB_TARGET_HEIGHT;
 
-  // Allocate buffer for page data
   size_t bitmapSize;
   if (bitDepth == 2) {
     bitmapSize = ((static_cast<size_t>(pageInfo.width) * pageInfo.height + 7) / 8) * 2;
@@ -341,7 +364,6 @@ bool Xtc::generateThumbBmp(int height) const {
     return false;
   }
 
-  // Load first page (cover)
   size_t bytesRead = const_cast<xtc::XtcParser*>(parser.get())->loadPage(0, pageBuffer, bitmapSize);
   if (bytesRead == 0) {
     LOG_ERR("XTC", "Failed to load cover page for thumb");
@@ -349,32 +371,34 @@ bool Xtc::generateThumbBmp(int height) const {
     return false;
   }
 
-  // Create thumbnail BMP file - use 1-bit format for fast home screen rendering (no gray passes)
   FsFile thumbBmp;
-  if (!Storage.openFileForWrite("XTC", getThumbBmpPath(height), thumbBmp)) {
-    LOG_DBG("XTC", "Failed to create thumb BMP file");
+  if (!Storage.openFileForWrite("XTC", thumbPath, thumbBmp)) {
     free(pageBuffer);
     return false;
   }
 
-  // Write 1-bit BMP header (top-down row order)
+  const uint32_t rowSize = (thumbWidth + 31) / 32 * 4;
   BmpHeader bmpHeader;
   createBmpHeader(&bmpHeader, thumbWidth, thumbHeight, BmpRowOrder::TopDown);
-  thumbBmp.write(reinterpret_cast<const uint8_t*>(&bmpHeader), sizeof(bmpHeader));
+  thumbBmp.write(reinterpret_cast<const uint8_t*>(&bmpHeader), sizeof(BmpHeader));
 
-  const uint32_t rowSize = (thumbWidth + 31) / 32 * 4;
-
-  // Allocate row buffer for 1-bit output
   uint8_t* rowBuffer = static_cast<uint8_t*>(malloc(rowSize));
   if (!rowBuffer) {
     free(pageBuffer);
+    thumbBmp.close();
+    Storage.remove(thumbPath.c_str());
     return false;
   }
 
-  // Fixed-point scale factor (16.16)
-  uint32_t scaleInv_fp = static_cast<uint32_t>(65536.0f / scale);
-
-  // Pre-calculate plane info for 2-bit mode
+  const uint32_t scaleInv_fp = static_cast<uint32_t>(65536.0f / scale);
+  const uint64_t srcWidth_fp = static_cast<uint64_t>(pageInfo.width) << 16;
+  const uint64_t srcHeight_fp = static_cast<uint64_t>(pageInfo.height) << 16;
+  const uint64_t visibleWidth_fp = static_cast<uint64_t>(thumbWidth) * scaleInv_fp;
+  const uint64_t visibleHeight_fp = static_cast<uint64_t>(thumbHeight) * scaleInv_fp;
+  const uint32_t cropX_fp =
+      static_cast<uint32_t>(srcWidth_fp > visibleWidth_fp ? (srcWidth_fp - visibleWidth_fp) / 2 : 0);
+  const uint32_t cropY_fp =
+      static_cast<uint32_t>(srcHeight_fp > visibleHeight_fp ? (srcHeight_fp - visibleHeight_fp) / 2 : 0);
   const size_t planeSize = (bitDepth == 2) ? ((static_cast<size_t>(pageInfo.width) * pageInfo.height + 7) / 8) : 0;
   const uint8_t* plane1 = (bitDepth == 2) ? pageBuffer : nullptr;
   const uint8_t* plane2 = (bitDepth == 2) ? pageBuffer + planeSize : nullptr;
@@ -382,101 +406,71 @@ bool Xtc::generateThumbBmp(int height) const {
   const size_t srcRowBytes = (bitDepth == 1) ? ((pageInfo.width + 7) / 8) : 0;
 
   for (uint16_t dstY = 0; dstY < thumbHeight; dstY++) {
-    memset(rowBuffer, 0xFF, rowSize);  // Start with all white (bit 1)
-
-    // Calculate source Y range with bounds checking
-    uint32_t srcYStart = (static_cast<uint32_t>(dstY) * scaleInv_fp) >> 16;
-    uint32_t srcYEnd = (static_cast<uint32_t>(dstY + 1) * scaleInv_fp) >> 16;
+    memset(rowBuffer, 0xFF, rowSize);
+    uint32_t srcYStart = (cropY_fp + static_cast<uint32_t>(dstY) * scaleInv_fp) >> 16;
+    uint32_t srcYEnd = (cropY_fp + static_cast<uint32_t>(dstY + 1) * scaleInv_fp) >> 16;
     if (srcYStart >= pageInfo.height) srcYStart = pageInfo.height - 1;
     if (srcYEnd > pageInfo.height) srcYEnd = pageInfo.height;
     if (srcYEnd <= srcYStart) srcYEnd = srcYStart + 1;
     if (srcYEnd > pageInfo.height) srcYEnd = pageInfo.height;
 
     for (uint16_t dstX = 0; dstX < thumbWidth; dstX++) {
-      // Calculate source X range with bounds checking
-      uint32_t srcXStart = (static_cast<uint32_t>(dstX) * scaleInv_fp) >> 16;
-      uint32_t srcXEnd = (static_cast<uint32_t>(dstX + 1) * scaleInv_fp) >> 16;
+      uint32_t srcXStart = (cropX_fp + static_cast<uint32_t>(dstX) * scaleInv_fp) >> 16;
+      uint32_t srcXEnd = (cropX_fp + static_cast<uint32_t>(dstX + 1) * scaleInv_fp) >> 16;
       if (srcXStart >= pageInfo.width) srcXStart = pageInfo.width - 1;
       if (srcXEnd > pageInfo.width) srcXEnd = pageInfo.width;
       if (srcXEnd <= srcXStart) srcXEnd = srcXStart + 1;
       if (srcXEnd > pageInfo.width) srcXEnd = pageInfo.width;
 
-      // Area averaging: sum grayscale values (0-255 range)
-      uint32_t graySum = 0;
-      uint32_t totalCount = 0;
-
+      uint32_t graySum = 0, totalCount = 0;
       for (uint32_t srcY = srcYStart; srcY < srcYEnd && srcY < pageInfo.height; srcY++) {
         for (uint32_t srcX = srcXStart; srcX < srcXEnd && srcX < pageInfo.width; srcX++) {
-          uint8_t grayValue = 255;  // Default: white
-
+          uint8_t grayValue = 255;
           if (bitDepth == 2) {
-            // XTH 2-bit mode: pixel value 0-3
-            // Bounds check for column index
             if (srcX < pageInfo.width) {
               const size_t colIndex = pageInfo.width - 1 - srcX;
               const size_t byteInCol = srcY / 8;
               const size_t bitInByte = 7 - (srcY % 8);
               const size_t byteOffset = colIndex * colBytes + byteInCol;
-              // Bounds check for buffer access
               if (byteOffset < planeSize) {
                 const uint8_t bit1 = (plane1[byteOffset] >> bitInByte) & 1;
                 const uint8_t bit2 = (plane2[byteOffset] >> bitInByte) & 1;
-                const uint8_t pixelValue = (bit1 << 1) | bit2;
-                // Convert 2-bit (0-3) to grayscale: 0=black, 3=white
-                // pixelValue: 0=white, 1=light gray, 2=dark gray, 3=black (XTC polarity)
-                grayValue = (3 - pixelValue) * 85;  // 0->255, 1->170, 2->85, 3->0
+                grayValue = (3 - ((bit1 << 1) | bit2)) * 85;
               }
             }
           } else {
-            // 1-bit mode
             const size_t byteIdx = srcY * srcRowBytes + srcX / 8;
             const size_t bitIdx = 7 - (srcX % 8);
-            // Bounds check for buffer access
             if (byteIdx < bitmapSize) {
-              const uint8_t pixelBit = (pageBuffer[byteIdx] >> bitIdx) & 1;
-              // XTC 1-bit polarity: 0=black, 1=white (same as BMP palette)
-              grayValue = pixelBit ? 255 : 0;
+              grayValue = ((pageBuffer[byteIdx] >> bitIdx) & 1) ? 255 : 0;
             }
           }
-
           graySum += grayValue;
           totalCount++;
         }
       }
 
-      // Calculate average grayscale and quantize to 1-bit with noise dithering
       uint8_t avgGray = (totalCount > 0) ? static_cast<uint8_t>(graySum / totalCount) : 255;
-
-      // Hash-based noise dithering for 1-bit output
       uint32_t hash = static_cast<uint32_t>(dstX) * 374761393u + static_cast<uint32_t>(dstY) * 668265263u;
       hash = (hash ^ (hash >> 13)) * 1274126177u;
-      const int threshold = static_cast<int>(hash >> 24);           // 0-255
-      const int adjustedThreshold = 128 + ((threshold - 128) / 2);  // Range: 64-192
-
-      // Quantize to 1-bit: 0=black, 1=white
+      const int threshold = static_cast<int>(hash >> 24);
+      const int adjustedThreshold = 128 + ((threshold - 128) / 2);
       uint8_t oneBit = (avgGray >= adjustedThreshold) ? 1 : 0;
-
-      // Pack 1-bit value into row buffer (MSB first, 8 pixels per byte)
       const size_t byteIndex = dstX / 8;
       const size_t bitOffset = 7 - (dstX % 8);
-      // Bounds check for row buffer access
       if (byteIndex < rowSize) {
-        if (oneBit) {
-          rowBuffer[byteIndex] |= (1 << bitOffset);  // Set bit for white
-        } else {
-          rowBuffer[byteIndex] &= ~(1 << bitOffset);  // Clear bit for black
+        if (!oneBit) {
+          rowBuffer[byteIndex] &= ~(1 << bitOffset);
         }
       }
     }
-
-    // Write row (already padded to 4-byte boundary by rowSize)
     thumbBmp.write(rowBuffer, rowSize);
   }
 
   free(rowBuffer);
+  thumbBmp.close();
   free(pageBuffer);
-
-  LOG_DBG("XTC", "Generated thumb BMP (%dx%d): %s", thumbWidth, thumbHeight, getThumbBmpPath(height).c_str());
+  LOG_DBG("XTC", "Generated thumb BMP (%dx%d): %s", thumbWidth, thumbHeight, getThumbBmpPath(width, height).c_str());
   return true;
 }
 
diff --git a/lib/Xtc/Xtc.h b/lib/Xtc/Xtc.h
index 3dbd160b..c43c8c94 100644
--- a/lib/Xtc/Xtc.h
+++ b/lib/Xtc/Xtc.h
@@ -64,9 +64,43 @@ class Xtc {
   std::string getCoverBmpPath() const;
   bool generateCoverBmp() const;
   // Thumbnail support (for Continue Reading card)
+  /** Returns the default thumbnail cache path template with a height placeholder. */
   std::string getThumbBmpPath() const;
-  std::string getThumbBmpPath(int height) const;
-  bool generateThumbBmp(int height) const;
+  /**
+   * Returns a thumbnail cache path for a height-keyed thumbnail.
+   * @param height Target thumbnail height in pixels; width uses the same 3:5 cache-key ratio as
+   * generateThumbBmp(height).
+   * @return The generated width-height cache path, or an existing legacy height-only path.
+   * @note Prefer getThumbBmpPath(width, height) when the caller needs exact cache-key control.
+   */
+  std::string getThumbBmpPath(uint16_t height) const;
+  /**
+   * Returns a thumbnail cache path for a requested bounding box in pixels.
+   * @param width Target bounding width in pixels.
+   * @param height Target bounding height in pixels.
+   * @note Preferred overload for exact cache-key control. Existing files are reused.
+   */
+  std::string getThumbBmpPath(uint16_t width, uint16_t height) const;
+  /**
+   * Generates the default thumbnail in cache.
+   * @return true when the cached thumbnail exists or was written successfully; false on load/write/decode failure.
+   */
+  bool generateThumbBmp() const;
+  /**
+   * Generates a thumbnail in cache, preserving the original page aspect ratio.
+   * @param height Target thumbnail height in pixels.
+   * @return true when the cached thumbnail exists or was written successfully; false on load/write/decode failure.
+   * @note Prefer generateThumbBmp(width, height) when the caller needs exact cache-key control.
+   */
+  bool generateThumbBmp(uint16_t height) const;
+  /**
+   * Generates a thumbnail in cache that fills the requested cover slot, cropping from center when aspect ratios differ.
+   * @param width Target output width in pixels.
+   * @param height Target output height in pixels.
+   * @return true when the cached thumbnail exists or was written successfully; false on load/write/decode failure.
+   * @note Preferred overload for exact cache-key control. Existing files are reused when dimensions match.
+   */
+  bool generateThumbBmp(uint16_t width, uint16_t height) const;
 
   // Page access
   uint32_t getPageCount() const;
diff --git a/lib/hal/HalDisplay.cpp b/lib/hal/HalDisplay.cpp
index 665df535..48592b60 100644
--- a/lib/hal/HalDisplay.cpp
+++ b/lib/hal/HalDisplay.cpp
@@ -1,6 +1,8 @@
 #include <HalDisplay.h>
 #include <HalGPIO.h>
 
+#include "HalSpiBus.h"
+
 // Global HalDisplay instance
 HalDisplay display;
 
@@ -11,6 +13,8 @@ HalDisplay::HalDisplay() : einkDisplay(EPD_SCLK, EPD_MOSI, EPD_CS, EPD_DC, EPD_R
 HalDisplay::~HalDisplay() {}
 
 void HalDisplay::begin() {
+  HalSpiBus::Lock spiLock;
+
   // Set X3-specific panel mode before initializing.
   if (gpio.deviceIsX3()) {
     einkDisplay.setDisplayX3();
@@ -51,6 +55,8 @@ EInkDisplay::RefreshMode convertRefreshMode(HalDisplay::RefreshMode mode) {
 }
 
 void HalDisplay::displayBuffer(HalDisplay::RefreshMode mode, bool turnOffScreen) {
+  HalSpiBus::Lock spiLock;
+
   if (gpio.deviceIsX3() && mode == RefreshMode::HALF_REFRESH) {
     einkDisplay.requestResync(1);
   }
@@ -59,6 +65,8 @@ void HalDisplay::displayBuffer(HalDisplay::RefreshMode mode, bool turnOffScreen)
 }
 
 void HalDisplay::refreshDisplay(HalDisplay::RefreshMode mode, bool turnOffScreen) {
+  HalSpiBus::Lock spiLock;
+
   if (gpio.deviceIsX3() && mode == RefreshMode::HALF_REFRESH) {
     einkDisplay.requestResync(1);
   }
@@ -66,7 +74,10 @@ void HalDisplay::refreshDisplay(HalDisplay::RefreshMode mode, bool turnOffScreen
   einkDisplay.refreshDisplay(convertRefreshMode(mode), turnOffScreen);
 }
 
-void HalDisplay::deepSleep() { einkDisplay.deepSleep(); }
+void HalDisplay::deepSleep() {
+  HalSpiBus::Lock spiLock;
+  einkDisplay.deepSleep();
+}
 
 uint8_t* HalDisplay::getFrameBuffer() const { return einkDisplay.getFrameBuffer(); }
 
@@ -80,7 +91,10 @@ void HalDisplay::copyGrayscaleMsbBuffers(const uint8_t* msbBuffer) { einkDisplay
 
 void HalDisplay::cleanupGrayscaleBuffers(const uint8_t* bwBuffer) { einkDisplay.cleanupGrayscaleBuffers(bwBuffer); }
 
-void HalDisplay::displayGrayBuffer(bool turnOffScreen) { einkDisplay.displayGrayBuffer(turnOffScreen); }
+void HalDisplay::displayGrayBuffer(bool turnOffScreen) {
+  HalSpiBus::Lock spiLock;
+  einkDisplay.displayGrayBuffer(turnOffScreen);
+}
 
 uint16_t HalDisplay::getDisplayWidth() const { return einkDisplay.getDisplayWidth(); }
 
diff --git a/lib/hal/HalGPIO.cpp b/lib/hal/HalGPIO.cpp
index 91e5352b..6b11cb08 100644
--- a/lib/hal/HalGPIO.cpp
+++ b/lib/hal/HalGPIO.cpp
@@ -416,8 +416,10 @@ HalGPIO::WakeupReason HalGPIO::getWakeupReason() const {
 
   const bool usbConnected = isUsbConnected();
 
-  if ((wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) ||
-      (wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP && usbConnected)) {
+  if (wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP) {
+    return WakeupReason::PowerButton;
+  }
+  if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) {
     return WakeupReason::PowerButton;
   }
   if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_UNKNOWN && usbConnected) {
diff --git a/lib/hal/HalPowerManager.cpp b/lib/hal/HalPowerManager.cpp
index ea9ec353..cfb3b5cb 100644
--- a/lib/hal/HalPowerManager.cpp
+++ b/lib/hal/HalPowerManager.cpp
@@ -10,6 +10,26 @@
 
 HalPowerManager powerManager;  // Singleton instance
 
+namespace {
+void disableWiFiBeforeDeepSleep() {
+  const wifi_mode_t wifiMode = WiFi.getMode();
+  if (wifiMode == WIFI_MODE_NULL) {
+    return;
+  }
+
+  LOG_DBG("PWR", "Disabling WiFi before deep sleep (mode=%d)", static_cast<int>(wifiMode));
+  if (wifiMode & WIFI_MODE_AP) {
+    WiFi.softAPdisconnect(true);
+  }
+  if (wifiMode & WIFI_MODE_STA) {
+    WiFi.disconnect(false);
+  }
+  delay(30);
+  WiFi.mode(WIFI_OFF);
+  delay(30);
+}
+}  // namespace
+
 void HalPowerManager::begin() {
   if (gpio.deviceIsX3()) {
     // X3 uses an I2C fuel gauge for battery monitoring.
@@ -61,6 +81,8 @@ void HalPowerManager::setPowerSaving(bool enabled) {
 }
 
 void HalPowerManager::startDeepSleep(HalGPIO& gpio) const {
+  disableWiFiBeforeDeepSleep();
+
   // Ensure that the power button has been released to avoid immediately turning back on if you're holding it
   while (gpio.isPressed(HalGPIO::BTN_POWER)) {
     delay(50);
diff --git a/lib/hal/HalSpiBus.cpp b/lib/hal/HalSpiBus.cpp
new file mode 100644
index 00000000..80cc3349
--- /dev/null
+++ b/lib/hal/HalSpiBus.cpp
@@ -0,0 +1,34 @@
+#include "HalSpiBus.h"
+
+#include <Logging.h>
+
+HalSpiBus::HalSpiBus() {
+  mutex = xSemaphoreCreateRecursiveMutex();
+  if (mutex == nullptr) {
+    LOG_ERR("SPI", "Failed to create SPI bus mutex - bus is unusable");
+  }
+}
+
+HalSpiBus& HalSpiBus::getInstance() {
+  static HalSpiBus spiBus;
+  return spiBus;
+}
+
+HalSpiBus::Lock::Lock() {
+  auto& bus = HalSpiBus::getInstance();
+  if (bus.mutex == nullptr) {
+    LOG_ERR("SPI", "SPI bus mutex not initialized, skipping lock");
+    return;
+  }
+  const BaseType_t takeResult = xSemaphoreTakeRecursive(bus.mutex, portMAX_DELAY);
+  if (takeResult != pdTRUE) {
+    LOG_ERR("SPI", "Failed to acquire SPI bus mutex");
+    return;
+  }
+  acquired = true;
+}
+
+HalSpiBus::Lock::~Lock() {
+  if (!acquired) return;
+  xSemaphoreGiveRecursive(HalSpiBus::getInstance().mutex);
+}
diff --git a/lib/hal/HalSpiBus.h b/lib/hal/HalSpiBus.h
new file mode 100644
index 00000000..a3cb976f
--- /dev/null
+++ b/lib/hal/HalSpiBus.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
+class HalSpiBus {
+ public:
+  class Lock {
+   public:
+    Lock();
+    ~Lock();
+    Lock(const Lock&) = delete;
+    Lock& operator=(const Lock&) = delete;
+
+   private:
+    bool acquired = false;
+  };
+
+  static HalSpiBus& getInstance();
+
+ private:
+  HalSpiBus();
+
+  SemaphoreHandle_t mutex = nullptr;
+
+  friend class Lock;
+};
diff --git a/lib/hal/HalStorage.cpp b/lib/hal/HalStorage.cpp
index a91ea2cf..da988bfd 100644
--- a/lib/hal/HalStorage.cpp
+++ b/lib/hal/HalStorage.cpp
@@ -7,6 +7,8 @@
 
 #include <cassert>
 
+#include "HalSpiBus.h"
+
 #define SDCard SDCardManager::getInstance()
 
 HalStorage HalStorage::instance;
@@ -18,7 +20,10 @@ HalStorage::HalStorage() {
 
 // begin() and ready() are only called from setup, no need to acquire mutex for them
 
-bool HalStorage::begin() { return SDCard.begin(); }
+bool HalStorage::begin() {
+  HalSpiBus::Lock spiLock;
+  return SDCard.begin();
+}
 
 bool HalStorage::ready() const { return SDCard.ready(); }
 
@@ -26,8 +31,11 @@ bool HalStorage::ready() const { return SDCard.ready(); }
 
 class HalStorage::StorageLock {
  public:
-  StorageLock() { xSemaphoreTake(HalStorage::getInstance().storageMutex, portMAX_DELAY); }
+  StorageLock() : spiLock() { xSemaphoreTake(HalStorage::getInstance().storageMutex, portMAX_DELAY); }
   ~StorageLock() { xSemaphoreGive(HalStorage::getInstance().storageMutex); }
+
+ private:
+  HalSpiBus::Lock spiLock;
 };
 
 #define HAL_STORAGE_WRAPPED_CALL(method, ...) \
diff --git a/platformio.ini b/platformio.ini
index f02f1817..3d4887bb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,8 +3,13 @@ default_envs = tiny, xlarge, no_emoji
 extra_configs = platformio.local.ini
 
 [crosspoint]
-version = 1.2.0
-crossink_version = 1.2.9.4
+version = 1.3.0
+crossink_version = 1.2.11.1
+; FlexBLE's own semver, independent of upstream. Bump major on upstream
+; merges, minor on FlexBLE-only features, patch on fixes. The
+; crossink_version above tracks the upstream sync point so OTA / bug
+; reports can correlate against upstream releases.
+flexble_version = 1.0.0
 
 [base]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
@@ -81,6 +86,7 @@ build_flags =
   ${base.build_flags}
   ; CROSSPOINT_VERSION is set by scripts/git_branch.py (includes current branch)
   -DCROSSINK_VERSION=\"${crosspoint.crossink_version}\"
+  -DFLEXBLE_VERSION=\"${crosspoint.flexble_version}\"
   -DCROSSPOINT_FIRMWARE_VARIANT=\"tiny\"
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=2 ; Set log level to debug for development builds
@@ -120,7 +126,9 @@ build_flags =
   ${base.build_flags}
   -DCROSSPOINT_VERSION=\"${crosspoint.version}\"
   -DCROSSINK_VERSION=\"${crosspoint.crossink_version}-tiny\"
+  -DFLEXBLE_VERSION=\"${crosspoint.flexble_version}\"
   -DCROSSPOINT_FIRMWARE_VARIANT=\"tiny\"
+  -DCROSSINK_ENABLE_LYRA_CAROUSEL=1
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=1
   -DOMIT_TEENSY_FONT
@@ -134,9 +142,12 @@ build_flags =
   ${base.build_flags}
   -DCROSSPOINT_VERSION=\"${crosspoint.version}\"
   -DCROSSINK_VERSION=\"${crosspoint.crossink_version}-xlarge\"
+  -DFLEXBLE_VERSION=\"${crosspoint.flexble_version}\"
   -DCROSSPOINT_FIRMWARE_VARIANT=\"xlarge\"
   -DENABLE_SERIAL_LOG
+  -DCROSSINK_ENABLE_LYRA_CAROUSEL=1
   -DLOG_LEVEL=1
+  -DOMIT_MEDIUM_FONT
   -DOMIT_TEENSY_FONT
   -DOMIT_TINY_FONT
   -DOMIT_SMALL_FONT
@@ -148,27 +159,35 @@ build_flags =
   ${base.build_flags}
   -DCROSSPOINT_VERSION=\"${crosspoint.version}\"
   -DCROSSINK_VERSION=\"${crosspoint.crossink_version}-no_emoji\"
+  -DFLEXBLE_VERSION=\"${crosspoint.flexble_version}\"
   -DCROSSPOINT_FIRMWARE_VARIANT=\"no_emoji\"
+  -DCROSSINK_ENABLE_LYRA_CAROUSEL=1
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=1
+  -DOMIT_TEENSY_FONT
   -DOMIT_EMOJI_FONTS
   -DOMIT_HUGE_FONT
 
 [env:simulator]
 platform = native
+custom_run_simulator_target_owner = project
+lib_compat_mode = off
 build_src_filter =
   +<*>
+  -<network/CrossPointWebServer.cpp>
+  -<network/FirmwareFlasher.cpp>
+  -<network/OtaBootSwitch.cpp>
+  -<network/OtaUpdater.cpp>
+  -<network/WebDAVHandler.cpp>
   -<platform/skip_efuse_blk_check.c>
 build_flags =
   -std=gnu++2a
-  -arch arm64
-  -I/opt/homebrew/include
-  -L/opt/homebrew/lib
-  -lSDL2
+  !sdl2-config --cflags --libs
   -DSIMULATOR
   -Wno-c++11-narrowing
   -DCROSSPOINT_VERSION=\"sim\"
   -DCROSSINK_VERSION=\"${crosspoint.crossink_version}\"
+  -DFLEXBLE_VERSION=\"${crosspoint.flexble_version}\"
   -DCROSSPOINT_FIRMWARE_VARIANT=\"simulator\"
   -DENABLE_SERIAL_LOG
   -DLOG_LEVEL=2
@@ -180,20 +199,27 @@ build_flags =
   -DPNG_MAX_BUFFERED_PIXELS=16416
   -DDISABLE_FS_H_WARNING=1
   -DDESTRUCTOR_CLOSES_FILE=1
+  ;-DSIMULATOR_DEVICE_X3 ; uncomment to simulate X3 screen size
+  -Isrc
   ;-DOMIT_EMOJI_FONTS ; uncomment to omit emoji/symbols glyphs from reading fonts
   ;-DOMIT_TEENSY_FONT ; uncomment to omit teensy (8px) font size
   ;-DOMIT_TINY_FONT ; uncomment to omit tiny (10px) font size
   ;-DOMIT_SMALL_FONT ; uncomment to omit small (12px) font size
+  ;-DOMIT_MEDIUM_FONT ; uncomment to omit medium (14px) font size
   ;-DOMIT_XLARGE_FONT ; uncomment to omit extra large (18px) font size
   ;-DOMIT_HUGE_FONT ; uncomment to omit huge (20px) font size
-lib_ignore = hal, PNGdec, JPEGDEC
+  -DCROSSPOINT_SIM_USE_NATIVE_DECODERS
+  -Dmemcpy_P=memcpy ; For native JPEGDEC
+lib_ignore = hal, WebSockets
 extra_scripts =
   pre:scripts/gen_i18n.py
   pre:scripts/git_branch.py
   pre:scripts/build_html.py
-  scripts/run_simulator.py
+  post:.pio/libdeps/$PIOENV/simulator/run_simulator_project.py
 lib_deps =
   simulator=https://github.com/uxjulia/crosspoint-simulator
   bblanchon/ArduinoJson @ 7.4.2
   ricmoo/QRCode @ ^0.0.1
+  bitbank2/PNGdec @ ^1.0.0
+  https://github.com/bitbank2/JPEGDEC.git#86282979224c8a32fd51e091ed5a35b0c699a52b
   links2004/WebSockets @ 2.7.3
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..1746b365
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+-r lib/EpdFont/scripts/requirements.txt
+-r scripts/requirements.txt
diff --git a/scripts/convert_icon.py b/scripts/convert_icon.py
index 56ea7d4b..6e20fc8c 100644
--- a/scripts/convert_icon.py
+++ b/scripts/convert_icon.py
@@ -1,18 +1,21 @@
-import sys
 import os
-from PIL import Image
-import cairosvg
 import io
+import sys
 
 threshold = 128
+USAGE = 'Usage: python scripts/convert_icon.py input.png|input.svg output_name width height'
 
 def svg_to_png_bytes(svg_path, width, height):
+    import cairosvg
+
     with open(svg_path, 'rb') as f:
         svg_data = f.read()
     png_bytes = cairosvg.svg2png(bytestring=svg_data, output_width=width, output_height=height)
     return png_bytes
 
 def load_image(path, width, height):
+    from PIL import Image
+
     ext = os.path.splitext(path)[1].lower()
     if ext == '.svg':
         png_bytes = svg_to_png_bytes(path, width, height)
@@ -58,8 +61,11 @@ def image_to_c_array(img, array_name):
     return c
 
 def main():
-    if len(sys.argv) < 5:
-        print('Usage: python convert_image.py input.png output_name width height')
+    if any(arg in ('-h', '--help') for arg in sys.argv[1:]):
+        print(USAGE)
+        sys.exit(0)
+    if len(sys.argv) != 5:
+        print(USAGE)
         sys.exit(1)
     input_path, output_name, width, height = sys.argv[1:5]
     array_name = output_name.capitalize() + 'Icon'
@@ -77,4 +83,4 @@ def main():
     print(f'Wrote {output_path}')
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/scripts/debugging_monitor.py b/scripts/debugging_monitor.py
index 30c3533e..fa2b8547 100755
--- a/scripts/debugging_monitor.py
+++ b/scripts/debugging_monitor.py
@@ -35,6 +35,43 @@
 from collections import deque
 from datetime import datetime
 
+DEFAULT_BAUDRATE = 115200
+
+
+def build_arg_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        description="ESP32 Serial Monitor with Memory Graph - Real-time monitoring, graphing, and command interface"
+    )
+    parser.add_argument(
+        "port",
+        nargs="?",
+        default=None,
+        help="Serial port (leave empty for autodetection)",
+    )
+    parser.add_argument(
+        "--baud",
+        type=int,
+        default=DEFAULT_BAUDRATE,
+        help=f"Baud rate (default: {DEFAULT_BAUDRATE})",
+    )
+    parser.add_argument(
+        "--filter",
+        type=str,
+        default="",
+        help="Only display lines containing this keyword (case-insensitive)",
+    )
+    parser.add_argument(
+        "--suppress",
+        type=str,
+        default="",
+        help="Suppress lines containing this keyword (case-insensitive)",
+    )
+    return parser
+
+
+if any(arg in ("-h", "--help") for arg in sys.argv[1:]):
+    build_arg_parser().parse_args()
+
 # Try to import potentially missing packages
 PACKAGE_MAPPING: dict[str, str] = {
     "serial": "pyserial",
@@ -401,34 +438,7 @@ def main() -> None:
     - Screenshot capture capability
     - Graceful shutdown on Ctrl-C or window close
     """
-    parser = argparse.ArgumentParser(
-        description="ESP32 Serial Monitor with Memory Graph - Real-time monitoring, graphing, and command interface"
-    )
-    default_baudrate = 115200
-    parser.add_argument(
-        "port",
-        nargs="?",
-        default=None,
-        help="Serial port (leave empty for autodetection)",
-    )
-    parser.add_argument(
-        "--baud",
-        type=int,
-        default=default_baudrate,
-        help=f"Baud rate (default: {default_baudrate})",
-    )
-    parser.add_argument(
-        "--filter",
-        type=str,
-        default="",
-        help="Only display lines containing this keyword (case-insensitive)",
-    )
-    parser.add_argument(
-        "--suppress",
-        type=str,
-        default="",
-        help="Suppress lines containing this keyword (case-insensitive)",
-    )
+    parser = build_arg_parser()
     args = parser.parse_args()
     port = args.port
     if port is None:
diff --git a/scripts/firmware_size_history.py b/scripts/firmware_size_history.py
index c910d6ac..388e1b3f 100755
--- a/scripts/firmware_size_history.py
+++ b/scripts/firmware_size_history.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-Build firmware at selected commits and report flash usage.
+Build firmware at selected commits and report flash and RAM usage.
 
 Two modes (mutually exclusive, one required):
 
@@ -33,6 +33,9 @@
 import subprocess
 import sys
 
+RAM_RE = re.compile(
+    r"RAM:.*?(\d+)\s+bytes\s+from\s+(\d+)\s+bytes"
+)
 FLASH_RE = re.compile(
     r"Flash:.*?(\d+)\s+bytes\s+from\s+(\d+)\s+bytes"
 )
@@ -93,9 +96,9 @@ def build_firmware(env):
     return result.returncode, result.stdout + "\n" + result.stderr
 
 
-def parse_flash_used(output):
-    """Extract used-bytes integer from PlatformIO output, or None."""
-    m = FLASH_RE.search(output)
+def parse_size_line(regex, output):
+    """Extract used-bytes integer matching *regex* from PlatformIO output, or None."""
+    m = regex.search(output)
     if m:
         return int(m.group(1))
     return None
@@ -111,10 +114,10 @@ def write_csv(out, rows, fieldnames):
 def format_table(rows):
     """Print rows as an aligned human-readable table to stdout."""
     COL_COMMIT = 10
-    COL_FLASH = 11
+    COL_SIZE = 11
     COL_DELTA = 7
 
-    def fmt_flash(val):
+    def fmt_size(val):
         if val == "FAILED":
             return "FAILED"
         return f"{val:,}"
@@ -126,25 +129,33 @@ def fmt_delta(val):
 
     header = (
         f"{'Commit':<{COL_COMMIT}}  "
-        f"{'Flash':>{COL_FLASH}}  "
+        f"{'Flash':>{COL_SIZE}}  "
+        f"{'Delta':>{COL_DELTA}}  "
+        f"{'RAM':>{COL_SIZE}}  "
         f"{'Delta':>{COL_DELTA}}  "
         f"Title"
     )
     sep = (
         f"{BOX_CHAR * COL_COMMIT}  "
-        f"{BOX_CHAR * COL_FLASH}  "
+        f"{BOX_CHAR * COL_SIZE}  "
+        f"{BOX_CHAR * COL_DELTA}  "
+        f"{BOX_CHAR * COL_SIZE}  "
         f"{BOX_CHAR * COL_DELTA}  "
         f"{BOX_CHAR * 40}"
     )
     print(header)
     print(sep)
     for row in rows:
-        flash_str = fmt_flash(row["flash_bytes"])
-        delta_str = fmt_delta(row["delta"])
+        flash_str = fmt_size(row["flash_bytes"])
+        flash_d = fmt_delta(row["flash_delta"])
+        ram_str = fmt_size(row["ram_bytes"])
+        ram_d = fmt_delta(row["ram_delta"])
         print(
             f"{row['commit']:<{COL_COMMIT}}  "
-            f"{flash_str:>{COL_FLASH}}  "
-            f"{delta_str:>{COL_DELTA}}  "
+            f"{flash_str:>{COL_SIZE}}  "
+            f"{flash_d:>{COL_DELTA}}  "
+            f"{ram_str:>{COL_SIZE}}  "
+            f"{ram_d:>{COL_DELTA}}  "
             f"{row['title']}"
         )
 
@@ -173,7 +184,7 @@ def build_commits_from_list(refs):
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Measure firmware flash size across git commits.",
+        description="Measure firmware flash and RAM size across git commits.",
         epilog=(
             "Range mode walks every commit between START and END (one branch).  "
             "List mode builds specific refs that may come from different branches."
@@ -233,19 +244,22 @@ def main():
             print(f"  Building (env: {args.env})...", file=sys.stderr)
             rc, output = build_firmware(args.env)
 
-            if rc != 0:
+            build_failed = rc != 0
+            if build_failed:
                 print(f"  BUILD FAILED (exit {rc}) -- skipping", file=sys.stderr)
-                results.append((sha, title, None))
+                results.append((sha, title, None, None, True))
                 continue
 
-            used = parse_flash_used(output)
-            if used is None:
+            flash_used = parse_size_line(FLASH_RE, output)
+            ram_used = parse_size_line(RAM_RE, output)
+            if flash_used is None:
                 print("  Could not parse flash size from output -- skipping", file=sys.stderr)
-                results.append((sha, title, None))
+                results.append((sha, title, None, None, True))
                 continue
 
-            print(f"  Flash used: {used:,} bytes", file=sys.stderr)
-            results.append((sha, title, used))
+            ram_str = f", RAM: {ram_used:,}" if ram_used is not None else ""
+            print(f"  Flash: {flash_used:,}{ram_str} bytes", file=sys.stderr)
+            results.append((sha, title, flash_used, ram_used, False))
 
     except KeyboardInterrupt:
         print("\n[info] Interrupted -- writing partial results.", file=sys.stderr)
@@ -258,22 +272,35 @@ def main():
 
     # Build result rows with deltas
     rows = []
-    prev_size = None
-    for sha, title, used in results:
-        if used is not None and prev_size is not None:
-            delta = used - prev_size
+    prev_flash = None
+    prev_ram = None
+    for sha, title, flash_used, ram_used, build_failed in results:
+        flash_delta = ""
+        ram_delta = ""
+        if flash_used is not None and prev_flash is not None:
+            flash_delta = flash_used - prev_flash
+        if ram_used is not None and prev_ram is not None:
+            ram_delta = ram_used - prev_ram
+        if build_failed:
+            flash_bytes = "FAILED"
+            ram_bytes = "FAILED"
         else:
-            delta = ""
+            flash_bytes = flash_used if flash_used is not None else "N/A"
+            ram_bytes = ram_used if ram_used is not None else "N/A"
         rows.append({
             "commit": sha[:10],
             "title": title,
-            "flash_bytes": used if used is not None else "FAILED",
-            "delta": delta,
+            "flash_bytes": flash_bytes,
+            "flash_delta": flash_delta,
+            "ram_bytes": ram_bytes,
+            "ram_delta": ram_delta,
         })
-        if used is not None:
-            prev_size = used
+        if flash_used is not None:
+            prev_flash = flash_used
+        if ram_used is not None:
+            prev_ram = ram_used
 
-    fieldnames = ["commit", "title", "flash_bytes", "delta"]
+    fieldnames = ["commit", "title", "flash_bytes", "flash_delta", "ram_bytes", "ram_delta"]
 
     if args.csv is not None:
         if args.csv == "-":
diff --git a/scripts/generate-font-manifest.py b/scripts/generate-font-manifest.py
new file mode 100755
index 00000000..80ef73f8
--- /dev/null
+++ b/scripts/generate-font-manifest.py
@@ -0,0 +1,268 @@
+#!/usr/bin/env python3
+"""Generate a fonts.json manifest from a directory of .cpfont files.
+
+Scans the input directory (flat or nested by family) for .cpfont files, reads
+their binary headers to extract style metadata, and produces a JSON manifest
+suitable for device-initiated font downloads.
+
+Usage:
+    python3 scripts/generate-font-manifest.py \
+        --input lib/EpdFont/scripts/output \
+        --base-url "https://example.com/fonts/" \
+        --output dist/fonts.json
+
+The input directory may be flat (all .cpfont files in one dir) or nested
+(family subdirectories). Family names are derived from filenames using the
+convention <FamilyName>_<size>.cpfont.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import struct
+import sys
+import zlib
+from pathlib import Path
+
+# Import canonical version constants from the shared file in lib/EpdFont/scripts/
+sys.path.insert(0, str(Path(__file__).resolve().parent.parent / "lib" / "EpdFont" / "scripts"))
+from cpfont_version import CPFONT_VERSION, FONTS_MANIFEST_VERSION
+
+# --- .cpfont binary format constants ---
+# Global header: 8s magic, H version, H flags, B styleCount, 19x reserved
+GLOBAL_HEADER_FORMAT = "<8sHHB19x"
+GLOBAL_HEADER_SIZE = struct.calcsize(GLOBAL_HEADER_FORMAT)  # 32 bytes
+
+# Style TOC entry: B styleId, 3x pad, I intervalCount, I glyphCount, ...
+# We only need the first byte (styleId) from each 32-byte entry.
+STYLE_TOC_ENTRY_SIZE = 32
+STYLE_TOC_ENTRY_FORMAT = "<B31x"
+
+CPFONT_MAGIC = b"CPFONT\x00\x00"
+
+STYLE_NAMES = {0: "regular", 1: "bold", 2: "italic", 3: "bolditalic"}
+
+# Family descriptions can be loaded from the sd-fonts.yaml config
+# (via --descriptions-from) or fall back to the family name.
+FAMILY_DESCRIPTIONS: dict[str, str] = {}
+
+
+def load_descriptions_from_yaml(yaml_path: Path) -> dict[str, str]:
+    """Load family descriptions from sd-fonts.yaml config."""
+    try:
+        import yaml
+    except ImportError:
+        print("WARNING: pyyaml not installed, cannot load descriptions from YAML", file=sys.stderr)
+        return {}
+
+    with open(yaml_path) as f:
+        config = yaml.safe_load(f)
+
+    return {f["name"]: f["description"] for f in config.get("families", []) if "description" in f}
+
+
+def read_cpfont_styles(filepath: Path) -> list[str]:
+    """Read style names from a .cpfont file's binary header."""
+    with open(filepath, "rb") as f:
+        header_data = f.read(GLOBAL_HEADER_SIZE)
+        if len(header_data) < GLOBAL_HEADER_SIZE:
+            print(f"  WARNING: {filepath.name} too small, skipping", file=sys.stderr)
+            return []
+
+        magic, version, _flags, style_count = struct.unpack(
+            GLOBAL_HEADER_FORMAT, header_data
+        )
+
+        if magic != CPFONT_MAGIC:
+            print(
+                f"  WARNING: {filepath.name} bad magic {magic!r}, skipping",
+                file=sys.stderr,
+            )
+            return []
+
+        if version != CPFONT_VERSION:
+            print(
+                f"  WARNING: {filepath.name} version {version} != {CPFONT_VERSION}, skipping",
+                file=sys.stderr,
+            )
+            return []
+
+        styles = []
+        for _ in range(style_count):
+            toc_data = f.read(STYLE_TOC_ENTRY_SIZE)
+            if len(toc_data) < STYLE_TOC_ENTRY_SIZE:
+                break
+            (style_id,) = struct.unpack(STYLE_TOC_ENTRY_FORMAT, toc_data)
+            name = STYLE_NAMES.get(style_id, f"unknown({style_id})")
+            styles.append(name)
+
+        return styles
+
+
+def parse_filename(filename: str) -> tuple[str, str] | None:
+    """Parse '<FamilyName>_<size>.cpfont' into (family, size_str).
+
+    Returns None if the filename doesn't match the expected pattern.
+    """
+    if not filename.endswith(".cpfont"):
+        return None
+    stem = filename[: -len(".cpfont")]
+    parts = stem.rsplit("_", 1)
+    if len(parts) != 2:
+        return None
+    family, size_str = parts
+    if not size_str.isdigit():
+        return None
+    return family, size_str
+
+
+def compute_crc32(filepath: Path) -> int:
+    """Compute CRC32 of a file, matching esp_rom_crc32_le(0xFFFFFFFF, ...) ^ 0xFFFFFFFF."""
+    crc = 0
+    with open(filepath, "rb") as f:
+        for chunk in iter(lambda: f.read(65536), b""):
+            crc = zlib.crc32(chunk, crc)
+    return crc & 0xFFFFFFFF
+
+
+def scan_cpfont_files(input_dir: Path) -> dict[str, list[Path]]:
+    """Scan input directory for .cpfont files, grouped by family name.
+
+    Handles both flat and nested directory layouts.
+    """
+    families: dict[str, list[Path]] = {}
+
+    for path in sorted(input_dir.rglob("*.cpfont")):
+        if not path.is_file():
+            continue
+        parsed = parse_filename(path.name)
+        if parsed is None:
+            print(f"  WARNING: skipping {path.name} (unexpected filename format)", file=sys.stderr)
+            continue
+        family_name = parsed[0]
+        families.setdefault(family_name, []).append(path)
+
+    return families
+
+
+def build_manifest(
+    families: dict[str, list[Path]], base_url: str
+) -> dict:
+    """Build the manifest dict from discovered font families."""
+    manifest_families = []
+
+    for family_name in sorted(families.keys()):
+        files = families[family_name]
+
+        # Read styles from the first file (all files in a family have the
+        # same styles since they're generated from the same source fonts).
+        styles = read_cpfont_styles(files[0]) if files else []
+
+        # Get description
+        description = FAMILY_DESCRIPTIONS.get(family_name)
+        if description is None:
+            print(
+                f"  WARNING: no description for family '{family_name}', "
+                f"consider adding one to FAMILY_DESCRIPTIONS in {__file__}",
+                file=sys.stderr,
+            )
+            description = family_name
+
+        file_entries = []
+        for filepath in sorted(files, key=lambda p: p.name):
+            file_entries.append(
+                {
+                    "name": filepath.name,
+                    "size": filepath.stat().st_size,
+                    "crc32": compute_crc32(filepath),
+                }
+            )
+
+        manifest_families.append(
+            {
+                "name": family_name,
+                "description": description,
+                "styles": styles,
+                "files": file_entries,
+            }
+        )
+
+    return {
+        "version": FONTS_MANIFEST_VERSION,
+        "baseUrl": base_url,
+        "families": manifest_families,
+    }
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Generate fonts.json manifest from .cpfont files"
+    )
+    parser.add_argument(
+        "--input",
+        required=True,
+        help="Directory containing .cpfont files (flat or nested by family)",
+    )
+    parser.add_argument(
+        "--base-url",
+        required=True,
+        help="URL prefix for font downloads (device concatenates baseUrl + filename)",
+    )
+    parser.add_argument(
+        "--output",
+        required=True,
+        help="Output path for fonts.json",
+    )
+    parser.add_argument(
+        "--descriptions-from",
+        default=None,
+        help="Path to sd-fonts.yaml to load family descriptions (default: use family name)",
+    )
+    args = parser.parse_args()
+
+    input_dir = Path(args.input)
+    if not input_dir.is_dir():
+        print(f"ERROR: {input_dir} is not a directory", file=sys.stderr)
+        sys.exit(1)
+
+    # Ensure base URL ends with /
+    base_url = args.base_url
+    if not base_url.endswith("/"):
+        base_url += "/"
+
+    # Load descriptions from YAML config if provided
+    global FAMILY_DESCRIPTIONS
+    if args.descriptions_from:
+        desc_path = Path(args.descriptions_from)
+        if desc_path.exists():
+            FAMILY_DESCRIPTIONS = load_descriptions_from_yaml(desc_path)
+            print(f"Loaded {len(FAMILY_DESCRIPTIONS)} descriptions from {desc_path}")
+        else:
+            print(f"WARNING: {desc_path} not found, using family names as descriptions", file=sys.stderr)
+
+    print(f"Scanning {input_dir} for .cpfont files...")
+    families = scan_cpfont_files(input_dir)
+
+    if not families:
+        print("ERROR: no .cpfont files found", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"Found {len(families)} font families:")
+    for name, files in sorted(families.items()):
+        print(f"  {name}: {len(files)} files")
+
+    manifest = build_manifest(families, base_url)
+
+    output_path = Path(args.output)
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    with open(output_path, "w") as f:
+        json.dump(manifest, f, indent=2)
+        f.write("\n")
+
+    print(f"Wrote {output_path}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/generate_hyphenation_trie.py b/scripts/generate_hyphenation_trie.py
index 9db0e27b..32305b4f 100755
--- a/scripts/generate_hyphenation_trie.py
+++ b/scripts/generate_hyphenation_trie.py
@@ -60,7 +60,7 @@ def write_header(path: pathlib.Path, blob: bytes, symbol: str) -> None:
 #include <cstddef>
 #include <cstdint>
 
-#include "../SerializedHyphenationTrie.h"
+#include "Epub/hyphenation/SerializedHyphenationTrie.h"
 
 // Auto-generated by generate_hyphenation_trie.py. Do not edit manually.
 alignas(4) constexpr uint8_t {data_symbol}[] = {{
diff --git a/scripts/generate_kerning_ligature_epub.py b/scripts/generate_kerning_ligature_epub.py
index ae3c9f66..1ba640ca 100644
--- a/scripts/generate_kerning_ligature_epub.py
+++ b/scripts/generate_kerning_ligature_epub.py
@@ -137,10 +137,15 @@
 
 import io
 import os
+import sys
 import zipfile
 import uuid
 from datetime import datetime
 
+if any(arg in ("-h", "--help") for arg in sys.argv[1:]):
+    print(__doc__.strip())
+    sys.exit(0)
+
 try:
     from PIL import Image, ImageDraw, ImageFont
 except ImportError:
diff --git a/scripts/generate_test_bmps.py b/scripts/generate_test_bmps.py
index 0e0c7894..2fbdd630 100644
--- a/scripts/generate_test_bmps.py
+++ b/scripts/generate_test_bmps.py
@@ -326,4 +326,7 @@ def main():
 
 
 if __name__ == '__main__':
+    if any(arg in ("-h", "--help") for arg in sys.argv[1:]):
+        print(__doc__.strip())
+        sys.exit(0)
     main()
diff --git a/scripts/generate_test_epub.py b/scripts/generate_test_epub.py
index e585420c..ae97708a 100644
--- a/scripts/generate_test_epub.py
+++ b/scripts/generate_test_epub.py
@@ -11,9 +11,14 @@
 """
 
 import os
+import sys
 import zipfile
 from pathlib import Path
 
+if any(arg in ("-h", "--help") for arg in sys.argv[1:]):
+    print(__doc__.strip())
+    sys.exit(0)
+
 try:
     from PIL import Image, ImageDraw, ImageFont
 except ImportError:
diff --git a/scripts/run_simulator.py b/scripts/run_simulator.py
index 0b5ce3e9..6e4c39a9 100644
--- a/scripts/run_simulator.py
+++ b/scripts/run_simulator.py
@@ -16,7 +16,7 @@ def run_simulator(source, target, env):
     setattr(builtins, RUN_SIMULATOR_TARGET_KEY, True)
     env.AddCustomTarget(
         name="run_simulator",
-        dependencies=None,
+        dependencies="$PROGPATH",
         actions=run_simulator,
         title="Run Simulator",
         description="Build and run the desktop simulator",
diff --git a/scripts/run_simulator_smoke_test.py b/scripts/run_simulator_smoke_test.py
new file mode 100755
index 00000000..d5d07f18
--- /dev/null
+++ b/scripts/run_simulator_smoke_test.py
@@ -0,0 +1,130 @@
+#!/usr/bin/env python3
+"""Build and run the simulator smoke test against an isolated fs_ directory."""
+
+from __future__ import annotations
+
+import argparse
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[1]
+PROGRAM = ROOT / ".pio" / "build" / "simulator" / "program"
+DEFAULT_BOOK = ROOT / "test" / "epubs" / "test_reader_rendering_matrix.epub"
+CRASH_PATTERNS = (
+    "std::bad_alloc",
+    "terminating due to uncaught exception",
+    "Assertion failed",
+    "Segmentation fault",
+    "AddressSanitizer",
+    "UndefinedBehaviorSanitizer",
+)
+THEMES = {
+    "classic": 0,
+    "lyra": 1,
+    "lyra-extended": 2,
+    "lyra_extended": 2,
+    "lyra3": 2,
+    "lyra-3-covers": 2,
+    "roundedraff": 3,
+    "rounded-raff": 3,
+    "lyra-carousel": 4,
+    "lyra_carousel": 4,
+    "carousel": 4,
+}
+
+
+def build_simulator() -> None:
+    print("Building simulator...", flush=True)
+    proc = subprocess.run(["pio", "run", "-e", "simulator"], cwd=ROOT)
+    if proc.returncode != 0:
+        raise SystemExit(proc.returncode)
+
+
+def prepare_fs(temp_root: Path, book: Path) -> str:
+    books_dir = temp_root / "fs_" / "books"
+    books_dir.mkdir(parents=True, exist_ok=True)
+
+    target = books_dir / book.name
+    shutil.copy2(book, target)
+    return f"/books/{book.name}"
+
+
+def run_smoke(args: argparse.Namespace) -> int:
+    book = Path(args.book).resolve()
+    if not book.exists():
+        print(f"Smoke test book not found: {book}", file=sys.stderr)
+        return 2
+
+    if args.build:
+        build_simulator()
+
+    if not PROGRAM.exists():
+        print(f"Simulator binary not found: {PROGRAM}", file=sys.stderr)
+        print("Run: pio run -e simulator", file=sys.stderr)
+        return 2
+
+    with tempfile.TemporaryDirectory(prefix="crossink-sim-smoke-") as temp_dir_name:
+        temp_root = Path(temp_dir_name)
+        simulator_book_path = prepare_fs(temp_root, book)
+
+        env = os.environ.copy()
+        env["CROSSINK_SIMULATOR_SMOKE_TEST"] = "1"
+        env["CROSSINK_SIMULATOR_SMOKE_BOOK"] = simulator_book_path
+        env["CROSSINK_SIMULATOR_SMOKE_PAGE_TURNS"] = str(args.page_turns)
+        if args.theme:
+            env["CROSSINK_SIMULATOR_SMOKE_THEME"] = str(THEMES[args.theme])
+        if args.headless:
+            env.setdefault("SDL_VIDEODRIVER", "dummy")
+
+        print(f"Running simulator smoke test with isolated fs_: {temp_root / 'fs_'}", flush=True)
+        proc = subprocess.run(
+            [str(PROGRAM)],
+            cwd=temp_root,
+            env=env,
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            timeout=args.timeout,
+        )
+
+    print(proc.stdout, end="")
+
+    if proc.returncode != 0:
+        print(f"Simulator smoke test failed with exit code {proc.returncode}", file=sys.stderr)
+        return proc.returncode
+
+    for pattern in CRASH_PATTERNS:
+        if pattern in proc.stdout:
+            print(f"Simulator smoke test output contained crash pattern: {pattern}", file=sys.stderr)
+            return 2
+
+    if "Simulator smoke test passed" not in proc.stdout:
+        print("Simulator smoke test did not print its success marker", file=sys.stderr)
+        return 2
+
+    return 0
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--book", default=str(DEFAULT_BOOK), help="EPUB fixture to copy into the isolated simulator fs_")
+    parser.add_argument("--timeout", type=int, default=45, help="Seconds before the simulator run is treated as hung")
+    parser.add_argument("--page-turns", type=int, default=2, help="Number of EPUB page-forward taps to run")
+    parser.add_argument("--theme", choices=sorted(THEMES), help="UI theme to use during the smoke test")
+    parser.add_argument("--no-build", dest="build", action="store_false", help="Run the existing simulator binary")
+    parser.add_argument("--window", dest="headless", action="store_false", help="Show the SDL window instead of using dummy video")
+    parser.set_defaults(build=True, headless=True)
+    return parser.parse_args()
+
+
+def main() -> int:
+    return run_smoke(parse_args())
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/scripts/update_hypenation.sh b/scripts/update_hyphenation.sh
similarity index 97%
rename from scripts/update_hypenation.sh
rename to scripts/update_hyphenation.sh
index ed12aef7..53706eac 100755
--- a/scripts/update_hypenation.sh
+++ b/scripts/update_hyphenation.sh
@@ -23,3 +23,4 @@ process es
 process ru
 process it
 process uk
+process pl
diff --git a/src/BookmarkStore.cpp b/src/BookmarkStore.cpp
index 78244799..4b3690fd 100644
--- a/src/BookmarkStore.cpp
+++ b/src/BookmarkStore.cpp
@@ -116,6 +116,15 @@ void BookmarkStore::removeBookmarkForPage(uint16_t spineIndex, float pageProgres
   saveToFile();
 }
 
+bool BookmarkStore::removeBookmarkAt(size_t index) {
+  if (index >= bookmarks.size()) return false;
+
+  bookmarks.erase(bookmarks.begin() + index);
+  dirty = true;
+  saveToFile();
+  return true;
+}
+
 bool BookmarkStore::hasBookmarkForPage(uint16_t spineIndex, float pageProgress, int pageCount) {
   if (pageCount <= 0) return false;
   float pageSlice = 1.0f / static_cast<float>(pageCount);
diff --git a/src/BookmarkStore.h b/src/BookmarkStore.h
index 156bfe45..f67da412 100644
--- a/src/BookmarkStore.h
+++ b/src/BookmarkStore.h
@@ -39,6 +39,7 @@ class BookmarkStore {
 
   AddResult addBookmark(uint16_t spineIndex, float progress, int pageCount, const char* chapterTitle);
   void removeBookmarkForPage(uint16_t spineIndex, float pageProgress, int pageCount);
+  bool removeBookmarkAt(size_t index);
   bool hasBookmarkForPage(uint16_t spineIndex, float pageProgress, int pageCount);
   const std::vector<Bookmark>& getBookmarks() const { return bookmarks; }
 
diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp
index 4d224c4a..3f3007d9 100644
--- a/src/CrossPointSettings.cpp
+++ b/src/CrossPointSettings.cpp
@@ -60,6 +60,12 @@ bool isReaderFontSizeAvailable(const CrossPointSettings::FONT_SIZE size) {
       return false;
 #else
       return true;
+#endif
+    case CrossPointSettings::MEDIUM:
+#ifdef OMIT_MEDIUM_FONT
+      return false;
+#else
+      return true;
 #endif
     case CrossPointSettings::EXTRA_LARGE:
 #ifdef OMIT_XLARGE_FONT
@@ -73,13 +79,19 @@ bool isReaderFontSizeAvailable(const CrossPointSettings::FONT_SIZE size) {
 #else
       return true;
 #endif
-    case CrossPointSettings::MEDIUM:
     case CrossPointSettings::LARGE:
     default:
       return true;
   }
 }
 
+CrossPointSettings::FONT_SIZE firstAvailableReaderFontSize() {
+  const auto it =
+      std::find_if(std::begin(READER_FONT_SIZE_STORAGE_ORDER), std::end(READER_FONT_SIZE_STORAGE_ORDER),
+                   [](const CrossPointSettings::FONT_SIZE size) { return isReaderFontSizeAvailable(size); });
+  return (it != std::end(READER_FONT_SIZE_STORAGE_ORDER)) ? *it : CrossPointSettings::LARGE;
+}
+
 // Convert legacy front button layout into explicit logical->hardware mapping.
 void applyLegacyFrontButtonLayout(CrossPointSettings& settings) {
   switch (static_cast<CrossPointSettings::FRONT_BUTTON_LAYOUT>(settings.frontButtonLayout)) {
@@ -145,6 +157,22 @@ void CrossPointSettings::validateReaderFrontButtonMapping(CrossPointSettings& se
   }
 }
 
+uint8_t CrossPointSettings::sleepTimeoutEnumToMinutes(const uint8_t legacyValue) {
+  switch (legacyValue) {
+    case SLEEP_1_MIN:
+      return 1;
+    case SLEEP_5_MIN:
+      return 5;
+    case SLEEP_15_MIN:
+      return 15;
+    case SLEEP_30_MIN:
+      return 30;
+    case SLEEP_10_MIN:
+    default:
+      return 10;
+  }
+}
+
 bool CrossPointSettings::saveToFile() const {
   Storage.mkdir("/.crosspoint");
   return JsonSettingsIO::saveSettings(*this, SETTINGS_FILE_JSON);
@@ -252,7 +280,9 @@ bool CrossPointSettings::loadFromBinaryFile() {
     if (++settingsRead >= fileSettingsCount) break;
     readAndValidate(inputFile, paragraphAlignment, PARAGRAPH_ALIGNMENT_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
-    readAndValidate(inputFile, sleepTimeout, SLEEP_TIMEOUT_COUNT);
+    uint8_t legacySleepTimeout = SLEEP_10_MIN;
+    readAndValidate(inputFile, legacySleepTimeout, SLEEP_TIMEOUT_COUNT);
+    sleepTimeoutMinutes = sleepTimeoutEnumToMinutes(legacySleepTimeout);
     if (++settingsRead >= fileSettingsCount) break;
     readAndValidate(inputFile, refreshFrequency, REFRESH_FREQUENCY_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
@@ -271,7 +301,7 @@ bool CrossPointSettings::loadFromBinaryFile() {
     if (++settingsRead >= fileSettingsCount) break;
     readAndValidate(inputFile, hideBatteryPercentage, HIDE_BATTERY_PERCENTAGE_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
-    serialization::readPod(inputFile, longPressChapterSkip);
+    readAndValidate(inputFile, longPressButtonBehavior, LONG_PRESS_BUTTON_BEHAVIOR_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
     serialization::readPod(inputFile, hyphenationEnabled);
     if (++settingsRead >= fileSettingsCount) break;
@@ -291,7 +321,16 @@ bool CrossPointSettings::loadFromBinaryFile() {
     if (++settingsRead >= fileSettingsCount) break;
     readAndValidate(inputFile, sleepScreenCoverFilter, SLEEP_SCREEN_COVER_FILTER_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
-    serialization::readPod(inputFile, uiTheme);
+    {
+      // Older builds wrote uiTheme via raw readPod, so any byte (including
+      // values that were briefly assigned to themes that are not currently
+      // exposed) may be on disk. Map anything outside the active theme count
+      // to LYRA so the migration is deterministic instead of leaning on
+      // readAndValidate's no-op-on-invalid behaviour.
+      uint8_t rawTheme = LYRA;
+      serialization::readPod(inputFile, rawTheme);
+      uiTheme = (rawTheme < UI_THEME_COUNT) ? rawTheme : static_cast<uint8_t>(LYRA);
+    }
     if (++settingsRead >= fileSettingsCount) break;
     readAndValidate(inputFile, frontButtonBack, FRONT_BUTTON_HARDWARE_COUNT);
     if (++settingsRead >= fileSettingsCount) break;
@@ -319,6 +358,19 @@ bool CrossPointSettings::loadFromBinaryFile() {
 }
 
 float CrossPointSettings::getReaderLineCompression() const {
+  // SD card fonts use same compression as Bookerly (the most neutral values)
+  if (sdFontFamilyName[0] != '\0') {
+    switch (lineSpacing) {
+      case TIGHT:
+        return 0.95f;
+      case NORMAL:
+      default:
+        return 1.0f;
+      case WIDE:
+        return 1.1f;
+    }
+  }
+
   switch (fontFamily) {
     case LEXENDDECA:
     default:
@@ -355,20 +407,25 @@ float CrossPointSettings::getReaderLineCompression() const {
 }
 
 unsigned long CrossPointSettings::getSleepTimeoutMs() const {
-  switch (sleepTimeout) {
-    case SLEEP_1_MIN:
-      return 1UL * 60 * 1000;
-    case SLEEP_5_MIN:
-      return 5UL * 60 * 1000;
-    case SLEEP_10_MIN:
-    default:
-      return 10UL * 60 * 1000;
-    case SLEEP_15_MIN:
-      return 15UL * 60 * 1000;
-    case SLEEP_30_MIN:
-      return 30UL * 60 * 1000;
-  }
+  const uint8_t minutes = std::clamp(sleepTimeoutMinutes, MIN_SLEEP_TIMEOUT_MINUTES, MAX_SLEEP_TIMEOUT_MINUTES);
+  return static_cast<unsigned long>(minutes) * 60UL * 1000UL;
+}
+
+#ifdef SIMULATOR
+bool CrossPointSettings::verifySleepTimeoutMigrationContract() {
+  CrossPointSettings& settings = getInstance();
+  const uint8_t originalMinutes = settings.sleepTimeoutMinutes;
+
+  settings.sleepTimeoutMinutes = sleepTimeoutEnumToMinutes(SLEEP_5_MIN);
+  const bool migratedValueDrivesTimeout = settings.getSleepTimeoutMs() == 5UL * 60UL * 1000UL;
+
+  settings.sleepTimeoutMinutes = 12;
+  const bool runtimeUsesMinutesOnly = settings.getSleepTimeoutMs() == 12UL * 60UL * 1000UL;
+
+  settings.sleepTimeoutMinutes = originalMinutes;
+  return migratedValueDrivesTimeout && runtimeUsesMinutesOnly;
 }
+#endif
 
 int CrossPointSettings::getRefreshFrequency() const {
   switch (refreshFrequency) {
@@ -409,7 +466,7 @@ CrossPointSettings::FONT_SIZE CrossPointSettings::getEffectiveReaderFontSize() c
     if (fontSize == stored) return size;
     stored++;
   }
-  return MEDIUM;
+  return firstAvailableReaderFontSize();
 }
 
 bool CrossPointSettings::changeReaderFontSize(const bool larger) {
@@ -438,6 +495,14 @@ bool CrossPointSettings::changeReaderFontSize(const bool larger) {
 
 int CrossPointSettings::getReaderFontId() const {
   const FONT_SIZE effectiveSize = getEffectiveReaderFontSize();
+
+  // Check SD card font first
+  if (sdFontFamilyName[0] != '\0' && sdFontIdResolver) {
+    int id = sdFontIdResolver(sdFontResolverCtx, sdFontFamilyName, fontSize);
+    if (id != 0) return id;
+    // Fall through to built-in if SD font not found
+  }
+
   switch (fontFamily) {
     case LEXENDDECA:
     default:
@@ -454,10 +519,15 @@ int CrossPointSettings::getReaderFontId() const {
         case SMALL:
           return LEXENDDECA_12_FONT_ID;
 #endif
+#ifndef OMIT_MEDIUM_FONT
         case MEDIUM:
         default:
           return LEXENDDECA_14_FONT_ID;
+#endif
         case LARGE:
+#ifdef OMIT_MEDIUM_FONT
+        default:
+#endif
           return LEXENDDECA_16_FONT_ID;
 #ifndef OMIT_XLARGE_FONT
         case EXTRA_LARGE:
@@ -482,10 +552,15 @@ int CrossPointSettings::getReaderFontId() const {
         case SMALL:
           return CHAREINK_12_FONT_ID;
 #endif
+#ifndef OMIT_MEDIUM_FONT
         case MEDIUM:
         default:
           return CHAREINK_14_FONT_ID;
+#endif
         case LARGE:
+#ifdef OMIT_MEDIUM_FONT
+        default:
+#endif
           return CHAREINK_16_FONT_ID;
 #ifndef OMIT_XLARGE_FONT
         case EXTRA_LARGE:
@@ -510,10 +585,15 @@ int CrossPointSettings::getReaderFontId() const {
         case SMALL:
           return BITTER_12_FONT_ID;
 #endif
+#ifndef OMIT_MEDIUM_FONT
         case MEDIUM:
         default:
           return BITTER_14_FONT_ID;
+#endif
         case LARGE:
+#ifdef OMIT_MEDIUM_FONT
+        default:
+#endif
           return BITTER_16_FONT_ID;
 #ifndef OMIT_XLARGE_FONT
         case EXTRA_LARGE:
diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h
index 0debb6a1..c15807ff 100644
--- a/src/CrossPointSettings.h
+++ b/src/CrossPointSettings.h
@@ -59,6 +59,12 @@ class CrossPointSettings {
     STATUS_BAR_PROGRESS_BAR_THICKNESS_COUNT
   };
   enum STATUS_BAR_TITLE { BOOK_TITLE = 0, CHAPTER_TITLE = 1, HIDE_TITLE = 2, STATUS_BAR_TITLE_COUNT };
+  enum XTC_STATUS_BAR_MODE {
+    XTC_STATUS_BAR_HIDE = 0,
+    XTC_STATUS_BAR_BOTTOM = 1,
+    XTC_STATUS_BAR_TOP = 2,
+    XTC_STATUS_BAR_MODE_COUNT
+  };
 
   enum ORIENTATION {
     PORTRAIT = 0,       // 480x800 logical coordinates (current default)
@@ -93,16 +99,25 @@ class CrossPointSettings {
   // Swapped: Next, Previous
   enum SIDE_BUTTON_LAYOUT { PREV_NEXT = 0, NEXT_PREV = 1, SIDE_BUTTON_LAYOUT_COUNT };
 
+  enum FRONT_BUTTON_ORIENTATION_AWARE {
+    FRONT_ORIENTATION_AWARE_OFF = 0,
+    FRONT_ORIENTATION_AWARE_NAV_BUTTONS = 1,
+    FRONT_ORIENTATION_AWARE_ALL_BUTTONS = 2,
+    FRONT_ORIENTATION_AWARE_COUNT
+  };
+
   // Side button long-press action options
   enum SIDE_LONG_PRESS {
     SIDE_LONG_CHAPTER_SKIP = 0,
     SIDE_LONG_FONT_SIZE = 1,
     SIDE_LONG_OFF = 2,
+    SIDE_LONG_ORIENTATION_CHANGE = 3,
     SIDE_LONG_PRESS_COUNT
   };
 
-  // Font family options
+  // Font family options (built-in fonts only; SD card fonts use sdFontFamilyName)
   enum FONT_FAMILY { LEXENDDECA = 0, BITTER = 1, CHAREINK = 2, FONT_FAMILY_COUNT };
+  static constexpr uint8_t BUILTIN_FONT_COUNT = FONT_FAMILY_COUNT;
   // Font size options
   enum FONT_SIZE {
     TINY = 0,
@@ -160,14 +175,35 @@ class CrossPointSettings {
     SCREENSHOT = 11,
     CYCLE_PAGE_TURN = 12,
     FILE_TRANSFER = 13,
+    TOGGLE_TILT_PAGE_TURN = 14,
     SHORT_PWRBTN_COUNT
   };
 
   // Hide battery percentage
   enum HIDE_BATTERY_PERCENTAGE { HIDE_NEVER = 0, HIDE_READER = 1, HIDE_ALWAYS = 2, HIDE_BATTERY_PERCENTAGE_COUNT };
 
-  // UI Theme
-  enum UI_THEME { CLASSIC = 0, LYRA = 1, LYRA_3_COVERS = 2, LYRA_FLOW = 3, ROUNDEDRAFF = 4 };
+  // Page turn button long press behavior
+  enum LONG_PRESS_BUTTON_BEHAVIOR {
+    OFF = 0,
+    CHAPTER_SKIP = 1,
+    ORIENTATION_CHANGE = 2,
+    LONG_PRESS_BUTTON_BEHAVIOR_COUNT
+  };
+
+  // UI Theme. FlexBLE keeps LYRA_FLOW (the 5-book carousel) at its original
+  // slot 3 so saved user settings stay valid across the v1.2.11.1 merge.
+  // LYRA_CAROUSEL and MINIMAL are upstream's new theme options, appended.
+  enum UI_THEME {
+    CLASSIC = 0,
+    LYRA = 1,
+    LYRA_3_COVERS = 2,
+    LYRA_FLOW = 3,
+    ROUNDEDRAFF = 4,
+    LYRA_CAROUSEL = 5,
+    MINIMAL = 6,
+    UI_THEME_COUNT = 7
+  };
+  enum RECENT_BOOKS_VIEW { RECENT_BOOKS_LIST = 0, RECENT_BOOKS_GRID = 1, RECENT_BOOKS_VIEW_COUNT };
 
   // Image rendering in EPUB reader
   enum IMAGE_RENDERING { IMAGES_DISPLAY = 0, IMAGES_PLACEHOLDER = 1, IMAGES_SUPPRESS = 2, IMAGE_RENDERING_COUNT };
@@ -190,6 +226,7 @@ class CrossPointSettings {
     LONG_MENU_CYCLE_PAGE_TURN = 11,
     LONG_MENU_FILE_TRANSFER = 12,
     LONG_MENU_BOOK_SETTINGS = 13,
+    LONG_MENU_TOGGLE_TILT_PAGE_TURN = 14,
     LONG_PRESS_MENU_ACTION_COUNT
   };
 
@@ -217,6 +254,7 @@ class CrossPointSettings {
   uint8_t statusBarProgressBarThickness = PROGRESS_BAR_NORMAL;
   uint8_t statusBarTitle = CHAPTER_TITLE;
   uint8_t statusBarBattery = 1;
+  uint8_t xtcStatusBarMode = XTC_STATUS_BAR_HIDE;
   // Text rendering settings
   uint8_t extraParagraphSpacing = 1;
   uint8_t forceParagraphIndents = 0;
@@ -231,6 +269,8 @@ class CrossPointSettings {
   // Button layouts (front layout retained for migration only)
   uint8_t frontButtonLayout = BACK_CONFIRM_LEFT_RIGHT;
   uint8_t sideButtonLayout = PREV_NEXT;
+  uint8_t frontButtonOrientationAware = FRONT_ORIENTATION_AWARE_OFF;
+  uint8_t sideButtonOrientationAware = 0;
   // Action performed when side buttons are long-pressed in reader
   uint8_t sideButtonLongPress = SIDE_LONG_CHAPTER_SKIP;
   // Front button remap (logical -> hardware)
@@ -251,8 +291,8 @@ class CrossPointSettings {
   uint8_t fontSize = MEDIUM;
   uint8_t lineSpacing = NORMAL;
   uint8_t paragraphAlignment = JUSTIFIED;
-  // Auto-sleep timeout setting (default 10 minutes)
-  uint8_t sleepTimeout = SLEEP_10_MIN;
+  // Auto-sleep timeout setting (default 10 minutes). Legacy sleepTimeout enum values are migration-only.
+  uint8_t sleepTimeoutMinutes = 10;
   // E-ink refresh frequency (default 15 pages)
   uint8_t refreshFrequency = REFRESH_15;
   uint8_t hyphenationEnabled = 0;
@@ -265,10 +305,12 @@ class CrossPointSettings {
   char opdsPassword[64] = "";
   // Hide battery percentage
   uint8_t hideBatteryPercentage = HIDE_NEVER;
-  // Long-press chapter skip on side buttons
-  uint8_t longPressChapterSkip = 1;
+  // Long-press page turn button behavior
+  uint8_t longPressButtonBehavior = OFF;
   // UI Theme
   uint8_t uiTheme = LYRA;
+  // Recent Books screen layout
+  uint8_t recentBooksView = RECENT_BOOKS_LIST;
   // Sunlight fading compensation
   uint8_t fadingFix = 0;
   // Use book's embedded CSS styles for EPUB rendering (1 = enabled, 0 = disabled)
@@ -277,6 +319,8 @@ class CrossPointSettings {
   uint8_t bionicReadingEnabled = 0;
   // Guide Dots - places a middle dot between words to guide the eye
   uint8_t guideReadingEnabled = 0;
+  // SD card font family name (empty = use built-in fontFamily)
+  char sdFontFamilyName[32] = "";
   // Show hidden files/directories (starting with '.') in the file browser (0 = hidden, 1 = show)
   uint8_t showHiddenFiles = 0;
   // Move epub to /Read/ folder on SD card when marked as finished (0 = disabled, 1 = enabled)
@@ -308,11 +352,21 @@ class CrossPointSettings {
 
   static constexpr uint16_t POWER_BUTTON_WAKE_SHORT_MS = 10;
   static constexpr uint16_t POWER_BUTTON_LONG_PRESS_MS = 400;
+  static constexpr uint8_t MIN_SLEEP_TIMEOUT_MINUTES = 1;
+  static constexpr uint8_t MAX_SLEEP_TIMEOUT_MINUTES = 30;
 
   uint16_t getPowerButtonWakeDuration() const {
     return (shortPwrBtn == CrossPointSettings::SHORT_PWRBTN::SLEEP) ? POWER_BUTTON_WAKE_SHORT_MS
                                                                     : POWER_BUTTON_LONG_PRESS_MS;
   }
+
+  // Callback to resolve SD card font IDs. Set by SdCardFontSystem::begin().
+  // Returns font ID or 0 if not found.
+  using SdFontIdResolver = int (*)(void* ctx, const char* familyName, uint8_t fontSize);
+  SdFontIdResolver sdFontIdResolver = nullptr;
+  void* sdFontResolverCtx = nullptr;
+
+  uint16_t getPowerButtonDuration() const { return getPowerButtonWakeDuration(); }
   uint16_t getPowerButtonLongPressDuration() const { return POWER_BUTTON_LONG_PRESS_MS; }
   static uint8_t getActiveReaderFontSizeCount();
   static uint8_t getStoredReaderFontSize(FONT_SIZE size);
@@ -328,6 +382,10 @@ class CrossPointSettings {
 
   static void validateFrontButtonMapping(CrossPointSettings& settings);
   static void validateReaderFrontButtonMapping(CrossPointSettings& settings);
+  static uint8_t sleepTimeoutEnumToMinutes(uint8_t legacyValue);
+#ifdef SIMULATOR
+  static bool verifySleepTimeoutMigrationContract();
+#endif
 
  private:
   bool loadFromBinaryFile();
diff --git a/src/CrossPointState.h b/src/CrossPointState.h
index 60b84537..48e68357 100644
--- a/src/CrossPointState.h
+++ b/src/CrossPointState.h
@@ -37,6 +37,7 @@ class CrossPointState {
   // Set by background move task on failure; read and cleared by ActivityManager to show AlertActivity.
   // Title/body are written before the flag is set to ensure they are visible when flag is read.
   std::atomic<bool> hasPendingAlert{false};
+  std::atomic<bool> pendingAlertGoHomeOnBack{false};
   char pendingAlertTitle[64] = {};
   char pendingAlertBody[256] = {};
 
diff --git a/src/FontInstaller.cpp b/src/FontInstaller.cpp
new file mode 100644
index 00000000..cbf389ff
--- /dev/null
+++ b/src/FontInstaller.cpp
@@ -0,0 +1,156 @@
+#include "FontInstaller.h"
+
+#include <HalStorage.h>
+#include <Logging.h>
+
+#include <cctype>
+#include <cstring>
+
+#include "CrossPointSettings.h"
+
+FontInstaller::FontInstaller(SdCardFontRegistry& registry) : registry_(registry) {}
+
+bool FontInstaller::isValidFamilyName(const char* name) {
+  if (name == nullptr || name[0] == '\0') return false;
+
+  // Reject path traversal
+  if (strstr(name, "..") != nullptr) return false;
+  if (strchr(name, '/') != nullptr) return false;
+  if (strchr(name, '\\') != nullptr) return false;
+
+  for (const char* p = name; *p != '\0'; ++p) {
+    char c = *p;
+    if (!std::isalnum(static_cast<unsigned char>(c)) && c != '-' && c != '_') {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool FontInstaller::isValidCpfontFilename(const char* name) {
+  if (name == nullptr || name[0] == '\0') return false;
+
+  // Reject path separators / traversal up front. Anything that could escape
+  // the family directory or refer to a different one is a hard reject.
+  if (strstr(name, "..") != nullptr) return false;
+  if (strchr(name, '/') != nullptr) return false;
+  if (strchr(name, '\\') != nullptr) return false;
+
+  // Must end with ".cpfont" exactly.
+  static constexpr char kExt[] = ".cpfont";
+  static constexpr size_t kExtLen = sizeof(kExt) - 1;
+  size_t nameLen = strlen(name);
+  if (nameLen <= kExtLen) return false;
+  if (strcmp(name + nameLen - kExtLen, kExt) != 0) return false;
+
+  // Basename (before .cpfont) must be alphanumeric + hyphen + underscore only.
+  // No additional dots — keeps stray "Foo.cpfont.tmp"-style names out.
+  size_t baseLen = nameLen - kExtLen;
+  for (size_t i = 0; i < baseLen; ++i) {
+    char c = name[i];
+    if (!std::isalnum(static_cast<unsigned char>(c)) && c != '-' && c != '_') {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool FontInstaller::ensureFamilyDir(const char* familyName) {
+  // Reuse the family's existing root if installed; otherwise pick the
+  // default-write root (hidden if no roots exist yet).
+  const char* root = SdCardFontRegistry::findFamilyRoot(familyName);
+  if (!root) root = SdCardFontRegistry::defaultWriteRoot();
+
+  if (!Storage.exists(root)) {
+    if (!Storage.mkdir(root)) {
+      LOG_ERR("FONT", "Failed to create fonts dir: %s", root);
+      return false;
+    }
+  }
+
+  char dirPath[160];
+  snprintf(dirPath, sizeof(dirPath), "%s/%s", root, familyName);
+
+  if (!Storage.exists(dirPath)) {
+    if (!Storage.mkdir(dirPath)) {
+      LOG_ERR("FONT", "Failed to create family dir: %s", dirPath);
+      return false;
+    }
+  }
+  return true;
+}
+
+bool FontInstaller::validateCpfontFile(const char* path) {
+  FsFile file;
+  if (!Storage.openFileForRead("FONT", path, file)) {
+    LOG_ERR("FONT", "Cannot open for validation: %s", path);
+    return false;
+  }
+
+  uint8_t magic[CPFONT_MAGIC_LEN];
+  size_t bytesRead = file.read(magic, CPFONT_MAGIC_LEN);
+  file.close();
+
+  if (bytesRead < CPFONT_MAGIC_LEN) {
+    LOG_ERR("FONT", "File too small: %s (%zu bytes)", path, bytesRead);
+    return false;
+  }
+
+  if (memcmp(magic, "CPFONT\0\0", CPFONT_MAGIC_LEN) != 0) {
+    LOG_ERR("FONT", "Bad magic in: %s", path);
+    return false;
+  }
+
+  return true;
+}
+
+void FontInstaller::buildFontPath(const char* family, const char* filename, char* outBuf, size_t outBufSize) {
+  // Use the same root selection as ensureFamilyDir: existing install dir wins,
+  // otherwise the default-write root.
+  const char* root = SdCardFontRegistry::findFamilyRoot(family);
+  if (!root) root = SdCardFontRegistry::defaultWriteRoot();
+  snprintf(outBuf, outBufSize, "%s/%s/%s", root, family, filename);
+}
+
+FontInstaller::Error FontInstaller::deleteFamily(const char* familyName) {
+  if (!isValidFamilyName(familyName)) {
+    return Error::INVALID_FAMILY_NAME;
+  }
+
+  // A family may exist in either root (or, edge case, both). Remove from both.
+  const char* roots[] = {SdCardFontRegistry::FONTS_DIR_HIDDEN, SdCardFontRegistry::FONTS_DIR_VISIBLE};
+  bool removedAny = false;
+  bool sawAny = false;
+  for (const char* root : roots) {
+    char dirPath[160];
+    snprintf(dirPath, sizeof(dirPath), "%s/%s", root, familyName);
+    if (!Storage.exists(dirPath)) continue;
+    sawAny = true;
+    if (!Storage.removeDir(dirPath)) {
+      LOG_ERR("FONT", "Failed to remove family dir: %s", dirPath);
+      return Error::SD_WRITE_ERROR;
+    }
+    removedAny = true;
+  }
+
+  if (!sawAny) {
+    LOG_DBG("FONT", "Family not found in any fonts root: %s", familyName);
+    return Error::OK;  // Already gone
+  }
+  (void)removedAny;
+
+  // If this was the active font, clear the setting
+  if (strcmp(SETTINGS.sdFontFamilyName, familyName) == 0) {
+    SETTINGS.sdFontFamilyName[0] = '\0';
+    SETTINGS.saveToFile();
+    LOG_DBG("FONT", "Cleared active SD font (deleted family: %s)", familyName);
+  }
+
+  return Error::OK;
+}
+
+void FontInstaller::refreshRegistry() { registry_.discover(); }
+
+bool FontInstaller::isFamilyInstalled(const char* familyName) const {
+  return registry_.findFamily(familyName) != nullptr;
+}
diff --git a/src/FontInstaller.h b/src/FontInstaller.h
new file mode 100644
index 00000000..75c6e92c
--- /dev/null
+++ b/src/FontInstaller.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <SdCardFontRegistry.h>
+
+#include <cstddef>
+#include <cstdint>
+
+/// Shared utility for font installation (device download + browser upload).
+/// Handles directory creation, file validation, deletion, and registry refresh.
+class FontInstaller {
+ public:
+  enum class Error {
+    OK,
+    INVALID_FAMILY_NAME,
+    INVALID_FILE,
+    SD_WRITE_ERROR,
+    MAX_FAMILIES_REACHED,
+  };
+
+  explicit FontInstaller(SdCardFontRegistry& registry);
+
+  /// Validate a family name: alphanumeric + hyphen + underscore only, no path traversal.
+  static bool isValidFamilyName(const char* name);
+
+  /// Validate a .cpfont filename: ends with ".cpfont", no path separators or
+  /// traversal sequences, basename uses only alphanumeric + hyphen + underscore
+  /// + dot (only as the extension separator). Rejects "../foo.cpfont" and
+  /// "evil/foo.cpfont".
+  static bool isValidCpfontFilename(const char* name);
+
+  /// Ensure /<root>/<family>/ exists, where <root> is /.fonts (preferred) or /fonts.
+  /// Re-uses the existing root if the family is already installed; otherwise
+  /// creates it under SdCardFontRegistry::defaultWriteRoot().
+  bool ensureFamilyDir(const char* familyName);
+
+  /// Validate a .cpfont file on disk (check magic bytes).
+  bool validateCpfontFile(const char* path);
+
+  /// Build the full SD path for a font file.
+  /// Writes "/<root>/<family>/<filename>" to outBuf, choosing <root> the same
+  /// way ensureFamilyDir does (existing install dir, else default-write root).
+  static void buildFontPath(const char* family, const char* filename, char* outBuf, size_t outBufSize);
+
+  /// Delete a family directory and all .cpfont files in it.
+  /// If the deleted family is the active reader font, clears the setting.
+  Error deleteFamily(const char* familyName);
+
+  /// Re-run registry discovery to pick up new/removed fonts.
+  void refreshRegistry();
+
+  /// Check whether a family name already exists in the registry.
+  bool isFamilyInstalled(const char* familyName) const;
+
+ private:
+  SdCardFontRegistry& registry_;
+
+  static constexpr const char* CPFONT_MAGIC = "CPFONT\0";
+  static constexpr size_t CPFONT_MAGIC_LEN = 8;
+};
diff --git a/src/GlobalActions.h b/src/GlobalActions.h
index c8423b83..8817f026 100644
--- a/src/GlobalActions.h
+++ b/src/GlobalActions.h
@@ -19,6 +19,7 @@ inline bool isPowerButtonActionAvailableOutsideReader(const CrossPointSettings::
     case CrossPointSettings::SHORT_PWRBTN::MARK_FINISHED:
     case CrossPointSettings::SHORT_PWRBTN::READING_STATS:
     case CrossPointSettings::SHORT_PWRBTN::CYCLE_PAGE_TURN:
+    case CrossPointSettings::SHORT_PWRBTN::TOGGLE_TILT_PAGE_TURN:
     case CrossPointSettings::SHORT_PWRBTN::SHORT_PWRBTN_COUNT:
     default:
       return false;
diff --git a/src/JsonSettingsIO.cpp b/src/JsonSettingsIO.cpp
index 961e7db9..8c40d05f 100644
--- a/src/JsonSettingsIO.cpp
+++ b/src/JsonSettingsIO.cpp
@@ -8,12 +8,12 @@
 #include <Logging.h>
 #include <ObfuscationUtils.h>
 
+#include <algorithm>
 #include <cstring>
 #include <string>
 
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
-#include "KOReaderCredentialStore.h"
 #include "OpdsServerStore.h"
 #include "RecentBooksStore.h"
 #include "SettingsList.h"
@@ -68,6 +68,23 @@ void applyLegacyStatusBarSettings(CrossPointSettings& settings) {
   }
 }
 
+bool isEnumRawValueAllowed(const SettingInfo& info, uint8_t value) {
+  if (info.enumRawValues.empty()) {
+    return value < info.enumValues.size();
+  }
+  return std::find(info.enumRawValues.begin(), info.enumRawValues.end(), value) != info.enumRawValues.end();
+}
+
+uint8_t defaultEnumRawValue(const SettingInfo& info, uint8_t fieldDefault) {
+  if (isEnumRawValueAllowed(info, fieldDefault)) {
+    return fieldDefault;
+  }
+  if (!info.enumRawValues.empty()) {
+    return info.enumRawValues.front();
+  }
+  return 0;
+}
+
 // ---- CrossPointState ----
 
 bool JsonSettingsIO::saveState(const CrossPointState& s, const char* path) {
@@ -155,6 +172,12 @@ bool JsonSettingsIO::saveSettings(const CrossPointSettings& s, const char* path)
   doc["readerFrontButtonConfirm"] = s.readerFrontButtonConfirm;
   doc["readerFrontButtonLeft"] = s.readerFrontButtonLeft;
   doc["readerFrontButtonRight"] = s.readerFrontButtonRight;
+  // Font family — uses dynamic getter/setter in SettingsList so the generic loop skips it.
+  doc["fontFamily"] = s.fontFamily;
+  // SD card font family name — not in SettingsList, save manually
+  if (s.sdFontFamilyName[0] != '\0') {
+    doc["sdFontFamilyName"] = s.sdFontFamilyName;
+  }
 
   // Bluetooth bonded remote metadata is not represented in SettingsList, but it
   // must survive reboot so the firmware can reconnect to the remembered device.
@@ -220,7 +243,10 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
       const uint8_t fieldDefault = s.*(info.valuePtr);  // struct-initializer default, read before we overwrite it
       uint8_t v = doc[info.key] | fieldDefault;
       if (info.type == SettingType::ENUM) {
-        v = clamp(v, (uint8_t)info.enumValues.size(), fieldDefault);
+        if (!isEnumRawValueAllowed(info, v)) {
+          v = defaultEnumRawValue(info, fieldDefault);
+          if (needsResave) *needsResave = true;
+        }
       } else if (info.type == SettingType::TOGGLE) {
         v = clamp(v, (uint8_t)2, fieldDefault);
       } else if (info.type == SettingType::VALUE) {
@@ -232,6 +258,14 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
       s.*(info.valuePtr) = v;
     }
   }
+
+  if (doc["sleepTimeoutMinutes"].isNull() && !doc["sleepTimeout"].isNull()) {
+    const uint8_t legacyValue =
+        clamp(doc["sleepTimeout"] | (uint8_t)CrossPointSettings::SLEEP_10_MIN, CrossPointSettings::SLEEP_TIMEOUT_COUNT,
+              (uint8_t)CrossPointSettings::SLEEP_10_MIN);
+    s.sleepTimeoutMinutes = CrossPointSettings::sleepTimeoutEnumToMinutes(legacyValue);
+    if (needsResave) *needsResave = true;
+  }
   // Front button remap — managed by RemapFrontButtons sub-activity, not in SettingsList.
   using S = CrossPointSettings;
   s.frontButtonBack =
@@ -266,6 +300,13 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
 
   s.bleBondedDeviceAddrType = doc["bleBondedDeviceAddrType"] | s.bleBondedDeviceAddrType;
 
+  // Font family — uses dynamic getter/setter in SettingsList so the generic loop skips it.
+  s.fontFamily = clamp(doc["fontFamily"] | (uint8_t)0, CrossPointSettings::BUILTIN_FONT_COUNT, 0);
+  // SD card font family name — not in SettingsList, load manually
+  const char* sfn = doc["sdFontFamilyName"] | "";
+  strncpy(s.sdFontFamilyName, sfn, sizeof(s.sdFontFamilyName) - 1);
+  s.sdFontFamilyName[sizeof(s.sdFontFamilyName) - 1] = '\0';
+
   // Language -- stored as code string for stability across enum reorders.
   if (doc["language"].is<const char*>()) {
     s.language = static_cast<uint8_t>(I18n::languageFromCode(doc["language"].as<const char*>()));
@@ -276,44 +317,6 @@ bool JsonSettingsIO::loadSettings(CrossPointSettings& s, const char* json, bool*
   return true;
 }
 
-// ---- KOReaderCredentialStore ----
-
-bool JsonSettingsIO::saveKOReader(const KOReaderCredentialStore& store, const char* path) {
-  JsonDocument doc;
-  doc["username"] = store.getUsername();
-  doc["password_obf"] = obfuscation::obfuscateToBase64(store.getPassword());
-  doc["serverUrl"] = store.getServerUrl();
-  doc["matchMethod"] = static_cast<uint8_t>(store.getMatchMethod());
-
-  String json;
-  serializeJson(doc, json);
-  return Storage.writeFile(path, json);
-}
-
-bool JsonSettingsIO::loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave) {
-  if (needsResave) *needsResave = false;
-  JsonDocument doc;
-  auto error = deserializeJson(doc, json);
-  if (error) {
-    LOG_ERR("KRS", "JSON parse error: %s", error.c_str());
-    return false;
-  }
-
-  store.username = doc["username"] | std::string("");
-  bool ok = false;
-  store.password = obfuscation::deobfuscateFromBase64(doc["password_obf"] | "", &ok);
-  if (!ok || store.password.empty()) {
-    store.password = doc["password"] | std::string("");
-    if (!store.password.empty() && needsResave) *needsResave = true;
-  }
-  store.serverUrl = doc["serverUrl"] | std::string("");
-  uint8_t method = doc["matchMethod"] | (uint8_t)0;
-  store.matchMethod = static_cast<DocumentMatchMethod>(method);
-
-  LOG_DBG("KRS", "Loaded KOReader credentials for user: %s", store.username.c_str());
-  return true;
-}
-
 // ---- WifiCredentialStore ----
 
 bool JsonSettingsIO::saveWifi(const WifiCredentialStore& store, const char* path) {
diff --git a/src/JsonSettingsIO.h b/src/JsonSettingsIO.h
index 40d6c4d2..95d96b35 100644
--- a/src/JsonSettingsIO.h
+++ b/src/JsonSettingsIO.h
@@ -3,7 +3,6 @@
 class CrossPointSettings;
 class CrossPointState;
 class WifiCredentialStore;
-class KOReaderCredentialStore;
 class RecentBooksStore;
 class OpdsServerStore;
 
@@ -21,10 +20,6 @@ bool loadState(CrossPointState& s, const char* json);
 bool saveWifi(const WifiCredentialStore& store, const char* path);
 bool loadWifi(WifiCredentialStore& store, const char* json, bool* needsResave = nullptr);
 
-// KOReaderCredentialStore
-bool saveKOReader(const KOReaderCredentialStore& store, const char* path);
-bool loadKOReader(KOReaderCredentialStore& store, const char* json, bool* needsResave = nullptr);
-
 // RecentBooksStore
 bool saveRecentBooks(const RecentBooksStore& store, const char* path);
 bool loadRecentBooks(RecentBooksStore& store, const char* json);
diff --git a/src/MappedInputManager.cpp b/src/MappedInputManager.cpp
index 2679afae..5acaecec 100644
--- a/src/MappedInputManager.cpp
+++ b/src/MappedInputManager.cpp
@@ -1,5 +1,8 @@
 #include "MappedInputManager.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "CrossPointSettings.h"
 #include "GlobalActions.h"
 
@@ -17,23 +20,88 @@ constexpr SideLayoutMap kSideLayouts[] = {
     {HalGPIO::BTN_DOWN, HalGPIO::BTN_UP},
 };
 
+bool isReaderLandscapeOrientation() {
+  return SETTINGS.orientation == CrossPointSettings::LANDSCAPE_CW ||
+         SETTINGS.orientation == CrossPointSettings::LANDSCAPE_CCW;
+}
+
+ButtonIndex invertFrontButtonPosition(const ButtonIndex button) {
+  switch (button) {
+    case HalGPIO::BTN_BACK:
+      return HalGPIO::BTN_RIGHT;
+    case HalGPIO::BTN_CONFIRM:
+      return HalGPIO::BTN_LEFT;
+    case HalGPIO::BTN_LEFT:
+      return HalGPIO::BTN_CONFIRM;
+    case HalGPIO::BTN_RIGHT:
+      return HalGPIO::BTN_BACK;
+    default:
+      return button;
+  }
+}
+
+ButtonIndex mapFrontButtonForReaderOrientation(const ButtonIndex button, const ButtonIndex leftButton,
+                                               const ButtonIndex rightButton, const bool readerMode) {
+  if (!readerMode) {
+    return button;
+  }
+
+  const auto orientationMode =
+      static_cast<CrossPointSettings::FRONT_BUTTON_ORIENTATION_AWARE>(SETTINGS.frontButtonOrientationAware);
+
+  if (orientationMode == CrossPointSettings::FRONT_ORIENTATION_AWARE_ALL_BUTTONS &&
+      SETTINGS.orientation == CrossPointSettings::INVERTED) {
+    return invertFrontButtonPosition(button);
+  }
+
+  if (orientationMode != CrossPointSettings::FRONT_ORIENTATION_AWARE_OFF && isReaderLandscapeOrientation()) {
+    if (button == leftButton) {
+      return rightButton;
+    }
+    if (button == rightButton) {
+      return leftButton;
+    }
+  }
+
+  return button;
+}
+
+SideLayoutMap mapSideLayoutForReaderOrientation(SideLayoutMap side, const bool readerMode) {
+  if (readerMode && SETTINGS.sideButtonOrientationAware && isReaderLandscapeOrientation()) {
+    std::swap(side.pageBack, side.pageForward);
+  }
+  return side;
+}
+
+#ifdef SIMULATOR
+size_t buttonIndex(MappedInputManager::Button button) { return static_cast<size_t>(button); }
+#endif
+
 }  // namespace
 
 bool MappedInputManager::mapButton(const Button button, bool (HalGPIO::*fn)(uint8_t) const) const {
   const auto sideLayout = static_cast<CrossPointSettings::SIDE_BUTTON_LAYOUT>(SETTINGS.sideButtonLayout);
-  const auto& side = kSideLayouts[sideLayout];
+  const auto side = mapSideLayoutForReaderOrientation(kSideLayouts[sideLayout], readerMode);
 
   const bool useReaderMapping = readerMode && SETTINGS.readerFrontButtonsEnabled;
+  const ButtonIndex btnBack = useReaderMapping ? SETTINGS.readerFrontButtonBack : SETTINGS.frontButtonBack;
+  const ButtonIndex btnConfirm = useReaderMapping ? SETTINGS.readerFrontButtonConfirm : SETTINGS.frontButtonConfirm;
+  const ButtonIndex btnLeft = useReaderMapping ? SETTINGS.readerFrontButtonLeft : SETTINGS.frontButtonLeft;
+  const ButtonIndex btnRight = useReaderMapping ? SETTINGS.readerFrontButtonRight : SETTINGS.frontButtonRight;
+  const ButtonIndex mappedBack = mapFrontButtonForReaderOrientation(btnBack, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedConfirm = mapFrontButtonForReaderOrientation(btnConfirm, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedLeft = mapFrontButtonForReaderOrientation(btnLeft, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedRight = mapFrontButtonForReaderOrientation(btnRight, btnLeft, btnRight, readerMode);
 
   switch (button) {
     case Button::Back:
-      return (gpio.*fn)(useReaderMapping ? SETTINGS.readerFrontButtonBack : SETTINGS.frontButtonBack);
+      return (gpio.*fn)(mappedBack);
     case Button::Confirm:
-      return (gpio.*fn)(useReaderMapping ? SETTINGS.readerFrontButtonConfirm : SETTINGS.frontButtonConfirm);
+      return (gpio.*fn)(mappedConfirm);
     case Button::Left:
-      return (gpio.*fn)(useReaderMapping ? SETTINGS.readerFrontButtonLeft : SETTINGS.frontButtonLeft);
+      return (gpio.*fn)(mappedLeft);
     case Button::Right:
-      return (gpio.*fn)(useReaderMapping ? SETTINGS.readerFrontButtonRight : SETTINGS.frontButtonRight);
+      return (gpio.*fn)(mappedRight);
     case Button::Up:
       // Side buttons remain fixed for Up/Down.
       return (gpio.*fn)(HalGPIO::BTN_UP);
@@ -62,6 +130,12 @@ bool MappedInputManager::shouldMirrorPowerAsConfirmHold() const {
 }
 
 bool MappedInputManager::wasPressed(const Button button) const {
+#ifdef SIMULATOR
+  if (simulatorPressed[buttonIndex(button)]) {
+    return true;
+  }
+#endif
+
   if (button == Button::Confirm) {
     if (mapButton(button, &HalGPIO::wasPressed)) {
       return true;
@@ -77,6 +151,12 @@ bool MappedInputManager::wasPressed(const Button button) const {
 }
 
 bool MappedInputManager::wasReleased(const Button button) const {
+#ifdef SIMULATOR
+  if (simulatorReleased[buttonIndex(button)]) {
+    return true;
+  }
+#endif
+
   if (button == Button::Back) {
     if (!mapButton(button, &HalGPIO::wasReleased)) {
       return false;
@@ -114,6 +194,12 @@ bool MappedInputManager::wasReleased(const Button button) const {
 }
 
 bool MappedInputManager::isPressed(const Button button) const {
+#ifdef SIMULATOR
+  if (simulatorHeld[buttonIndex(button)]) {
+    return true;
+  }
+#endif
+
   if (button == Button::Confirm) {
     if (mapButton(button, &HalGPIO::isPressed)) {
       return true;
@@ -131,26 +217,55 @@ bool MappedInputManager::isPressed(const Button button) const {
   return mapButton(button, &HalGPIO::isPressed);
 }
 
-bool MappedInputManager::wasAnyPressed() const { return gpio.wasAnyPressed(); }
+bool MappedInputManager::wasAnyPressed() const {
+#ifdef SIMULATOR
+  if (std::any_of(simulatorPressed.begin(), simulatorPressed.end(), [](bool pressed) { return pressed; })) {
+    return true;
+  }
+#endif
+  return gpio.wasAnyPressed();
+}
 
-bool MappedInputManager::wasAnyReleased() const { return gpio.wasAnyReleased(); }
+bool MappedInputManager::wasAnyReleased() const {
+#ifdef SIMULATOR
+  if (std::any_of(simulatorReleased.begin(), simulatorReleased.end(), [](bool released) { return released; })) {
+    return true;
+  }
+#endif
+  return gpio.wasAnyReleased();
+}
 
-unsigned long MappedInputManager::getHeldTime() const { return gpio.getHeldTime(); }
+unsigned long MappedInputManager::getHeldTime() const {
+  unsigned long heldTime = gpio.getHeldTime();
+#ifdef SIMULATOR
+  const unsigned long now = millis();
+  for (size_t i = 0; i < BUTTON_COUNT; i++) {
+    if (simulatorHeld[i] && simulatorPressStart[i] > 0) {
+      heldTime = std::max(heldTime, now - simulatorPressStart[i]);
+    }
+  }
+#endif
+  return heldTime;
+}
 
 MappedInputManager::Labels MappedInputManager::mapLabels(const char* back, const char* confirm, const char* previous,
                                                          const char* next) const {
   const bool useReaderMapping = readerMode && SETTINGS.readerFrontButtonsEnabled;
-  const uint8_t btnBack = useReaderMapping ? SETTINGS.readerFrontButtonBack : SETTINGS.frontButtonBack;
-  const uint8_t btnConfirm = useReaderMapping ? SETTINGS.readerFrontButtonConfirm : SETTINGS.frontButtonConfirm;
-  const uint8_t btnLeft = useReaderMapping ? SETTINGS.readerFrontButtonLeft : SETTINGS.frontButtonLeft;
-  const uint8_t btnRight = useReaderMapping ? SETTINGS.readerFrontButtonRight : SETTINGS.frontButtonRight;
+  const ButtonIndex btnBack = useReaderMapping ? SETTINGS.readerFrontButtonBack : SETTINGS.frontButtonBack;
+  const ButtonIndex btnConfirm = useReaderMapping ? SETTINGS.readerFrontButtonConfirm : SETTINGS.frontButtonConfirm;
+  const ButtonIndex btnLeft = useReaderMapping ? SETTINGS.readerFrontButtonLeft : SETTINGS.frontButtonLeft;
+  const ButtonIndex btnRight = useReaderMapping ? SETTINGS.readerFrontButtonRight : SETTINGS.frontButtonRight;
+  const ButtonIndex mappedBack = mapFrontButtonForReaderOrientation(btnBack, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedConfirm = mapFrontButtonForReaderOrientation(btnConfirm, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedLeft = mapFrontButtonForReaderOrientation(btnLeft, btnLeft, btnRight, readerMode);
+  const ButtonIndex mappedRight = mapFrontButtonForReaderOrientation(btnRight, btnLeft, btnRight, readerMode);
 
   // Build the label order based on the configured hardware mapping.
-  auto labelForHardware = [&](uint8_t hw) -> const char* {
-    if (hw == btnBack) return back;
-    if (hw == btnConfirm) return confirm;
-    if (hw == btnLeft) return previous;
-    if (hw == btnRight) return next;
+  auto labelForHardware = [&](ButtonIndex hw) -> const char* {
+    if (hw == mappedBack) return back;
+    if (hw == mappedConfirm) return confirm;
+    if (hw == mappedLeft) return previous;
+    if (hw == mappedRight) return next;
     return "";
   };
 
@@ -175,3 +290,45 @@ int MappedInputManager::getPressedFrontButton() const {
   }
   return -1;
 }
+
+int MappedInputManager::getReleasedFrontButton() const {
+  // Scan the raw front buttons in hardware order.
+  // This bypasses remapping for screens whose labels are fixed to physical slots.
+  if (gpio.wasReleased(HalGPIO::BTN_BACK)) {
+    return HalGPIO::BTN_BACK;
+  }
+  if (gpio.wasReleased(HalGPIO::BTN_CONFIRM)) {
+    return HalGPIO::BTN_CONFIRM;
+  }
+  if (gpio.wasReleased(HalGPIO::BTN_LEFT)) {
+    return HalGPIO::BTN_LEFT;
+  }
+  if (gpio.wasReleased(HalGPIO::BTN_RIGHT)) {
+    return HalGPIO::BTN_RIGHT;
+  }
+  return -1;
+}
+
+bool MappedInputManager::isFrontButtonPressed(const uint8_t buttonIndex) const { return gpio.isPressed(buttonIndex); }
+
+#ifdef SIMULATOR
+void MappedInputManager::simulatorInjectPress(Button button) {
+  const size_t idx = buttonIndex(button);
+  simulatorPressed[idx] = true;
+  simulatorReleased[idx] = false;
+  simulatorHeld[idx] = true;
+  simulatorPressStart[idx] = millis();
+}
+
+void MappedInputManager::simulatorInjectRelease(Button button) {
+  const size_t idx = buttonIndex(button);
+  simulatorPressed[idx] = false;
+  simulatorReleased[idx] = true;
+  simulatorHeld[idx] = false;
+}
+
+void MappedInputManager::simulatorClearInputFrame() {
+  simulatorPressed.fill(false);
+  simulatorReleased.fill(false);
+}
+#endif
diff --git a/src/MappedInputManager.h b/src/MappedInputManager.h
index 4047a917..b97f8fd7 100644
--- a/src/MappedInputManager.h
+++ b/src/MappedInputManager.h
@@ -2,9 +2,12 @@
 
 #include <HalGPIO.h>
 
+#include <array>
+
 class MappedInputManager {
  public:
   enum class Button { Back, Confirm, Left, Right, Up, Down, Power, PageBack, PageForward };
+  static constexpr size_t BUTTON_COUNT = static_cast<size_t>(Button::PageForward) + 1;
 
   struct Labels {
     const char* btn1;
@@ -32,6 +35,15 @@ class MappedInputManager {
   Labels mapLabels(const char* back, const char* confirm, const char* previous, const char* next) const;
   // Returns the raw front button index that was pressed this frame (or -1 if none).
   int getPressedFrontButton() const;
+  // Returns the raw front button index that was released this frame (or -1 if none).
+  int getReleasedFrontButton() const;
+  bool isFrontButtonPressed(uint8_t buttonIndex) const;
+
+#ifdef SIMULATOR
+  void simulatorInjectPress(Button button);
+  void simulatorInjectRelease(Button button);
+  void simulatorClearInputFrame();
+#endif
 
  private:
   HalGPIO& gpio;
@@ -39,6 +51,12 @@ class MappedInputManager {
   bool powerAsConfirmInReaderMode = false;
   mutable bool suppressBackRelease = false;
   mutable bool suppressPowerConfirmRelease = false;
+#ifdef SIMULATOR
+  std::array<bool, BUTTON_COUNT> simulatorPressed{};
+  std::array<bool, BUTTON_COUNT> simulatorReleased{};
+  std::array<bool, BUTTON_COUNT> simulatorHeld{};
+  std::array<unsigned long, BUTTON_COUNT> simulatorPressStart{};
+#endif
 
   bool mapButton(Button button, bool (HalGPIO::*fn)(uint8_t) const) const;
   bool shouldUsePowerAsConfirmFallback() const;
diff --git a/src/RecentBooksStore.cpp b/src/RecentBooksStore.cpp
index e6c5dece..c640256d 100644
--- a/src/RecentBooksStore.cpp
+++ b/src/RecentBooksStore.cpp
@@ -15,41 +15,51 @@ constexpr uint8_t RECENT_BOOKS_FILE_VERSION = 3;
 constexpr char RECENT_BOOKS_FILE_BIN[] = "/.crosspoint/recent.bin";
 constexpr char RECENT_BOOKS_FILE_JSON[] = "/.crosspoint/recent.json";
 constexpr char RECENT_BOOKS_FILE_BAK[] = "/.crosspoint/recent.bin.bak";
+constexpr int MAX_RECENT_BOOKS = 18;
 }  // namespace
 
 RecentBooksStore RecentBooksStore::instance;
 
 void RecentBooksStore::addBook(const std::string& path, const std::string& title, const std::string& author,
                                const std::string& coverBmpPath) {
-  // Remove existing entry if present
+  addOrUpdateBook(path, title, author, coverBmpPath);
+}
+
+void RecentBooksStore::addOrUpdateBook(const std::string& path, const std::string& title, const std::string& author,
+                                       const std::string& coverBmpPath) {
   auto it =
       std::find_if(recentBooks.begin(), recentBooks.end(), [&](const RecentBook& book) { return book.path == path; });
   if (it != recentBooks.end()) {
-    recentBooks.erase(it);
-  }
-
-  // Add to front
-  recentBooks.insert(recentBooks.begin(), {path, title, author, coverBmpPath});
-
-  // Trim to max size
-  if (recentBooks.size() > MAX_RECENT_BOOKS) {
-    recentBooks.resize(MAX_RECENT_BOOKS);
+    it->title = title;
+    it->author = author;
+    it->coverBmpPath = coverBmpPath;
+    if (it != recentBooks.begin()) {
+      RecentBook book = std::move(*it);
+      recentBooks.erase(it);
+      recentBooks.insert(recentBooks.begin(), std::move(book));
+    }
+  } else {
+    recentBooks.insert(recentBooks.begin(), {path, title, author, coverBmpPath});
+    if (recentBooks.size() > MAX_RECENT_BOOKS) {
+      recentBooks.resize(MAX_RECENT_BOOKS);
+    }
   }
-
   saveToFile();
 }
 
-void RecentBooksStore::updateBook(const std::string& path, const std::string& title, const std::string& author,
+bool RecentBooksStore::updateBook(const std::string& path, const std::string& title, const std::string& author,
                                   const std::string& coverBmpPath) {
   auto it =
       std::find_if(recentBooks.begin(), recentBooks.end(), [&](const RecentBook& book) { return book.path == path; });
-  if (it != recentBooks.end()) {
-    RecentBook& book = *it;
-    book.title = title;
-    book.author = author;
-    book.coverBmpPath = coverBmpPath;
-    saveToFile();
+  if (it == recentBooks.end()) {
+    return false;
   }
+  RecentBook& book = *it;
+  book.title = title;
+  book.author = author;
+  book.coverBmpPath = coverBmpPath;
+  saveToFile();
+  return true;
 }
 
 void RecentBooksStore::updatePath(const std::string& oldPath, const std::string& newPath,
diff --git a/src/RecentBooksStore.h b/src/RecentBooksStore.h
index df61be39..5e8b230c 100644
--- a/src/RecentBooksStore.h
+++ b/src/RecentBooksStore.h
@@ -34,12 +34,21 @@ class RecentBooksStore {
   // Get singleton instance
   static RecentBooksStore& getInstance() { return instance; }
 
-  // Add a book to the recent list (moves to front if already exists)
+  // Deprecated compatibility wrapper. Use addOrUpdateBook so the promote-or-update behavior is explicit.
+  [[deprecated("use addOrUpdateBook")]]
   void addBook(const std::string& path, const std::string& title, const std::string& author,
                const std::string& coverBmpPath);
 
-  void updateBook(const std::string& path, const std::string& title, const std::string& author,
-                  const std::string& coverBmpPath);
+  // Add a new book to the front, or refresh an existing entry and promote it
+  // to the front.
+  void addOrUpdateBook(const std::string& path, const std::string& title, const std::string& author,
+                       const std::string& coverBmpPath);
+
+  // updateBook updates metadata for an existing book only and must not change
+  // recent-books ordering. Use addOrUpdateBook when the touched book should
+  // become most recent. Returns false if the book does not exist.
+  [[nodiscard]] bool updateBook(const std::string& path, const std::string& title, const std::string& author,
+                                const std::string& coverBmpPath);
 
   // Update the stored path for a book (e.g. after moving the file).
   // Also patches coverBmpPath if it was inside oldCachePath, replacing the prefix with newCachePath.
diff --git a/src/SdCardFontSystem.cpp b/src/SdCardFontSystem.cpp
new file mode 100644
index 00000000..b771bede
--- /dev/null
+++ b/src/SdCardFontSystem.cpp
@@ -0,0 +1,109 @@
+#include "SdCardFontSystem.h"
+
+#include <GfxRenderer.h>
+#include <Logging.h>
+
+#include "CrossPointSettings.h"
+
+static uint8_t fontSizeEnumFromSettings() {
+  uint8_t e = SETTINGS.fontSize;
+  if (e >= CrossPointSettings::FONT_SIZE_COUNT) e = 1;  // default to MEDIUM
+  return e;
+}
+
+void SdCardFontSystem::begin(GfxRenderer& renderer) {
+  registry_.discover();
+
+  // Register this system as the SD font ID resolver in settings.
+  // Uses a static trampoline since CrossPointSettings stores a plain function pointer.
+  SETTINGS.sdFontIdResolver = [](void* ctx, const char* familyName, uint8_t fontSizeEnum) -> int {
+    return static_cast<SdCardFontSystem*>(ctx)->resolveFontId(familyName, fontSizeEnum);
+  };
+  SETTINGS.sdFontResolverCtx = this;
+
+  // If user has a saved SD font selection, load it
+  if (SETTINGS.sdFontFamilyName[0] != '\0') {
+    const auto* family = registry_.findFamily(SETTINGS.sdFontFamilyName);
+    if (family) {
+      if (manager_.loadFamily(*family, renderer, fontSizeEnumFromSettings())) {
+        LOG_DBG("SDFS", "Loaded SD card font family: %s", SETTINGS.sdFontFamilyName);
+      } else {
+        LOG_ERR("SDFS", "Failed to load SD font family: %s (clearing)", SETTINGS.sdFontFamilyName);
+        SETTINGS.sdFontFamilyName[0] = '\0';
+      }
+    } else {
+      LOG_DBG("SDFS", "SD font family not found on card: %s (clearing)", SETTINGS.sdFontFamilyName);
+      SETTINGS.sdFontFamilyName[0] = '\0';
+    }
+  }
+
+  LOG_DBG("SDFS", "SD font system ready (%d families discovered)", registry_.getFamilyCount());
+}
+
+void SdCardFontSystem::ensureLoaded(GfxRenderer& renderer) {
+  // If the web server (or another task) installed/deleted fonts, re-discover.
+  // Track whether we just re-discovered so we can force a reload below even
+  // when the wanted family/size still maps to the same point size — the file
+  // contents on disk may have changed (e.g. user re-uploaded a new build).
+  const bool registryWasDirty = registryDirty_.exchange(false, std::memory_order_acquire);
+  if (registryWasDirty) {
+    LOG_DBG("SDFS", "Registry dirty — re-discovering fonts");
+    registry_.discover();
+  }
+
+  const char* wantedFamily = SETTINGS.sdFontFamilyName;
+  const std::string& currentFamily = manager_.currentFamilyName();
+  const uint8_t sizeEnum = fontSizeEnumFromSettings();
+
+  if (wantedFamily[0] == '\0') {
+    if (!currentFamily.empty()) {
+      manager_.unloadAll(renderer);
+    }
+    return;
+  }
+
+  // Reload if family changed OR if the user-selected size maps to a
+  // different file than what's currently loaded OR if the registry was
+  // just rediscovered (file may have been replaced on disk).
+  bool familyMatches = (currentFamily == wantedFamily);
+  if (familyMatches) {
+    const auto* family = registry_.findFamily(wantedFamily);
+    if (!family) {
+      LOG_DBG("SDFS", "SD font family disappeared: %s (clearing)", wantedFamily);
+      manager_.unloadAll(renderer);
+      SETTINGS.sdFontFamilyName[0] = '\0';
+      return;
+    }
+    auto sizes = family->availableSizes();
+    uint8_t idx = sizeEnum;
+    if (idx >= sizes.size()) idx = sizes.size() - 1;
+    uint8_t wantedPt = sizes.empty() ? 0 : sizes[idx];
+    if (!registryWasDirty && wantedPt == manager_.currentPointSize()) return;
+    LOG_DBG("SDFS", "Reloading %s: size %u -> %u (enum %u)%s", wantedFamily, manager_.currentPointSize(), wantedPt,
+            sizeEnum, registryWasDirty ? " [registry dirty]" : "");
+  }
+
+  if (!currentFamily.empty()) {
+    manager_.unloadAll(renderer);
+  }
+
+  const auto* family = registry_.findFamily(wantedFamily);
+  if (family) {
+    if (manager_.loadFamily(*family, renderer, sizeEnum)) {
+      LOG_DBG("SDFS", "Loaded SD font family: %s", wantedFamily);
+    } else {
+      LOG_ERR("SDFS", "Failed to load SD font family: %s (clearing)", wantedFamily);
+      SETTINGS.sdFontFamilyName[0] = '\0';
+    }
+  } else {
+    LOG_DBG("SDFS", "SD font family not found: %s (clearing)", wantedFamily);
+    SETTINGS.sdFontFamilyName[0] = '\0';
+  }
+}
+
+int SdCardFontSystem::resolveFontId(const char* familyName, uint8_t /*fontSizeEnum*/) const {
+  // The manager loads exactly one size (closest to SETTINGS.fontSize), so the
+  // enum is implicit — always return the single loaded font ID for this family.
+  // ensureLoaded() must have been called with the current settings before this.
+  return manager_.getFontId(familyName);
+}
diff --git a/src/SdCardFontSystem.h b/src/SdCardFontSystem.h
new file mode 100644
index 00000000..6b8aef7f
--- /dev/null
+++ b/src/SdCardFontSystem.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <SdCardFontManager.h>
+#include <SdCardFontRegistry.h>
+
+#include <atomic>
+
+class GfxRenderer;
+
+/// Facade that owns the SD card font registry, manager, and resolver logic.
+/// Hides implementation details behind a single begin() + ensureLoaded() API.
+class SdCardFontSystem {
+ public:
+  SdCardFontSystem() = default;
+  SdCardFontSystem(const SdCardFontSystem&) = delete;
+  SdCardFontSystem& operator=(const SdCardFontSystem&) = delete;
+  /// Discover SD card fonts and load user's saved selection. Call once during setup.
+  void begin(GfxRenderer& renderer);
+
+  /// Ensure the correct SD font family is loaded for the current settings.
+  /// Call before entering the reader or after settings change.
+  /// Also re-discovers if the registry has been marked dirty (e.g. by web upload).
+  void ensureLoaded(GfxRenderer& renderer);
+
+  /// Resolve an SD card font ID from family name + fontSize enum.
+  /// Returns 0 if not found. Used by CrossPointSettings::getReaderFontId().
+  int resolveFontId(const char* familyName, uint8_t fontSizeEnum) const;
+
+  /// Access the registry (e.g. for settings UI to enumerate available fonts).
+  const SdCardFontRegistry& registry() const { return registry_; }
+
+  /// Non-const access to the registry (for FontInstaller).
+  SdCardFontRegistry& registry() { return registry_; }
+
+  /// Mark the registry as needing re-discovery.
+  /// Thread-safe: can be called from the web server task.
+  void markRegistryDirty() { registryDirty_.store(true, std::memory_order_release); }
+
+  /// If the registry is dirty, re-scan the SD card now and clear the flag.
+  /// Used by the web UI so uploaded/deleted fonts appear in the list
+  /// without waiting for the reader activity to run ensureLoaded().
+  void refreshIfDirty() {
+    if (registryDirty_.exchange(false, std::memory_order_acquire)) {
+      registry_.discover();
+    }
+  }
+
+ private:
+  SdCardFontRegistry registry_;
+  SdCardFontManager manager_;
+  std::atomic<bool> registryDirty_{false};
+};
+
+// Global SD card font system instance (defined in main.cpp).
+extern SdCardFontSystem sdFontSystem;
diff --git a/src/SettingsList.h b/src/SettingsList.h
index 42a09637..738ec799 100644
--- a/src/SettingsList.h
+++ b/src/SettingsList.h
@@ -2,18 +2,105 @@
 
 #include <HalTiltSensor.h>
 #include <I18n.h>
+#include <SdCardFontRegistry.h>
 
+#include <algorithm>
+#include <cstring>
+#include <iterator>
 #include <vector>
 
 #include "CrossPointSettings.h"
 #include "KOReaderCredentialStore.h"
 #include "activities/settings/SettingsActivity.h"
 
+// Build the font family setting dynamically. When registry is non-null, SD card fonts
+// are appended after the built-in fonts. Otherwise only built-in fonts are listed.
+inline SettingInfo buildFontFamilySetting(const SdCardFontRegistry* registry) {
+  // Built-in font labels (StrId)
+  std::vector<StrId> enumValues = {StrId::STR_LEXEND_DECA, StrId::STR_BITTER, StrId::STR_CHAREINK};
+  // Runtime string labels for SD card fonts
+  std::vector<std::string> enumStringValues;
+
+  // Reserve: first CrossPointSettings::BUILTIN_FONT_COUNT entries use StrId, rest use strings
+  if (registry) {
+    const auto& families = registry->getFamilies();
+    enumStringValues.reserve(families.size());
+    std::transform(families.begin(), families.end(), std::back_inserter(enumStringValues),
+                   [](const SdCardFontFamilyInfo& f) { return f.name; });
+  }
+
+  // Capture the SD font count for the lambdas
+  const int sdFontCount = static_cast<int>(enumStringValues.size());
+
+  // Total option count = built-in + SD card families
+  // For the combined enumStringValues: we need all entries as strings (built-in names + SD names)
+  // The render code checks enumStringValues first, then enumValues. So we build enumStringValues
+  // with all options when SD fonts are present.
+  std::vector<std::string> allStringValues;
+  if (sdFontCount > 0) {
+    allStringValues.push_back(I18N.get(StrId::STR_LEXEND_DECA));
+    allStringValues.push_back(I18N.get(StrId::STR_BITTER));
+    allStringValues.push_back(I18N.get(StrId::STR_CHAREINK));
+    allStringValues.insert(allStringValues.end(), enumStringValues.begin(), enumStringValues.end());
+  }
+
+  SettingInfo s;
+  s.nameId = StrId::STR_FONT_FAMILY;
+  s.type = SettingType::ENUM;
+  s.enumValues = std::move(enumValues);
+  s.enumStringValues = std::move(allStringValues);
+  s.key = "fontFamily";
+  s.category = StrId::STR_CAT_READER;
+
+  // Capture registry families by copy for the lambdas
+  std::vector<std::string> sdFamilyNames;
+  if (registry) {
+    const auto& families = registry->getFamilies();
+    sdFamilyNames.reserve(families.size());
+    std::transform(families.begin(), families.end(), std::back_inserter(sdFamilyNames),
+                   [](const SdCardFontFamilyInfo& f) { return f.name; });
+  }
+
+  s.valueGetter = [sdFamilyNames]() -> uint8_t {
+    // If an SD card font is selected, find its index
+    if (SETTINGS.sdFontFamilyName[0] != '\0') {
+      for (int i = 0; i < static_cast<int>(sdFamilyNames.size()); i++) {
+        if (sdFamilyNames[i] == SETTINGS.sdFontFamilyName) {
+          return static_cast<uint8_t>(CrossPointSettings::BUILTIN_FONT_COUNT + i);
+        }
+      }
+      // SD font name not found in registry — fall through to built-in
+    }
+    return SETTINGS.fontFamily < CrossPointSettings::BUILTIN_FONT_COUNT ? SETTINGS.fontFamily : 0;
+  };
+
+  s.valueSetter = [sdFamilyNames](uint8_t v) {
+    if (v < CrossPointSettings::BUILTIN_FONT_COUNT) {
+      SETTINGS.fontFamily = v;
+      SETTINGS.sdFontFamilyName[0] = '\0';
+    } else {
+      int sdIdx = v - CrossPointSettings::BUILTIN_FONT_COUNT;
+      if (sdIdx < static_cast<int>(sdFamilyNames.size())) {
+        strncpy(SETTINGS.sdFontFamilyName, sdFamilyNames[sdIdx].c_str(), sizeof(SETTINGS.sdFontFamilyName) - 1);
+        SETTINGS.sdFontFamilyName[sizeof(SETTINGS.sdFontFamilyName) - 1] = '\0';
+      }
+    }
+  };
+
+  return s;
+}
+
 // Shared settings list used by both the device settings UI and the web settings API.
 // Each entry has a key (for JSON API) and category (for grouping).
 // ACTION-type entries and entries without a key are device-only.
-inline const std::vector<SettingInfo>& getSettingsList() {
-  static const std::vector<SettingInfo> list = [] {
+//
+// The static list is constructed exactly once (master's optimization, #1086 +
+// #1636) so the per-entry SettingInfo cost is paid once. When an
+// SdCardFontRegistry is supplied AND has SD card fonts installed, the
+// font-family entry is replaced in a per-call copy with a registry-aware
+// version. Callers without SD fonts pay only a vector copy.
+inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* registry = nullptr) {
+  static const std::vector<SettingInfo> baseList = [] {
     std::vector<SettingInfo> v = {
         // --- Display ---
         SettingInfo::Enum(StrId::STR_SLEEP_SCREEN, &CrossPointSettings::sleepScreen,
@@ -36,12 +123,29 @@ inline const std::vector<SettingInfo>& getSettingsList() {
             "refreshFrequency", StrId::STR_CAT_DISPLAY),
         SettingInfo::Enum(StrId::STR_UI_THEME, &CrossPointSettings::uiTheme,
                           {StrId::STR_THEME_CLASSIC, StrId::STR_THEME_LYRA, StrId::STR_THEME_LYRA_EXTENDED,
-                           StrId::STR_THEME_FLOW, StrId::STR_THEME_ROUNDEDRAFF},
-                          "uiTheme", StrId::STR_CAT_DISPLAY),
+                           StrId::STR_THEME_FLOW, StrId::STR_THEME_ROUNDEDRAFF, StrId::STR_THEME_MINIMAL
+#if defined(CROSSINK_ENABLE_LYRA_CAROUSEL) && CROSSINK_ENABLE_LYRA_CAROUSEL
+                           ,
+                           StrId::STR_THEME_LYRA_CAROUSEL
+#endif
+                          },
+                          "uiTheme", StrId::STR_CAT_DISPLAY)
+            .withEnumRawValues({CrossPointSettings::UI_THEME::CLASSIC, CrossPointSettings::UI_THEME::LYRA,
+                                CrossPointSettings::UI_THEME::LYRA_3_COVERS, CrossPointSettings::UI_THEME::LYRA_FLOW,
+                                CrossPointSettings::UI_THEME::ROUNDEDRAFF, CrossPointSettings::UI_THEME::MINIMAL
+#if defined(CROSSINK_ENABLE_LYRA_CAROUSEL) && CROSSINK_ENABLE_LYRA_CAROUSEL
+                                ,
+                                CrossPointSettings::UI_THEME::LYRA_CAROUSEL
+#endif
+            }),
+        SettingInfo::Enum(StrId::STR_RECENT_BOOKS_VIEW, &CrossPointSettings::recentBooksView,
+                          {StrId::STR_LIST_VIEW, StrId::STR_GRID_VIEW}, "recentBooksView", StrId::STR_CAT_DISPLAY),
         SettingInfo::Toggle(StrId::STR_SUNLIGHT_FADING_FIX, &CrossPointSettings::fadingFix, "fadingFix",
                             StrId::STR_CAT_DISPLAY),
 
         // --- Reader ---
+        // Built-in font-family entry. Replaced per-call with a registry-aware
+        // version when SD fonts are installed.
         SettingInfo::Enum(StrId::STR_FONT_FAMILY, &CrossPointSettings::fontFamily,
                           {
                               StrId::STR_LEXEND_DECA,
@@ -57,7 +161,9 @@ inline const std::vector<SettingInfo>& getSettingsList() {
 #ifndef OMIT_SMALL_FONT
                               StrId::STR_SMALL,
 #endif
+#ifndef OMIT_MEDIUM_FONT
                               StrId::STR_MEDIUM,
+#endif
                               StrId::STR_LARGE,
 #ifndef OMIT_XLARGE_FONT
                               StrId::STR_X_LARGE,
@@ -101,11 +207,19 @@ inline const std::vector<SettingInfo>& getSettingsList() {
         // --- Controls ---
         SettingInfo::Enum(StrId::STR_SIDE_BTN_LAYOUT, &CrossPointSettings::sideButtonLayout,
                           {StrId::STR_PREV_NEXT, StrId::STR_NEXT_PREV}, "sideButtonLayout", StrId::STR_CAT_CONTROLS),
-        SettingInfo::Enum(StrId::STR_SIDE_BTN_LONG_PRESS, &CrossPointSettings::sideButtonLongPress,
-                          {StrId::STR_CHAPTER_SKIP_OPT, StrId::STR_CHANGE_FONT_SIZE, StrId::STR_IGNORE},
+        SettingInfo::Enum(StrId::STR_ORIENTATION_AWARE, &CrossPointSettings::sideButtonOrientationAware,
+                          {StrId::STR_NO, StrId::STR_YES}, "sideButtonOrientationAware", StrId::STR_CAT_CONTROLS),
+        SettingInfo::Enum(StrId::STR_SIDE_BTN_LONG_PRESS, &CrossPointSettings::sideButtonLongPress,  // side buttons
+                          {StrId::STR_CHAPTER_SKIP_OPT, StrId::STR_CHANGE_FONT_SIZE, StrId::STR_IGNORE,
+                           StrId::STR_LONG_PRESS_BEHAVIOR_ORIENTATION},
                           "sideButtonLongPress", StrId::STR_CAT_CONTROLS),
-        SettingInfo::Toggle(StrId::STR_LONG_PRESS_SKIP, &CrossPointSettings::longPressChapterSkip,
-                            "longPressChapterSkip", StrId::STR_CAT_CONTROLS),
+        SettingInfo::Enum(StrId::STR_ORIENTATION_AWARE, &CrossPointSettings::frontButtonOrientationAware,
+                          {StrId::STR_NO, StrId::STR_NAV_BUTTONS, StrId::STR_ALL_BUTTONS},
+                          "frontButtonOrientationAware", StrId::STR_CAT_CONTROLS),
+        SettingInfo::Enum(StrId::STR_LONG_PRESS_BEHAVIOR, &CrossPointSettings::longPressButtonBehavior,
+                          {StrId::STR_LONG_PRESS_BEHAVIOR_OFF, StrId::STR_LONG_PRESS_BEHAVIOR_SKIP,
+                           StrId::STR_LONG_PRESS_BEHAVIOR_ORIENTATION},
+                          "longPressButtonBehavior", StrId::STR_CAT_CONTROLS),
         SettingInfo::Enum(
             StrId::STR_SHORT_PWR_BTN, &CrossPointSettings::shortPwrBtn,
             {StrId::STR_IGNORE, StrId::STR_SLEEP, StrId::STR_PAGE_TURN, StrId::STR_FORCE_REFRESH,
@@ -129,9 +243,10 @@ inline const std::vector<SettingInfo>& getSettingsList() {
                           "longPressMenuAction", StrId::STR_CAT_CONTROLS),
 
         // --- System ---
-        SettingInfo::Enum(StrId::STR_TIME_TO_SLEEP, &CrossPointSettings::sleepTimeout,
-                          {StrId::STR_MIN_1, StrId::STR_MIN_5, StrId::STR_MIN_10, StrId::STR_MIN_15, StrId::STR_MIN_30},
-                          "sleepTimeout", StrId::STR_CAT_SYSTEM),
+        SettingInfo::Value(
+            StrId::STR_TIME_TO_SLEEP, &CrossPointSettings::sleepTimeoutMinutes,
+            {CrossPointSettings::MIN_SLEEP_TIMEOUT_MINUTES, CrossPointSettings::MAX_SLEEP_TIMEOUT_MINUTES, 1},
+            "sleepTimeoutMinutes", StrId::STR_CAT_SYSTEM),
         SettingInfo::Toggle(StrId::STR_SHOW_HIDDEN_FILES, &CrossPointSettings::showHiddenFiles, "showHiddenFiles",
                             StrId::STR_CAT_SYSTEM),
         SettingInfo::Toggle(StrId::STR_MOVE_FINISHED_TO_READ, &CrossPointSettings::moveFinishedToReadFolder,
@@ -183,9 +298,18 @@ inline const std::vector<SettingInfo>& getSettingsList() {
                           StrId::STR_CUSTOMISE_STATUS_BAR),
         SettingInfo::Toggle(StrId::STR_BATTERY, &CrossPointSettings::statusBarBattery, "statusBarBattery",
                             StrId::STR_CUSTOMISE_STATUS_BAR),
+        SettingInfo::Enum(StrId::STR_XTC_STATUS_BAR, &CrossPointSettings::xtcStatusBarMode,
+                          {StrId::STR_HIDE, StrId::STR_BOTTOM, StrId::STR_TOP}, "xtcStatusBarMode",
+                          StrId::STR_CUSTOMISE_STATUS_BAR),
     };
     // Only show tilt page turn setting when the QMI8658 IMU is present (X3).
     if (halTiltSensor.isAvailable()) {
+      for (auto& setting : v) {
+        if (setting.nameId == StrId::STR_SHORT_PWR_BTN || setting.nameId == StrId::STR_LONG_PRESS_ACTION ||
+            setting.nameId == StrId::STR_LONG_PRESS_MENU_ACTION) {
+          setting.enumValues.push_back(StrId::STR_TILT_PAGE_TURN);
+        }
+      }
       for (auto it = v.begin(); it != v.end(); ++it) {
         if (it->nameId == StrId::STR_SHORT_PWR_BTN) {
           v.insert(it + 1, SettingInfo::Enum(StrId::STR_TILT_PAGE_TURN, &CrossPointSettings::tiltPageTurn,
@@ -197,5 +321,13 @@ inline const std::vector<SettingInfo>& getSettingsList() {
     }
     return v;
   }();
-  return list;
+
+  std::vector<SettingInfo> v = baseList;
+  if (registry && registry->getFamilyCount() > 0) {
+    auto it = std::find_if(v.begin(), v.end(), [](const SettingInfo& s) { return s.nameId == StrId::STR_FONT_FAMILY; });
+    if (it != v.end()) {
+      *it = buildFontFamilySetting(registry);
+    }
+  }
+  return v;
 }
diff --git a/src/activities/Activity.cpp b/src/activities/Activity.cpp
index 4dd5ada3..c0bf70e9 100644
--- a/src/activities/Activity.cpp
+++ b/src/activities/Activity.cpp
@@ -8,7 +8,7 @@ void Activity::onExit() { LOG_DBG("ACT", "Exiting activity: %s", name.c_str());
 
 void Activity::requestUpdate(bool immediate) { activityManager.requestUpdate(immediate); }
 
-void Activity::requestUpdateAndWait() { activityManager.requestUpdateAndWait(); }
+RequestUpdateResult Activity::requestUpdateAndWait() { return activityManager.requestUpdateAndWait(); }
 
 void Activity::onGoHome() { activityManager.goHome(); }
 
diff --git a/src/activities/Activity.h b/src/activities/Activity.h
index 3fa8fc10..a9e35d1b 100644
--- a/src/activities/Activity.h
+++ b/src/activities/Activity.h
@@ -39,7 +39,7 @@ class Activity {
   virtual void requestUpdate(bool immediate = false);
 
   // Request an immediate render and block until it completes.
-  virtual void requestUpdateAndWait();
+  virtual RequestUpdateResult requestUpdateAndWait();
 
   virtual bool skipLoopDelay() { return false; }
   virtual bool preventAutoSleep() { return false; }
diff --git a/src/activities/ActivityManager.cpp b/src/activities/ActivityManager.cpp
index 56d97b62..2d0a2615 100644
--- a/src/activities/ActivityManager.cpp
+++ b/src/activities/ActivityManager.cpp
@@ -2,6 +2,8 @@
 
 #include <HalPowerManager.h>
 
+#include <algorithm>
+
 #include "CrossPointState.h"
 #include "OpdsServerStore.h"
 #include "boot_sleep/BootActivity.h"
@@ -47,10 +49,10 @@ void ActivityManager::renderTaskLoop() {
     }
     // Notify any task blocked in requestUpdateAndWait() that the render is done.
     TaskHandle_t waiter = nullptr;
-    taskENTER_CRITICAL(nullptr);
+    taskENTER_CRITICAL(&renderStateMux);
     waiter = waitingTaskHandle;
     waitingTaskHandle = nullptr;
-    taskEXIT_CRITICAL(nullptr);
+    taskEXIT_CRITICAL(&renderStateMux);
     if (waiter) {
       xTaskNotify(waiter, 1, eIncrement);
     }
@@ -104,9 +106,13 @@ void ActivityManager::loop() {
           handler(pendingResult);
         }
 
-        // Request an update to ensure the popped activity gets re-rendered
+        // Queue an update to ensure the popped activity gets re-rendered.
+        // Do not block here: result handlers may transiently take RenderLock while
+        // reconciling state, and a synchronous wait at this point can trip the
+        // deadlock guard even though the queued repaint is sufficient.
         if (pendingAction == PendingAction::None) {
-          requestUpdateAndWait();
+          lock.unlock();
+          requestUpdate();
         }
 
         // Handler may request another pending action, we will handle it in the next loop iteration
@@ -189,7 +195,11 @@ void ActivityManager::goToFileBrowser(std::string path) {
 }
 
 void ActivityManager::goToRecentBooks() {
-  replaceActivity(std::make_unique<RecentBooksGridActivity>(renderer, mappedInput));
+  if (SETTINGS.recentBooksView == CrossPointSettings::RECENT_BOOKS_GRID) {
+    replaceActivity(std::make_unique<RecentBooksGridActivity>(renderer, mappedInput));
+  } else {
+    replaceActivity(std::make_unique<RecentBooksActivity>(renderer, mappedInput));
+  }
 }
 
 void ActivityManager::goToBrowser() {
@@ -243,7 +253,14 @@ void ActivityManager::popActivity() {
 
 bool ActivityManager::preventAutoSleep() const { return currentActivity && currentActivity->preventAutoSleep(); }
 
-bool ActivityManager::isReaderActivity() const { return currentActivity && currentActivity->isReaderActivity(); }
+bool ActivityManager::isReaderActivity() const {
+  if (currentActivity && currentActivity->isReaderActivity()) {
+    return true;
+  }
+
+  return std::any_of(stackActivities.begin(), stackActivities.end(),
+                     [](const auto& activity) { return activity && activity->isReaderActivity(); });
+}
 
 bool ActivityManager::canSnapshotForSleepOverlay() const {
   return currentActivity && currentActivity->canSnapshotForSleepOverlay();
@@ -269,13 +286,13 @@ void ActivityManager::requestUpdate(bool immediate) {
     requestedUpdate = true;
   }
 }
-void ActivityManager::requestUpdateAndWait() {
+RequestUpdateResult ActivityManager::requestUpdateAndWait() {
   if (!renderTaskHandle) {
-    return;
+    return RequestUpdateResult::Rejected;
   }
 
   // Atomic section to perform checks
-  taskENTER_CRITICAL(nullptr);
+  taskENTER_CRITICAL(&renderStateMux);
   auto currTaskHandler = xTaskGetCurrentTaskHandle();
   auto mutexHolder = xSemaphoreGetMutexHolder(renderingMutex);
   bool isRenderTask = (currTaskHandler == renderTaskHandle);
@@ -284,19 +301,27 @@ void ActivityManager::requestUpdateAndWait() {
   if (!alreadyWaiting && !isRenderTask && !holdingRenderLock) {
     waitingTaskHandle = currTaskHandler;
   }
-  taskEXIT_CRITICAL(nullptr);
+  taskEXIT_CRITICAL(&renderStateMux);
 
-  // Render task cannot call requestUpdateAndWait() or it will cause a deadlock
-  assert(!isRenderTask && "Render task cannot call requestUpdateAndWait()");
+  if (isRenderTask) {
+    LOG_ERR("ACT", "requestUpdateAndWait() called from render task; rejecting sync update");
+    return RequestUpdateResult::Rejected;
+  }
 
-  // There should never be the case where 2 tasks are waiting for a render at the same time
-  assert(!alreadyWaiting && "Already waiting for a render to complete");
+  if (alreadyWaiting) {
+    LOG_ERR("ACT", "requestUpdateAndWait() called while another task is waiting; rejecting sync update");
+    return RequestUpdateResult::Rejected;
+  }
 
   // Cannot call while holding RenderLock or it will cause a deadlock
-  assert(!holdingRenderLock && "Cannot call requestUpdateAndWait() while holding RenderLock");
+  if (holdingRenderLock) {
+    LOG_ERR("ACT", "requestUpdateAndWait() called while holding RenderLock; rejecting sync update");
+    return RequestUpdateResult::Rejected;
+  }
 
   xTaskNotify(renderTaskHandle, 1, eIncrement);
   ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+  return RequestUpdateResult::Rendered;
 }
 
 // RenderLock
diff --git a/src/activities/ActivityManager.h b/src/activities/ActivityManager.h
index 324d18b6..3694e279 100644
--- a/src/activities/ActivityManager.h
+++ b/src/activities/ActivityManager.h
@@ -13,9 +13,18 @@
 #include "MappedInputManager.h"
 #include "util/ScreenshotInfo.h"
 
+#ifndef portMUX_INITIALIZER_UNLOCKED
+struct portMUX_TYPE {};
+#define portMUX_INITIALIZER_UNLOCKED \
+  {                                  \
+  }
+#endif
+
 class Activity;    // forward declaration
 class RenderLock;  // forward declaration
 
+enum class RequestUpdateResult { Rendered, Rejected };
+
 /**
  * ActivityManager
  *
@@ -54,6 +63,7 @@ class ActivityManager {
   // Set by requestUpdateAndWait(); read and cleared by the render task after render completes.
   // Note: only one waiting task is supported at a time
   TaskHandle_t waitingTaskHandle = nullptr;
+  portMUX_TYPE renderStateMux = portMUX_INITIALIZER_UNLOCKED;
 
   // Mutex to protect rendering operations from race conditions
   // Must only be used via RenderLock
@@ -108,8 +118,9 @@ class ActivityManager {
   void requestUpdate(bool immediate = false);
 
   // Trigger a render and block until it completes.
-  // Must NOT be called from the render task or while holding a RenderLock.
-  void requestUpdateAndWait();
+  // Returns Rejected when a synchronous render would be unsafe, such as from the render task,
+  // while another task is already waiting, or while holding a RenderLock.
+  RequestUpdateResult requestUpdateAndWait();
 };
 
 extern ActivityManager activityManager;  // singleton, to be defined in main.cpp
diff --git a/src/activities/ActivityResult.h b/src/activities/ActivityResult.h
index 94d900d4..a6487708 100644
--- a/src/activities/ActivityResult.h
+++ b/src/activities/ActivityResult.h
@@ -20,8 +20,16 @@ struct KeyboardResult {
 struct MenuResult {
   int action = -1;
   uint8_t orientation = 0;
-  uint8_t pageTurnOption = 0;
   bool settingsChanged = false;
+  // FlexBLE: BookSettingsDrawer's Bluetooth entry sets this when the user
+  // has no bonded remote and we need to launch the BT settings UI for
+  // first-time pairing. The reader's drawer result handler picks it up.
+  bool requestBluetoothFlow = false;
+  // FlexBLE: BluetoothSettingsActivity sets this when it auto-exited after
+  // a successful connect (exitOnSuccessfulConnect=true). The EpubReaderMenu
+  // result handler treats it as a signal to also finish itself so the user
+  // lands directly back in the book instead of in the reader menu.
+  bool autoExitParent = false;
 };
 
 struct ChapterResult {
@@ -32,6 +40,10 @@ struct PercentResult {
   int percent = 0;
 };
 
+struct IntervalResult {
+  uint32_t value = 0;
+};
+
 struct PageResult {
   uint32_t page = 0;
 };
@@ -60,9 +72,13 @@ struct FileBrowserActionResult {
   int action = -1;
 };
 
-using ResultVariant =
-    std::variant<std::monostate, WifiResult, KeyboardResult, MenuResult, ChapterResult, PercentResult, PageResult,
-                 SyncResult, NetworkModeResult, FootnoteResult, BookmarkResult, FileBrowserActionResult>;
+struct FilePathResult {
+  std::string path;
+};
+
+using ResultVariant = std::variant<std::monostate, WifiResult, KeyboardResult, MenuResult, ChapterResult, PercentResult,
+                                   IntervalResult, PageResult, SyncResult, NetworkModeResult, FootnoteResult,
+                                   BookmarkResult, FileBrowserActionResult, FilePathResult>;
 
 struct ActivityResult {
   bool isCancelled = false;
diff --git a/src/activities/boot_sleep/BootActivity.h b/src/activities/boot_sleep/BootActivity.h
index 312f2ab0..72343b6b 100644
--- a/src/activities/boot_sleep/BootActivity.h
+++ b/src/activities/boot_sleep/BootActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class BootActivity final : public Activity {
  public:
diff --git a/src/activities/boot_sleep/SleepActivity.h b/src/activities/boot_sleep/SleepActivity.h
index 79e42935..27b531c6 100644
--- a/src/activities/boot_sleep/SleepActivity.h
+++ b/src/activities/boot_sleep/SleepActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class Bitmap;
 
diff --git a/src/activities/browser/OpdsBookBrowserActivity.h b/src/activities/browser/OpdsBookBrowserActivity.h
index 853f23e1..437ba58b 100644
--- a/src/activities/browser/OpdsBookBrowserActivity.h
+++ b/src/activities/browser/OpdsBookBrowserActivity.h
@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
-#include "../Activity.h"
 #include "OpdsServerStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 /**
diff --git a/src/activities/home/AlertActivity.cpp b/src/activities/home/AlertActivity.cpp
index 8a5eff7d..9391b726 100644
--- a/src/activities/home/AlertActivity.cpp
+++ b/src/activities/home/AlertActivity.cpp
@@ -11,12 +11,20 @@ void AlertActivity::onEnter() {
   Activity::onEnter();
   title = APP_STATE.pendingAlertTitle;
   body = APP_STATE.pendingAlertBody;
-  requestUpdateAndWait();
+  goHomeOnBack = APP_STATE.pendingAlertGoHomeOnBack.exchange(false, std::memory_order_relaxed);
+  if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+    LOG_ERR("ALERT", "Alert screen could not be rendered synchronously");
+    requestUpdate();
+  }
 }
 
 void AlertActivity::loop() {
   if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-    finish();
+    if (goHomeOnBack) {
+      onGoHome();
+    } else {
+      finish();
+    }
   }
 }
 
@@ -39,7 +47,7 @@ void AlertActivity::render(RenderLock&&) {
     y += lineHeight;
   }
 
-  const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+  const auto labels = mappedInput.mapLabels(goHomeOnBack ? tr(STR_HOME) : tr(STR_BACK), "", "", "");
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
   renderer.displayBuffer();
diff --git a/src/activities/home/AlertActivity.h b/src/activities/home/AlertActivity.h
index d7943fc8..8a7110c6 100644
--- a/src/activities/home/AlertActivity.h
+++ b/src/activities/home/AlertActivity.h
@@ -4,6 +4,7 @@
 class AlertActivity final : public Activity {
   std::string title;
   std::string body;
+  bool goHomeOnBack = false;
 
  public:
   explicit AlertActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
diff --git a/src/activities/home/BookmarksHomeActivity.cpp b/src/activities/home/BookmarksHomeActivity.cpp
index 180a43df..3981f99d 100644
--- a/src/activities/home/BookmarksHomeActivity.cpp
+++ b/src/activities/home/BookmarksHomeActivity.cpp
@@ -6,16 +6,29 @@
 #include "../reader/EpubReaderBookmarkListActivity.h"
 #include "BookmarkStore.h"
 #include "CrossPointState.h"
+#include "FileBrowserActionActivity.h"
 #include "MappedInputManager.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
-void BookmarksHomeActivity::onEnter() {
-  Activity::onEnter();
+namespace {
+constexpr unsigned long BOOKMARK_DELETE_HOLD_MS = 1000;
+}
 
+void BookmarksHomeActivity::reloadBookmarks() {
   books.clear();
   BookmarkStore::getAllBookmarkedBooks(books);
+  if (books.empty()) {
+    selectedIndex = 0;
+  } else if (selectedIndex >= static_cast<int>(books.size())) {
+    selectedIndex = static_cast<int>(books.size()) - 1;
+  }
+}
+
+void BookmarksHomeActivity::onEnter() {
+  Activity::onEnter();
 
+  reloadBookmarks();
   selectedIndex = 0;
   requestUpdate();
 }
@@ -31,7 +44,18 @@ void BookmarksHomeActivity::loop() {
     return;
   }
 
+  if (!books.empty() && !longPressOpenHandled && mappedInput.isPressed(MappedInputManager::Button::Confirm) &&
+      mappedInput.getHeldTime() >= BOOKMARK_DELETE_HOLD_MS) {
+    longPressOpenHandled = true;
+    showBookmarkBookActionMenu(selectedIndex, true);
+    return;
+  }
+
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    if (longPressOpenHandled) {
+      longPressOpenHandled = false;
+      return;
+    }
     if (!books.empty() && selectedIndex >= 0 && selectedIndex < static_cast<int>(books.size())) {
       openBookmarkList(selectedIndex);
     }
@@ -89,6 +113,29 @@ void BookmarksHomeActivity::render(RenderLock&&) {
   renderer.displayBuffer();
 }
 
+void BookmarksHomeActivity::showBookmarkBookActionMenu(int bookIndex, bool ignoreInitialConfirmRelease) {
+  if (bookIndex < 0 || bookIndex >= static_cast<int>(books.size())) return;
+
+  const BookmarkedBookEntry entry = books[bookIndex];
+  std::vector<FileBrowserActionActivity::MenuItem> items;
+  items.reserve(1);
+  items.push_back({FileBrowserAction::Delete, StrId::STR_DELETE});
+
+  startActivityForResult(std::make_unique<FileBrowserActionActivity>(renderer, mappedInput, entry.bookTitle,
+                                                                     std::move(items), ignoreInitialConfirmRelease),
+                         [this, entry](const ActivityResult& result) {
+                           longPressOpenHandled = false;
+                           const auto* actionResult = std::get_if<FileBrowserActionResult>(&result.data);
+                           if (!result.isCancelled && actionResult &&
+                               static_cast<FileBrowserAction>(actionResult->action) == FileBrowserAction::Delete) {
+                             BOOKMARKS.loadForBook(entry.bookPath, entry.bookTitle, entry.bookAuthor, entry.bookType);
+                             BOOKMARKS.clearAll();
+                           }
+                           reloadBookmarks();
+                           requestUpdate();
+                         });
+}
+
 void BookmarksHomeActivity::openBookmarkList(int bookIndex) {
   const BookmarkedBookEntry entry = books[bookIndex];
   BOOKMARKS.loadForBook(entry.bookPath, entry.bookTitle, entry.bookAuthor, entry.bookType);
@@ -108,6 +155,7 @@ void BookmarksHomeActivity::openBookmarkList(int bookIndex) {
             requestUpdate();
           }
         } else {
+          reloadBookmarks();
           requestUpdate();
         }
       });
diff --git a/src/activities/home/BookmarksHomeActivity.h b/src/activities/home/BookmarksHomeActivity.h
index 9257f2cc..594c99a7 100644
--- a/src/activities/home/BookmarksHomeActivity.h
+++ b/src/activities/home/BookmarksHomeActivity.h
@@ -19,7 +19,10 @@ class BookmarksHomeActivity final : public Activity {
  private:
   std::vector<BookmarkedBookEntry> books;
   int selectedIndex = 0;
+  bool longPressOpenHandled = false;
   ButtonNavigator buttonNavigator;
 
+  void reloadBookmarks();
   void openBookmarkList(int bookIndex);
+  void showBookmarkBookActionMenu(int bookIndex, bool ignoreInitialConfirmRelease = false);
 };
diff --git a/src/activities/home/CrashActivity.cpp b/src/activities/home/CrashActivity.cpp
index 4f5a392b..8a7707d5 100644
--- a/src/activities/home/CrashActivity.cpp
+++ b/src/activities/home/CrashActivity.cpp
@@ -16,7 +16,10 @@ void CrashActivity::onEnter() {
   }
   HalSystem::clearPanic();
 
-  requestUpdateAndWait();
+  if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+    LOG_ERR("CRASH", "Crash screen could not be rendered synchronously");
+    requestUpdate();
+  }
 }
 
 void CrashActivity::loop() {
diff --git a/src/activities/home/CrashActivity.h b/src/activities/home/CrashActivity.h
index 9b4641ed..7537b888 100644
--- a/src/activities/home/CrashActivity.h
+++ b/src/activities/home/CrashActivity.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class CrashActivity final : public Activity {
   std::string panicMessage;
diff --git a/src/activities/home/FileBrowserActionActivity.h b/src/activities/home/FileBrowserActionActivity.h
index ad44f6d2..548a6805 100644
--- a/src/activities/home/FileBrowserActionActivity.h
+++ b/src/activities/home/FileBrowserActionActivity.h
@@ -8,7 +8,13 @@
 #include "../Activity.h"
 #include "util/ButtonNavigator.h"
 
-enum class FileBrowserAction : int { Delete = 0, PinFavorite = 1, UnpinFavorite = 2 };
+enum class FileBrowserAction : int {
+  Delete = 0,
+  PinFavorite = 1,
+  UnpinFavorite = 2,
+  DeleteCache = 3,
+  ToggleCompleted = 4,
+};
 
 class FileBrowserActionActivity final : public Activity {
  public:
diff --git a/src/activities/home/FileBrowserActivity.cpp b/src/activities/home/FileBrowserActivity.cpp
index 03f56004..647282fb 100644
--- a/src/activities/home/FileBrowserActivity.cpp
+++ b/src/activities/home/FileBrowserActivity.cpp
@@ -1,24 +1,30 @@
 #include "FileBrowserActivity.h"
 
+#include <Arduino.h>
 #include <Epub.h>
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
 #include <HalStorage.h>
 #include <I18n.h>
+#include <Xtc.h>
 
 #include <algorithm>
 
-#include "../util/ConfirmationActivity.h"
 #include "BookmarkStore.h"
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
 #include "FileBrowserActionActivity.h"
 #include "MappedInputManager.h"
+#include "activities/reader/BookReadingStats.h"
+#include "activities/reader/GlobalReadingStats.h"
+#include "activities/util/ConfirmationActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
 namespace {
 constexpr unsigned long GO_HOME_MS = 1000;
+constexpr unsigned long COMPLETED_FEEDBACK_MS = 1000;
+constexpr int ROOT_HINT_GAP = 20;
 
 bool isSleepFolderPath(const std::string& path) { return path == "/sleep" || path == "/.sleep"; }
 
@@ -26,66 +32,102 @@ bool isSleepImageFile(const std::string& path) {
   return FsHelpers::hasBmpExtension(path) || FsHelpers::hasPngExtension(path);
 }
 
+bool hasFileMetadata(const std::string& path) {
+  return FsHelpers::hasEpubExtension(path) || FsHelpers::hasXtcExtension(path) || FsHelpers::hasTxtExtension(path) ||
+         FsHelpers::hasMarkdownExtension(path);
+}
+
+bool hasClearableBookCache(const std::string& path) {
+  return FsHelpers::hasEpubExtension(path) || FsHelpers::hasXtcExtension(path);
+}
+
+void drawToast(const GfxRenderer& renderer, const char* msg) {
+  constexpr int toastPadX = 20;
+  constexpr int toastPadY = 12;
+  const int msgW = renderer.getTextWidth(UI_10_FONT_ID, msg);
+  const int msgH = renderer.getLineHeight(UI_10_FONT_ID);
+  const int toastW = msgW + toastPadX * 2;
+  const int toastH = msgH + toastPadY * 2;
+  const int toastX = (renderer.getScreenWidth() - toastW) / 2;
+  const int toastY = (renderer.getScreenHeight() - toastH) / 2;
+  renderer.fillRect(toastX, toastY, toastW, toastH, true);
+  renderer.drawText(UI_10_FONT_ID, toastX + toastPadX, toastY + toastPadY, msg, false);
+  renderer.displayBuffer();
+}
+
 std::string buildFullPath(std::string basepath, const std::string& entry) {
   if (basepath.back() != '/') basepath += "/";
   return basepath + entry;
 }
 
-std::string getFileName(std::string filename);
-}  // namespace
+std::string normalizeDirectoryPath(std::string path) {
+  while (path.length() > 1 && path.back() == '/') {
+    path.pop_back();
+  }
+  return path;
+}
 
-void sortFileList(std::vector<std::string>& strs) {
-  std::sort(begin(strs), end(strs), [](const std::string& str1, const std::string& str2) {
-    // Directories first
-    bool isDir1 = str1.back() == '/';
-    bool isDir2 = str2.back() == '/';
-    if (isDir1 != isDir2) return isDir1;
-
-    // Start naive natural sort
-    const char* s1 = str1.c_str();
-    const char* s2 = str2.c_str();
-
-    // Iterate while both strings have characters
-    while (*s1 && *s2) {
-      // Check if both are at the start of a number
-      if (isdigit(*s1) && isdigit(*s2)) {
-        // Skip leading zeros and track them
-        const char* start1 = s1;
-        const char* start2 = s2;
-        while (*s1 == '0') s1++;
-        while (*s2 == '0') s2++;
-
-        // Count digits to compare lengths first
-        int len1 = 0, len2 = 0;
-        while (isdigit(s1[len1])) len1++;
-        while (isdigit(s2[len2])) len2++;
-
-        // Different length so return smaller integer value
-        if (len1 != len2) return len1 < len2;
-
-        // Same length so compare digit by digit
-        for (int i = 0; i < len1; i++) {
-          if (s1[i] != s2[i]) return s1[i] < s2[i];
-        }
+std::string buildReadFolderDestination(const std::string& srcPath) {
+  const size_t lastSlash = srcPath.rfind('/');
+  const std::string filename = (lastSlash != std::string::npos) ? srcPath.substr(lastSlash + 1) : srcPath;
 
-        // Numbers equal so advance pointers
-        s1 += len1;
-        s2 += len2;
-      } else {
-        // Regular case-insensitive character comparison
-        char c1 = tolower(*s1);
-        char c2 = tolower(*s2);
-        if (c1 != c2) return c1 < c2;
-        s1++;
-        s2++;
-      }
+  Storage.mkdir("/Read");
+  std::string dstPath = "/Read/" + filename;
+  if (!Storage.exists(dstPath.c_str())) {
+    return dstPath;
+  }
+
+  const size_t dotPos = filename.rfind('.');
+  const std::string base = (dotPos != std::string::npos) ? filename.substr(0, dotPos) : filename;
+  const std::string ext = (dotPos != std::string::npos) ? filename.substr(dotPos) : "";
+  int suffix = 2;
+  do {
+    dstPath = "/Read/" + base + " (" + std::to_string(suffix) + ")" + ext;
+    suffix++;
+  } while (Storage.exists(dstPath.c_str()) && suffix < 100);
+  return dstPath;
+}
+
+bool containsHiddenPathSegment(const std::string& path) {
+  if (path.empty()) return false;
+  size_t segmentStart = (path.front() == '/') ? 1 : 0;
+  while (segmentStart < path.length()) {
+    const size_t segmentEnd = path.find('/', segmentStart);
+    if (segmentStart < path.length() && path[segmentStart] == '.') {
+      return true;
     }
+    if (segmentEnd == std::string::npos) {
+      break;
+    }
+    segmentStart = segmentEnd + 1;
+  }
+  return false;
+}
 
-    // One string is prefix of other
-    return *s1 == '\0' && *s2 != '\0';
-  });
+void collectMetadataPathsRecursively(const std::string& dirPath, std::vector<std::string>& paths) {
+  auto dir = Storage.open(dirPath.c_str());
+  if (!dir || !dir.isDirectory()) {
+    LOG_ERR("FileBrowser", "Failed to scan directory metadata before delete: %s", dirPath.c_str());
+    return;
+  }
+
+  char name[256];
+  for (auto file = dir.openNextFile(); file; file = dir.openNextFile()) {
+    file.getName(name, sizeof(name));
+    const std::string childPath = buildFullPath(dirPath, name);
+    if (file.isDirectory()) {
+      collectMetadataPathsRecursively(childPath, paths);
+    } else if (hasFileMetadata(childPath)) {
+      paths.push_back(childPath);
+    }
+    file.close();
+  }
+  dir.close();
 }
 
+std::string getFileName(std::string filename);
+}  // namespace
+
 void FileBrowserActivity::loadFiles() {
   files.clear();
 
@@ -107,14 +149,20 @@ void FileBrowserActivity::loadFiles() {
       files.emplace_back(std::string(name) + "/");
     } else {
       std::string_view filename{name};
-      if (FsHelpers::hasEpubExtension(filename) || FsHelpers::hasXtcExtension(filename) ||
-          FsHelpers::hasTxtExtension(filename) || FsHelpers::hasMarkdownExtension(filename) ||
-          FsHelpers::hasBmpExtension(filename) || FsHelpers::hasPngExtension(filename)) {
+      if (mode == Mode::PickFirmware) {
+        // Firmware picker: only show .bin files.
+        if (FsHelpers::checkFileExtension(filename, ".bin")) {
+          files.emplace_back(filename);
+        }
+      } else if (FsHelpers::hasEpubExtension(filename) || FsHelpers::hasXtcExtension(filename) ||
+                 FsHelpers::hasTxtExtension(filename) || FsHelpers::hasMarkdownExtension(filename) ||
+                 FsHelpers::hasBmpExtension(filename) || FsHelpers::hasPngExtension(filename)) {
         files.emplace_back(filename);
       }
     }
   }
-  sortFileList(files);
+  root.close();
+  FsHelpers::sortFileList(files);
 }
 
 void FileBrowserActivity::onEnter() {
@@ -122,6 +170,10 @@ void FileBrowserActivity::onEnter() {
 
   selectorIndex = 0;
 
+  // If Confirm was held while this activity opened (typical when launched from a menu), ignore
+  // its release — otherwise we'd immediately auto-open whatever is at index 0.
+  lockNextConfirmRelease = mappedInput.isPressed(MappedInputManager::Button::Confirm);
+
   auto root = Storage.open(basepath.c_str());
   if (!root) {
     basepath = "/";
@@ -160,6 +212,16 @@ void FileBrowserActivity::clearFileMetadata(const std::string& fullPath) {
   LOG_DBG("FileBrowser", "Cleared metadata for: %s", fullPath.c_str());
 }
 
+bool FileBrowserActivity::clearBookCache(const std::string& fullPath) {
+  if (FsHelpers::hasEpubExtension(fullPath)) {
+    return Epub(fullPath, "/.crosspoint").clearCache();
+  }
+  if (FsHelpers::hasXtcExtension(fullPath)) {
+    return Xtc(fullPath, "/.crosspoint").clearCache();
+  }
+  return false;
+}
+
 void FileBrowserActivity::promptDeleteFile(const std::string& fullPath, const std::string& entry) {
   auto handler = [this, fullPath](const ActivityResult& res) {
     if (res.isCancelled) {
@@ -192,6 +254,50 @@ void FileBrowserActivity::promptDeleteFile(const std::string& fullPath, const st
   startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, entry), handler);
 }
 
+void FileBrowserActivity::promptDeleteDirectory(const std::string& fullPath, const std::string& entry,
+                                                const bool ignoreInitialConfirmRelease) {
+  const std::string dirPath = normalizeDirectoryPath(fullPath);
+  auto handler = [this, dirPath](const ActivityResult& res) {
+    longPressConfirmHandled = false;
+    if (res.isCancelled) {
+      LOG_DBG("FileBrowser", "Delete cancelled by user");
+      return;
+    }
+
+    std::vector<std::string> metadataPaths;
+    collectMetadataPathsRecursively(dirPath, metadataPaths);
+
+    LOG_DBG("FileBrowser", "Attempting to delete directory: %s", dirPath.c_str());
+    if (!Storage.removeDir(dirPath.c_str())) {
+      LOG_ERR("FileBrowser", "Failed to delete directory: %s", dirPath.c_str());
+      return;
+    }
+
+    LOG_DBG("FileBrowser", "Deleted successfully");
+    for (const auto& metadataPath : metadataPaths) {
+      clearFileMetadata(metadataPath);
+    }
+
+    const std::string favoritePrefix = dirPath + "/";
+    if (!APP_STATE.favoriteSleepImagePath.empty() && APP_STATE.favoriteSleepImagePath.rfind(favoritePrefix, 0) == 0) {
+      unpinSleepFavorite();
+    }
+
+    loadFiles();
+    if (files.empty()) {
+      selectorIndex = 0;
+    } else if (selectorIndex >= files.size()) {
+      selectorIndex = files.size() - 1;
+    }
+    requestUpdate(true);
+  };
+
+  const std::string heading = tr(STR_DELETE) + std::string("? ");
+  startActivityForResult(
+      std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, entry, ignoreInitialConfirmRelease),
+      handler);
+}
+
 void FileBrowserActivity::pinSleepFavorite(const std::string& fullPath) {
   APP_STATE.favoriteSleepImagePath = fullPath;
   if (!APP_STATE.saveToFile()) {
@@ -220,11 +326,81 @@ bool FileBrowserActivity::isPinnedSleepFavorite(const std::string& fullPath) con
   return APP_STATE.favoriteSleepImagePath == fullPath;
 }
 
+bool FileBrowserActivity::isEpubCompleted(const std::string& fullPath) const {
+  const Epub epub(fullPath, "/.crosspoint");
+  return BookReadingStats::load(epub.getCachePath()).isCompleted;
+}
+
+void FileBrowserActivity::toggleEpubCompleted(const std::string& fullPath, const std::string& entry) {
+  Epub epub(fullPath, "/.crosspoint");
+  epub.setupCacheDir();
+
+  BookReadingStats stats = BookReadingStats::load(epub.getCachePath());
+  const bool newCompleted = !stats.isCompleted;
+  stats.isCompleted = newCompleted;
+
+  GlobalReadingStats globalStats = GlobalReadingStats::load();
+  if (newCompleted) {
+    globalStats.completedBooks++;
+  } else if (globalStats.completedBooks > 0) {
+    globalStats.completedBooks--;
+  }
+
+  stats.save(epub.getCachePath());
+  globalStats.save();
+
+  completedFeedbackIsFinished = newCompleted;
+  pendingCompletedFeedback = true;
+  completedFeedbackShowTime = millis();
+
+  if (newCompleted && SETTINGS.moveFinishedToReadFolder && fullPath.rfind("/Read/", 0) != 0) {
+    const std::string oldCachePath = epub.getCachePath();
+    const std::string dstPath = buildReadFolderDestination(fullPath);
+    LOG_INF("FileBrowser", "Moving completed epub: %s -> %s", fullPath.c_str(), dstPath.c_str());
+    if (!Storage.rename(fullPath.c_str(), dstPath.c_str())) {
+      LOG_ERR("FileBrowser", "Failed to move book to 'Read' folder");
+      snprintf(APP_STATE.pendingAlertTitle, sizeof(APP_STATE.pendingAlertTitle), "%s",
+               tr(STR_MOVE_TO_READ_FAILED_TITLE));
+      snprintf(APP_STATE.pendingAlertBody, sizeof(APP_STATE.pendingAlertBody), tr(STR_MOVE_TO_READ_FAILED_BODY),
+               getFileName(entry).c_str());
+      APP_STATE.pendingAlertGoHomeOnBack.store(false, std::memory_order_relaxed);
+      APP_STATE.hasPendingAlert.store(true, std::memory_order_release);
+      requestUpdate();
+      return;
+    }
+
+    const std::string newCachePath = "/.crosspoint/epub_" + std::to_string(std::hash<std::string>{}(dstPath));
+    if (!oldCachePath.empty() && Storage.exists(oldCachePath.c_str())) {
+      if (!Storage.rename(oldCachePath.c_str(), newCachePath.c_str())) {
+        LOG_ERR("FileBrowser", "Failed to rename cache dir %s -> %s (non-fatal)", oldCachePath.c_str(),
+                newCachePath.c_str());
+      }
+    }
+
+    RECENT_BOOKS.updatePath(fullPath, dstPath, oldCachePath, newCachePath);
+    if (APP_STATE.openEpubPath == fullPath) {
+      APP_STATE.openEpubPath = dstPath;
+      APP_STATE.saveToFile();
+    }
+  }
+
+  loadFiles();
+  selectorIndex = files.empty() ? 0 : std::min(selectorIndex, files.size() - 1);
+  requestUpdate(true);
+}
+
 void FileBrowserActivity::showFileActionMenu(const std::string& entry, bool ignoreInitialConfirmRelease) {
   const std::string fullPath = buildFullPath(basepath, entry);
   std::vector<FileBrowserActionActivity::MenuItem> items;
-  items.reserve(2);
+  items.reserve(4);
   items.push_back({FileBrowserAction::Delete, StrId::STR_DELETE});
+  if (hasClearableBookCache(fullPath)) {
+    items.push_back({FileBrowserAction::DeleteCache, StrId::STR_DELETE_CACHE});
+  }
+  if (FsHelpers::hasEpubExtension(fullPath)) {
+    items.push_back({FileBrowserAction::ToggleCompleted,
+                     isEpubCompleted(fullPath) ? StrId::STR_MARK_UNFINISHED : StrId::STR_MARK_FINISHED});
+  }
 
   const bool canPinFavorite = isSleepFolderPath(basepath) && isSleepImageFile(entry);
   if (canPinFavorite) {
@@ -247,6 +423,18 @@ void FileBrowserActivity::showFileActionMenu(const std::string& entry, bool igno
           case FileBrowserAction::Delete:
             promptDeleteFile(fullPath, entry);
             return;
+          case FileBrowserAction::DeleteCache:
+            if (!clearBookCache(fullPath)) {
+              LOG_ERR("FileBrowser", "Failed to clear book cache for: %s", fullPath.c_str());
+            } else {
+              drawToast(renderer, tr(STR_BOOK_CACHE_DELETED));
+              delay(1000);
+            }
+            requestUpdate();
+            return;
+          case FileBrowserAction::ToggleCompleted:
+            toggleEpubCompleted(fullPath, entry);
+            return;
           case FileBrowserAction::PinFavorite:
             if (FsHelpers::hasPngExtension(fullPath)) {
               startActivityForResult(
@@ -267,16 +455,46 @@ void FileBrowserActivity::showFileActionMenu(const std::string& entry, bool igno
       });
 }
 
-void FileBrowserActivity::loop() {
-  // Long press BACK (1s+) goes to root folder
-  // but Long press BACK (1s+) from ReaderActivity sends us here with the MappedInput already set.
-  // So ignore it the first time.
-  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= GO_HOME_MS &&
-      basepath != "/" && !lockLongPressBack) {
+void FileBrowserActivity::toggleHiddenFiles() {
+  const std::string currentEntry =
+      (!files.empty() && selectorIndex < files.size()) ? files[selectorIndex] : std::string();
+  SETTINGS.showHiddenFiles = SETTINGS.showHiddenFiles ? 0 : 1;
+  if (!SETTINGS.saveToFile()) {
+    LOG_ERR("FileBrowser", "Failed to save showHiddenFiles=%u", SETTINGS.showHiddenFiles);
+  }
+
+  if (!SETTINGS.showHiddenFiles && containsHiddenPathSegment(basepath)) {
     basepath = "/";
-    loadFiles();
-    selectorIndex = 0;
-    requestUpdate();
+  }
+
+  loadFiles();
+  selectorIndex = currentEntry.empty() ? 0 : findEntry(currentEntry);
+  if (!files.empty() && selectorIndex >= files.size()) {
+    selectorIndex = files.size() - 1;
+  }
+  requestUpdate();
+}
+
+void FileBrowserActivity::loop() {
+  if (pendingCompletedFeedback) {
+    const bool timedOut = (millis() - completedFeedbackShowTime) >= COMPLETED_FEEDBACK_MS;
+    const bool navPressed = mappedInput.wasReleased(MappedInputManager::Button::Left) ||
+                            mappedInput.wasReleased(MappedInputManager::Button::Right) ||
+                            mappedInput.wasReleased(MappedInputManager::Button::Up) ||
+                            mappedInput.wasReleased(MappedInputManager::Button::Down);
+    if (timedOut || navPressed) {
+      pendingCompletedFeedback = false;
+      requestUpdate();
+      return;
+    }
+  }
+
+  // Long press BACK/HOME (1s+) toggles hidden files (Books mode only).
+  // In firmware-pick mode we keep navigation simple: short Back = up dir / cancel.
+  if (mode == Mode::Books && !longPressBackHandled && mappedInput.isPressed(MappedInputManager::Button::Back) &&
+      mappedInput.getHeldTime() >= GO_HOME_MS && !lockLongPressBack) {
+    longPressBackHandled = true;
+    toggleHiddenFiles();
     return;
   }
 
@@ -286,15 +504,26 @@ void FileBrowserActivity::loop() {
   }
 
   const int pathReserved = renderer.getLineHeight(SMALL_FONT_ID) + UITheme::getInstance().getMetrics().verticalSpacing;
-  const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false, pathReserved);
+  int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false, pathReserved);
+  if (GUI.usesCompactFileBrowserRows()) {
+    const auto& metrics = UITheme::getInstance().getMetrics();
+    const int contentTop = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
+    const int contentHeight =
+        renderer.getScreenHeight() - contentTop - metrics.buttonHintsHeight - metrics.verticalSpacing - pathReserved;
+    pageItems = std::max(1, contentHeight / GUI.compactFileBrowserRowHeight(renderer));
+  }
 
   if (!files.empty()) {
     const std::string& entry = files[selectorIndex];
     const bool isDirectory = (entry.back() == '/');
-    if (!longPressConfirmHandled && !isDirectory && mappedInput.isPressed(MappedInputManager::Button::Confirm) &&
+    if (mode == Mode::Books && !longPressConfirmHandled && mappedInput.isPressed(MappedInputManager::Button::Confirm) &&
         mappedInput.getHeldTime() >= GO_HOME_MS) {
       longPressConfirmHandled = true;
-      showFileActionMenu(entry, true);
+      if (isDirectory) {
+        promptDeleteDirectory(buildFullPath(basepath, entry), entry, true);
+      } else {
+        showFileActionMenu(entry, true);
+      }
       return;
     }
   }
@@ -304,13 +533,32 @@ void FileBrowserActivity::loop() {
       longPressConfirmHandled = false;
       return;
     }
+    if (lockNextConfirmRelease) {
+      lockNextConfirmRelease = false;
+      return;
+    }
     if (files.empty()) return;
 
     const std::string& entry = files[selectorIndex];
     bool isDirectory = (entry.back() == '/');
 
-    if (mappedInput.getHeldTime() >= GO_HOME_MS && !isDirectory) {
-      showFileActionMenu(entry);
+    // Firmware picker: select file -> return path; navigate into directories normally.
+    if (mode == Mode::PickFirmware && !isDirectory) {
+      std::string cleanBasePath = basepath;
+      if (cleanBasePath.back() != '/') cleanBasePath += "/";
+      ActivityResult res{FilePathResult{cleanBasePath + entry}};
+      res.isCancelled = false;
+      setResult(std::move(res));
+      finish();
+      return;
+    }
+
+    if (mode == Mode::Books && mappedInput.getHeldTime() >= GO_HOME_MS) {
+      if (isDirectory) {
+        promptDeleteDirectory(buildFullPath(basepath, entry), entry);
+      } else {
+        showFileActionMenu(entry);
+      }
       return;
     } else {
       // --- SHORT PRESS ACTION: OPEN/NAVIGATE ---
@@ -329,6 +577,10 @@ void FileBrowserActivity::loop() {
   }
 
   if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+    if (longPressBackHandled) {
+      longPressBackHandled = false;
+      return;
+    }
     // Short press: go up one directory, or go home if at root
     if (mappedInput.getHeldTime() < GO_HOME_MS) {
       if (basepath != "/") {
@@ -343,6 +595,12 @@ void FileBrowserActivity::loop() {
         selectorIndex = findEntry(dirName);
 
         requestUpdate();
+      } else if (mode == Mode::PickFirmware) {
+        // Firmware picker at root: cancel back to caller instead of going home.
+        ActivityResult res;
+        res.isCancelled = true;
+        setResult(std::move(res));
+        finish();
       } else {
         onGoHome();
       }
@@ -402,20 +660,30 @@ void FileBrowserActivity::render(RenderLock&&) {
   const auto pageHeight = renderer.getScreenHeight();
   const auto& metrics = UITheme::getInstance().getMetrics();
 
-  std::string folderName = (basepath == "/") ? tr(STR_SD_CARD) : basepath.substr(basepath.rfind('/') + 1);
+  std::string folderName =
+      (mode == Mode::PickFirmware)
+          ? std::string(tr(STR_SELECT_FIRMWARE_FILE))
+          : ((basepath == "/") ? std::string(tr(STR_SD_CARD)) : basepath.substr(basepath.rfind('/') + 1));
   GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, folderName.c_str());
 
   const int pathLineHeight = renderer.getLineHeight(SMALL_FONT_ID);
   const int pathReserved = pathLineHeight + metrics.verticalSpacing;
+  const int pathY = pageHeight - metrics.buttonHintsHeight - metrics.verticalSpacing - pathLineHeight;
+  const int pathMaxWidth = pageWidth - metrics.contentSidePadding * 2;
   const int contentTop = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
   const int contentHeight =
       pageHeight - contentTop - metrics.buttonHintsHeight - metrics.verticalSpacing - pathReserved;
   if (files.empty()) {
-    renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding, contentTop + 20, tr(STR_NO_FILES_FOUND));
+    const char* emptyMsg = (mode == Mode::PickFirmware) ? tr(STR_NO_BIN_FILES) : tr(STR_NO_FILES_FOUND);
+    renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding, contentTop + 20, emptyMsg);
   } else {
+    const bool compactFileRows = GUI.usesCompactFileBrowserRows();
+    const std::function<std::string(int)> compactRowMarker =
+        compactFileRows ? [this](int index) { return files[index].back() == '/' ? "folder" : ""; }
+                        : std::function<std::string(int)>{};
     GUI.drawList(
         renderer, Rect{0, contentTop, pageWidth, contentHeight}, files.size(), selectorIndex,
-        [this](int index) { return getFileName(files[index]); }, nullptr,
+        [this](int index) { return getFileName(files[index]); }, compactRowMarker,
         [this](int index) { return UITheme::getFileIcon(files[index]); },
         [this](int index) {
           const std::string extension = getFileExtension(files[index]);
@@ -430,10 +698,8 @@ void FileBrowserActivity::render(RenderLock&&) {
 
   // Full path display
   {
-    const int pathY = pageHeight - metrics.buttonHintsHeight - metrics.verticalSpacing - pathLineHeight;
     const int separatorY = pathY - metrics.verticalSpacing / 2;
     renderer.drawLine(0, separatorY, pageWidth - 1, separatorY, 3, true);
-    const int pathMaxWidth = pageWidth - metrics.contentSidePadding * 2;
     // Left-truncate so the deepest directory is always visible
     const char* pathStr = basepath.c_str();
     const char* pathDisplay = pathStr;
@@ -456,11 +722,27 @@ void FileBrowserActivity::render(RenderLock&&) {
   }
 
   // Help text
-  const auto labels =
-      mappedInput.mapLabels(basepath == "/" ? tr(STR_HOME) : tr(STR_BACK), files.empty() ? "" : tr(STR_OPEN),
-                            files.empty() ? "" : tr(STR_DIR_UP), files.empty() ? "" : tr(STR_DIR_DOWN));
+  const char* backLabel = (basepath == "/") ? (mode == Mode::PickFirmware ? tr(STR_BACK) : tr(STR_HOME)) : tr(STR_BACK);
+  // In PickFirmware mode, Confirm on a .bin returns the path to the caller (not "open"); show
+  // STR_SELECT instead. Directories in the same picker still descend, so keep STR_OPEN there.
+  const bool selectingFirmwareFile = mode == Mode::PickFirmware && !files.empty() && files[selectorIndex].back() != '/';
+  const char* confirmLabel = files.empty() ? "" : (selectingFirmwareFile ? tr(STR_SELECT) : tr(STR_OPEN));
+  const auto labels = mappedInput.mapLabels(backLabel, confirmLabel, files.empty() ? "" : tr(STR_DIR_UP),
+                                            files.empty() ? "" : tr(STR_DIR_DOWN));
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
+  if (mode == Mode::Books && basepath == "/") {
+    const int usedPathWidth = renderer.getTextWidth(SMALL_FONT_ID, basepath.c_str());
+    const int hintMaxWidth = pathMaxWidth - usedPathWidth - ROOT_HINT_GAP;
+    const auto hint = renderer.truncatedText(SMALL_FONT_ID, tr(STR_TOGGLE_HIDDEN_FILES_HINT), hintMaxWidth);
+    const int hintWidth = renderer.getTextWidth(SMALL_FONT_ID, hint.c_str());
+    renderer.drawText(SMALL_FONT_ID, pageWidth - metrics.contentSidePadding - hintWidth, pathY, hint.c_str());
+  }
+
+  if (pendingCompletedFeedback) {
+    GUI.drawPopup(renderer, completedFeedbackIsFinished ? tr(STR_MARKED_FINISHED) : tr(STR_MARKED_UNFINISHED));
+  }
+
   renderer.displayBuffer();
 }
 
diff --git a/src/activities/home/FileBrowserActivity.h b/src/activities/home/FileBrowserActivity.h
index 6c444273..d31d387f 100644
--- a/src/activities/home/FileBrowserActivity.h
+++ b/src/activities/home/FileBrowserActivity.h
@@ -4,18 +4,27 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
 #include "RecentBooksStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class FileBrowserActivity final : public Activity {
+ public:
+  // Books = standard reader browser; PickFirmware = filter to .bin only and return path via ActivityResult.
+  enum class Mode { Books, PickFirmware };
+
  private:
   // Deletion
   void clearFileMetadata(const std::string& fullPath);
+  bool clearBookCache(const std::string& fullPath);
   void promptDeleteFile(const std::string& fullPath, const std::string& entry);
+  void promptDeleteDirectory(const std::string& fullPath, const std::string& entry,
+                             bool ignoreInitialConfirmRelease = false);
   void pinSleepFavorite(const std::string& fullPath);
   void unpinSleepFavorite();
   bool isPinnedSleepFavorite(const std::string& fullPath) const;
+  bool isEpubCompleted(const std::string& fullPath) const;
+  void toggleEpubCompleted(const std::string& fullPath, const std::string& entry);
   void showFileActionMenu(const std::string& entry, bool ignoreInitialConfirmRelease = false);
 
   ButtonNavigator buttonNavigator;
@@ -23,7 +32,16 @@ class FileBrowserActivity final : public Activity {
   size_t selectorIndex = 0;
 
   bool lockLongPressBack = false;
+  bool longPressBackHandled = false;
   bool longPressConfirmHandled = false;
+  bool pendingCompletedFeedback = false;
+  bool completedFeedbackIsFinished = false;
+  unsigned long completedFeedbackShowTime = 0UL;
+  // True when this activity was entered while Confirm was already held; we must swallow the next
+  // release so we don't immediately auto-open the first entry.
+  bool lockNextConfirmRelease = false;
+
+  Mode mode = Mode::Books;
 
   // Files state
   std::string basepath = "/";
@@ -31,11 +49,15 @@ class FileBrowserActivity final : public Activity {
 
   // Data loading
   void loadFiles();
+  void toggleHiddenFiles();
   size_t findEntry(const std::string& name) const;
 
  public:
-  explicit FileBrowserActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::string initialPath = "/")
-      : Activity("FileBrowser", renderer, mappedInput), basepath(initialPath.empty() ? "/" : std::move(initialPath)) {}
+  explicit FileBrowserActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::string initialPath = "/",
+                               Mode mode = Mode::Books)
+      : Activity("FileBrowser", renderer, mappedInput),
+        mode(mode),
+        basepath(initialPath.empty() ? "/" : std::move(initialPath)) {}
   void onEnter() override;
   void onExit() override;
   void loop() override;
diff --git a/src/activities/home/HomeActivity.cpp b/src/activities/home/HomeActivity.cpp
index 98d55807..b7ee31ee 100644
--- a/src/activities/home/HomeActivity.cpp
+++ b/src/activities/home/HomeActivity.cpp
@@ -1,6 +1,5 @@
 #include "HomeActivity.h"
 
-#include <Arduino.h>
 #include <Bitmap.h>
 #include <Epub.h>
 #include <FsHelpers.h>
@@ -8,14 +7,15 @@
 #include <HalStorage.h>
 #include <I18n.h>
 #include <Serialization.h>
-#include <Txt.h>
 #include <Utf8.h>
 #include <Xtc.h>
 
 #include <algorithm>
+#include <cinttypes>
 #include <cmath>
 #include <cstring>
 #include <functional>
+#include <string>
 #include <vector>
 
 #include "../reader/BookReadingStats.h"
@@ -26,15 +26,58 @@
 #include "CrossPointState.h"
 #include "MappedInputManager.h"
 #include "OpdsServerStore.h"
+#include "RecentBookProgress.h"
 #include "RecentBooksStore.h"
 #include "components/UITheme.h"
+#include "components/themes/lyra/LyraCarouselTheme.h"
+#include "components/themes/minimal/MinimalTheme.h"
 #include "fontIds.h"
 
 namespace {
-constexpr uint32_t TXT_CACHE_MAGIC = 0x54585449;  // "TXTI"
-constexpr uint8_t TXT_CACHE_VERSION = 2;
-
-float clampProgressPercent(const float progress) { return std::clamp(progress, 0.0f, 100.0f); }
+constexpr uint32_t CAROUSEL_CACHE_MAGIC = 0x43434152;  // "CCAR"
+constexpr uint16_t CAROUSEL_CACHE_VERSION = 2;
+constexpr char CAROUSEL_CACHE_PATH[] = "/.crosspoint/home_carousel_cache.bin";
+constexpr char CAROUSEL_CACHE_TMP_PATH[] = "/.crosspoint/home_carousel_cache.tmp";
+
+enum class HomeMenuAction {
+  BrowseFiles,
+  ContinueReading,
+  RecentBooks,
+  OpdsBrowser,
+  ReadingStats,
+  Bookmarks,
+  FileTransfer,
+  Settings,
+};
+
+struct HomeMenuItem {
+  const char* label;
+  UIIcon icon;
+  HomeMenuAction action;
+};
+
+struct CarouselCacheHeader {
+  uint32_t magic;
+  uint16_t version;
+  uint16_t frameCount;
+  uint32_t frameBufferSize;
+  uint64_t keyHash;
+  uint16_t screenWidth;
+  uint16_t screenHeight;
+  uint16_t centerCoverW;
+  uint16_t centerCoverH;
+  uint16_t sideCoverW;
+  uint16_t sideCoverH;
+};
+
+uint64_t fnvHash64(const std::string& s) {
+  uint64_t hash = 14695981039346656037ull;
+  for (char c : s) {
+    hash ^= static_cast<uint8_t>(c);
+    hash *= 1099511628211ull;
+  }
+  return hash;
+}
 
 bool hasAnyBookStats(const BookReadingStats& stats) {
   return stats.sessionCount > 0 || stats.totalReadingSeconds > 0 || stats.totalPagesTurned > 0 || stats.isCompleted;
@@ -45,145 +88,286 @@ bool hasAnyGlobalStats(const GlobalReadingStats& stats) {
          stats.completedBooks > 0;
 }
 
-float loadEpubProgressPercent(const RecentBook& book) {
-  Epub epub(book.path, "/.crosspoint");
-  if (!epub.load(false, true)) {
-    return -1.0f;
-  }
-
+void appendHashedFileStateToKey(std::string& key, const std::string& path) {
   FsFile file;
-  if (!Storage.openFileForRead("HOME", epub.getCachePath() + "/progress.bin", file)) {
-    return -1.0f;
+  if (!Storage.openFileForRead("HOME", path, file)) {
+    key += "missing";
+    key += '\0';
+    return;
   }
 
-  uint8_t data[6];
-  const int bytesRead = file.read(data, sizeof(data));
+  uint64_t hash = 14695981039346656037ull;
+  size_t totalBytes = 0;
+  uint8_t buffer[64];
+  while (true) {
+    const int bytesRead = file.read(buffer, sizeof(buffer));
+    if (bytesRead <= 0) break;
+    totalBytes += static_cast<size_t>(bytesRead);
+    for (int i = 0; i < bytesRead; ++i) {
+      hash ^= buffer[i];
+      hash *= 1099511628211ull;
+    }
+  }
   file.close();
-  if (bytesRead != 6) {
-    return -1.0f;
+
+  char digest[48];
+  snprintf(digest, sizeof(digest), "%zu:%" PRIu64, totalBytes, static_cast<uint64_t>(hash));
+  key += digest;
+  key += '\0';
+}
+
+std::string getRecentBookCachePath(const RecentBook& book) {
+  if (FsHelpers::hasEpubExtension(book.path)) {
+    return "/.crosspoint/epub_" + std::to_string(std::hash<std::string>{}(book.path));
   }
+  if (FsHelpers::hasXtcExtension(book.path)) {
+    return "/.crosspoint/xtc_" + std::to_string(std::hash<std::string>{}(book.path));
+  }
+  if (FsHelpers::hasTxtExtension(book.path) || FsHelpers::hasMarkdownExtension(book.path)) {
+    return "/.crosspoint/txt_" + std::to_string(std::hash<std::string>{}(book.path));
+  }
+  return "";
+}
 
-  const int spineIndex = data[0] | (data[1] << 8);
-  const int currentPage = data[2] | (data[3] << 8);
-  const int pageCount = data[4] | (data[5] << 8);
-  if (pageCount <= 0) {
-    return 0.0f;
+BookReadingStats loadRecentBookStats(const RecentBook& book) {
+  if (!FsHelpers::hasEpubExtension(book.path)) {
+    return BookReadingStats{};
   }
 
-  const float chapterProgress = static_cast<float>(currentPage + 1) / static_cast<float>(pageCount);
-  return clampProgressPercent(epub.calculateProgress(spineIndex, chapterProgress) * 100.0f);
+  const std::string cachePath = getRecentBookCachePath(book);
+  return BookReadingStats::load(cachePath);
 }
 
-float loadXtcProgressPercent(const RecentBook& book) {
-  Xtc xtc(book.path, "/.crosspoint");
-  if (!xtc.load()) {
-    return -1.0f;
+void updateRecentBookCoverPath(const RecentBook& book, const std::string& coverBmpPath) {
+  if (!RECENT_BOOKS.updateBook(book.path, book.title, book.author, coverBmpPath)) {
+    LOG_ERR("HOME", "failed to update recent book metadata: %s", book.path.c_str());
   }
+}
 
-  FsFile file;
-  if (!Storage.openFileForRead("HOME", xtc.getCachePath() + "/progress.bin", file)) {
-    return -1.0f;
-  }
+bool hasThumbnailPlaceholder(const std::string& coverBmpPath) {
+  return coverBmpPath.find("[WIDTH]") != std::string::npos || coverBmpPath.find("[HEIGHT]") != std::string::npos;
+}
 
-  uint8_t data[4];
-  const int bytesRead = file.read(data, sizeof(data));
-  file.close();
-  if (bytesRead != 4) {
-    return -1.0f;
+std::string getReusableCoverPath(const RecentBook& book) {
+  if (FsHelpers::hasEpubExtension(book.path)) {
+    return Epub(book.path, "/.crosspoint").getThumbBmpPath();
   }
-
-  const uint32_t currentPage = static_cast<uint32_t>(data[0]) | (static_cast<uint32_t>(data[1]) << 8) |
-                               (static_cast<uint32_t>(data[2]) << 16) | (static_cast<uint32_t>(data[3]) << 24);
-  return clampProgressPercent(static_cast<float>(xtc.calculateProgress(currentPage)));
+  if (FsHelpers::hasXtcExtension(book.path)) {
+    return Xtc(book.path, "/.crosspoint").getThumbBmpPath();
+  }
+  return book.coverBmpPath;
 }
 
-float loadTxtProgressPercent(const RecentBook& book) {
-  Txt txt(book.path, "/.crosspoint");
-  if (!txt.load()) {
-    return -1.0f;
+bool ensureReusableCoverPath(RecentBook& book) {
+  if (book.coverBmpPath.empty() || hasThumbnailPlaceholder(book.coverBmpPath)) {
+    return false;
   }
 
-  FsFile progressFile;
-  if (!Storage.openFileForRead("HOME", txt.getCachePath() + "/progress.bin", progressFile)) {
-    return -1.0f;
+  const std::string reusablePath = getReusableCoverPath(book);
+  if (reusablePath.empty() || reusablePath == book.coverBmpPath) {
+    return false;
   }
 
-  uint8_t progressData[4];
-  const int progressBytes = progressFile.read(progressData, sizeof(progressData));
-  progressFile.close();
-  if (progressBytes != 4) {
-    return -1.0f;
+  book.coverBmpPath = reusablePath;
+  updateRecentBookCoverPath(book, reusablePath);
+  return true;
+}
+
+std::vector<HomeMenuItem> buildHomeMenuItems(bool hasOpdsServers, bool hasReadingStats, bool hasBookmarks) {
+  std::vector<HomeMenuItem> items = {
+      {tr(STR_BROWSE_FILES), Folder, HomeMenuAction::BrowseFiles},
+      {tr(STR_MENU_RECENT_BOOKS), Recent, HomeMenuAction::RecentBooks},
+  };
+
+  if (hasOpdsServers) {
+    items.push_back({tr(STR_OPDS_BROWSER), Library, HomeMenuAction::OpdsBrowser});
+  }
+  if (hasReadingStats) {
+    items.push_back({tr(STR_READING_STATS), Chart, HomeMenuAction::ReadingStats});
   }
+  if (hasBookmarks) {
+    items.push_back({tr(STR_BOOKMARKS), BookmarkIcon, HomeMenuAction::Bookmarks});
+  }
+
+  items.push_back({tr(STR_FILE_TRANSFER), Transfer, HomeMenuAction::FileTransfer});
+  items.push_back({tr(STR_SETTINGS_TITLE), Settings, HomeMenuAction::Settings});
+  return items;
+}
 
-  const uint32_t currentPage = static_cast<uint32_t>(progressData[0]) | (static_cast<uint32_t>(progressData[1]) << 8);
+std::vector<HomeMenuItem> buildMinimalMenuItems(bool hasOpdsServers, bool hasReadingStats, bool hasBookmarks) {
+  std::vector<HomeMenuItem> items = {
+      {tr(STR_MENU_RECENT_BOOKS), Recent, HomeMenuAction::RecentBooks},
+  };
 
-  FsFile indexFile;
-  if (!Storage.openFileForRead("HOME", txt.getCachePath() + "/index.bin", indexFile)) {
-    return -1.0f;
+  if (hasOpdsServers) {
+    items.push_back({tr(STR_OPDS_BROWSER), Library, HomeMenuAction::OpdsBrowser});
   }
+  if (hasBookmarks) {
+    items.push_back({tr(STR_BOOKMARKS), BookmarkIcon, HomeMenuAction::Bookmarks});
+  }
+  if (hasReadingStats) {
+    items.push_back({tr(STR_READING_STATS), Chart, HomeMenuAction::ReadingStats});
+  }
+
+  items.push_back({tr(STR_FILE_TRANSFER), Transfer, HomeMenuAction::FileTransfer});
+  return items;
+}
 
-  uint32_t magic = 0;
-  serialization::readPod(indexFile, magic);
-  uint8_t version = 0;
-  serialization::readPod(indexFile, version);
-  uint32_t fileSize = 0;
-  serialization::readPod(indexFile, fileSize);
-  int32_t cachedWidth = 0;
-  serialization::readPod(indexFile, cachedWidth);
-  int32_t cachedLines = 0;
-  serialization::readPod(indexFile, cachedLines);
-  int32_t fontId = 0;
-  serialization::readPod(indexFile, fontId);
-  int32_t margin = 0;
-  serialization::readPod(indexFile, margin);
-  uint8_t alignment = 0;
-  serialization::readPod(indexFile, alignment);
-  uint32_t totalPages = 0;
-  serialization::readPod(indexFile, totalPages);
-  indexFile.close();
-  (void)cachedWidth;
-  (void)cachedLines;
-  (void)fontId;
-  (void)margin;
-  (void)alignment;
+bool isMinimalTheme() {
+  return static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme) == CrossPointSettings::UI_THEME::MINIMAL;
+}
+
+bool isAnyFrontButtonPressed(const MappedInputManager& mappedInput) {
+  return mappedInput.isFrontButtonPressed(HalGPIO::BTN_BACK) ||
+         mappedInput.isFrontButtonPressed(HalGPIO::BTN_CONFIRM) ||
+         mappedInput.isFrontButtonPressed(HalGPIO::BTN_LEFT) || mappedInput.isFrontButtonPressed(HalGPIO::BTN_RIGHT);
+}
+
+int minimalHomeNavCount(const bool hasCurrentBook) { return hasCurrentBook ? 4 : 3; }
+
+int minimalHomeCoverWidth(int coverHeight) { return static_cast<int>((static_cast<int64_t>(coverHeight) * 3 + 2) / 5); }
+
+std::string minimalHomeCoverPath(const RecentBook& book, int coverHeight) {
+  return UITheme::getCoverThumbPath(book.coverBmpPath, minimalHomeCoverWidth(coverHeight), coverHeight);
+}
+
+void appendCarouselCoverStateToKey(std::string& key, const RecentBook& book) {
+  key += book.path;
+  key += '\0';
+  key += book.coverBmpPath;
+  key += '\0';
 
-  if (magic != TXT_CACHE_MAGIC || version != TXT_CACHE_VERSION || fileSize != txt.getFileSize() || totalPages == 0) {
-    return -1.0f;
+  if (book.coverBmpPath.empty()) {
+    key += "0:0";
+    key += '\0';
+    return;
   }
 
-  return clampProgressPercent((static_cast<float>(currentPage + 1) / static_cast<float>(totalPages)) * 100.0f);
+  const std::string centerPath =
+      UITheme::getCoverThumbPath(book.coverBmpPath, LyraCarouselTheme::kCenterCoverW, LyraCarouselTheme::kCenterCoverH);
+  const std::string sidePath =
+      UITheme::getCoverThumbPath(book.coverBmpPath, LyraCarouselTheme::kSideCoverW, LyraCarouselTheme::kSideCoverH);
+  key += Storage.exists(centerPath.c_str()) ? '1' : '0';
+  key += ':';
+  key += Storage.exists(sidePath.c_str()) ? '1' : '0';
+  key += '\0';
+
+  const std::string cachePath = getRecentBookCachePath(book);
+  if (!cachePath.empty()) {
+    appendHashedFileStateToKey(key, cachePath + "/progress.bin");
+    if (FsHelpers::hasEpubExtension(book.path)) {
+      appendHashedFileStateToKey(key, cachePath + "/stats.bin");
+    }
+  } else {
+    key += "no-cache-path";
+    key += '\0';
+  }
 }
 
-float loadRecentBookProgressPercent(const RecentBook& book) {
-  if (FsHelpers::hasEpubExtension(book.path)) {
-    return loadEpubProgressPercent(book);
+void buildCarouselCacheKey(const std::vector<RecentBook>& recentBooks, std::string& key, uint64_t& keyHash) {
+  key.clear();
+  key.reserve(512);
+  for (const auto& book : recentBooks) {
+    appendCarouselCoverStateToKey(key, book);
   }
-  if (FsHelpers::hasXtcExtension(book.path)) {
-    return loadXtcProgressPercent(book);
+  appendHashedFileStateToKey(key, "/.crosspoint/global_stats.bin");
+  keyHash = fnvHash64(key);
+}
+
+bool isCarouselCacheHeaderValid(const CarouselCacheHeader& header, uint64_t cacheKeyHash, int bookCount,
+                                const GfxRenderer& renderer) {
+  return header.magic == CAROUSEL_CACHE_MAGIC && header.version == CAROUSEL_CACHE_VERSION &&
+         header.keyHash == cacheKeyHash && header.frameCount == bookCount &&
+         header.frameBufferSize == renderer.getBufferSize() && header.screenWidth == renderer.getScreenWidth() &&
+         header.screenHeight == renderer.getScreenHeight() && header.centerCoverW == LyraCarouselTheme::kCenterCoverW &&
+         header.centerCoverH == LyraCarouselTheme::kCenterCoverH &&
+         header.sideCoverW == LyraCarouselTheme::kSideCoverW && header.sideCoverH == LyraCarouselTheme::kSideCoverH;
+}
+
+bool readCarouselCacheHeader(FsFile& file, CarouselCacheHeader& header) {
+  CarouselCacheHeader readHeader{};
+  if (!serialization::tryReadPod(file, readHeader)) {
+    return false;
   }
-  if (FsHelpers::hasTxtExtension(book.path) || FsHelpers::hasMarkdownExtension(book.path)) {
-    return loadTxtProgressPercent(book);
+  header = readHeader;
+  return true;
+}
+
+bool hasValidCarouselDiskCache(const std::vector<RecentBook>& recentBooks, const GfxRenderer& renderer) {
+  const int bookCount = static_cast<int>(recentBooks.size());
+  if (bookCount <= 0) return false;
+
+  std::string cacheKey;
+  uint64_t cacheKeyHash = 0;
+  buildCarouselCacheKey(recentBooks, cacheKey, cacheKeyHash);
+
+  FsFile cacheFile;
+  if (!Storage.openFileForRead("HOME", CAROUSEL_CACHE_PATH, cacheFile)) {
+    return false;
   }
-  return -1.0f;
+
+  CarouselCacheHeader header{};
+  const bool readOk = readCarouselCacheHeader(cacheFile, header);
+  cacheFile.close();
+  return readOk && isCarouselCacheHeaderValid(header, cacheKeyHash, bookCount, renderer);
 }
 
-// Per-book stats live at /.crosspoint/{prefix}_{hash}/stats.bin where the
-// prefix tracks the format of the book file. Same dispatch as the progress
-// loader above so we resolve the right cache directory per book.
-std::string statsCachePathForBook(const std::string& bookPath) {
-  const char* prefix = nullptr;
-  if (FsHelpers::hasEpubExtension(bookPath)) prefix = "epub_";
-  else if (FsHelpers::hasXtcExtension(bookPath)) prefix = "xtc_";
-  else if (FsHelpers::hasTxtExtension(bookPath) || FsHelpers::hasMarkdownExtension(bookPath)) prefix = "txt_";
-  if (prefix == nullptr) return {};
-  return "/.crosspoint/" + std::string(prefix) + std::to_string(std::hash<std::string>{}(bookPath));
+int getHomeMenuSelectionOffset(const std::vector<RecentBook>& recentBooks) {
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  return metrics.homeContinueReadingInMenu ? 0 : static_cast<int>(recentBooks.size());
 }
 }  // namespace
 
+// ---------------------------------------------------------------------------
+// Static carousel frame cache — survives HomeActivity re-creation so that
+// returning to home (e.g. after settings) doesn't re-read covers from SD.
+// Freed explicitly in onSelectBook() before entering the reader.
+// ---------------------------------------------------------------------------
+namespace {
+class CarouselCache {
+ public:
+  uint8_t* frames[HomeActivity::kCarouselFrameCount] = {};
+  int frameBookIdx[HomeActivity::kCarouselFrameCount] = {-1};
+  int frameCount = 0;
+  int lastCenterIdx = -1;
+  std::string key;
+  uint64_t keyHash = 0;
+
+  int findFrameSlot(int bookIdx) const {
+    for (int i = 0; i < HomeActivity::kCarouselFrameCount; ++i) {
+      if (frameBookIdx[i] == bookIdx && frames[i] != nullptr) return i;
+    }
+    return -1;
+  }
+
+  void invalidate() {
+    for (int i = 0; i < HomeActivity::kCarouselFrameCount; ++i) {
+      if (frames[i]) {
+        free(frames[i]);
+        frames[i] = nullptr;
+      }
+      frameBookIdx[i] = -1;
+    }
+    frameCount = 0;
+    lastCenterIdx = -1;
+    key.clear();
+    keyHash = 0;
+  }
+};
+
+CarouselCache gCarouselCache;
+}  // namespace
+
+static_assert(HomeActivity::kMaxCachedBooks >= LyraCarouselMetrics::values.homeRecentBooksCount,
+              "kMaxCachedBooks must cover all carousel slots");
+
 int HomeActivity::getMenuItemCount() const {
+  const auto& metrics = UITheme::getInstance().getMetrics();
   int count = 4;  // File Browser, Recents, File transfer, Settings
-  if (!recentBooks.empty()) {
+  if (!metrics.homeContinueReadingInMenu && !recentBooks.empty()) {
     count += recentBooks.size();
+  } else if (metrics.homeContinueReadingInMenu && !recentBooks.empty()) {
+    count++;  // Continue Reading menu item
   }
   if (hasOpdsServers) {
     count++;
@@ -202,90 +386,173 @@ void HomeActivity::loadRecentBooks(int maxBooks) {
   const auto& books = RECENT_BOOKS.getBooks();
   recentBooks.reserve(std::min(static_cast<int>(books.size()), maxBooks));
 
-  for (const RecentBook& book : books) {
+  for (const RecentBook& storedBook : books) {
     // Limit to maximum number of recent books
     if (recentBooks.size() >= maxBooks) {
       break;
     }
 
-    // Skip if file no longer exists
+    RecentBook book = storedBook;
     if (!Storage.exists(book.path.c_str())) {
       continue;
     }
 
+    ensureReusableCoverPath(book);
     recentBooks.push_back(book);
   }
 }
 
+void HomeActivity::loadAllBookStats() {
+  const auto start = millis();
+  const int count = std::min(static_cast<int>(recentBooks.size()), kMaxCachedBooks);
+  for (int i = 0; i < count; ++i) {
+    cachedBookStats[i] = loadRecentBookStats(recentBooks[i]);
+    cachedBookProgress[i] = RecentBookProgress::loadPercent(recentBooks[i]);
+  }
+  bookStatsCached = true;
+  LOG_DBG("HOME", "carousel: cached stats/progress for %d book(s) in %lums", count, millis() - start);
+}
+
 void HomeActivity::loadRecentCovers(int coverHeight) {
   recentsLoading = true;
   bool showingLoading = false;
   Rect popupRect;
 
-  // ESP32-C3 has ~380 KB usable RAM and no PSRAM. Sequential thumb generation
-  // (EPUB load + JPEG decode + BMP write) fragments the heap; once free heap
-  // drops below this floor the next decode cannot find a contiguous block and
-  // crashes. Bail out early instead — the home screen renders with whatever
-  // covers loaded so far rather than bricking. See "more than 5 books bricks"
-  // bug, May 2026.
-  constexpr size_t MIN_FREE_HEAP_FOR_THUMB = 80 * 1024;
+  const bool isCarouselTheme =
+      static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme) == CrossPointSettings::UI_THEME::LYRA_CAROUSEL;
+  const bool isMinimal = isMinimalTheme();
+  const size_t recentBookCount = recentBooks.size();
+  // Tracks which book indices had a thumbnail generated this pass.
+  std::vector<char> bookUpdated(recentBookCount, false);
+  const int progressIncrement = 90 / static_cast<int>(std::max<size_t>(1, recentBookCount));
 
   int progress = 0;
-  for (RecentBook& book : recentBooks) {
-    // Skip stale entries: recent.bin may reference a book that was deleted
-    // from the SD card. Opening a missing path crashes inside Epub::load.
+  for (size_t bookIdx = 0; bookIdx < recentBooks.size(); ++bookIdx) {
+    RecentBook& book = recentBooks[bookIdx];
     if (!Storage.exists(book.path.c_str())) {
       progress++;
       continue;
     }
     if (!book.coverBmpPath.empty()) {
-      std::string coverPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverHeight);
-      if (!Storage.exists(coverPath.c_str())) {
-        // Heap-floor guard before each fresh thumb gen. If we're already low,
-        // stop the loop entirely so the remaining cards render as fallbacks
-        // instead of risking an OOM mid-decode.
-        const uint32_t freeHeap = ESP.getFreeHeap();
-        if (freeHeap < MIN_FREE_HEAP_FOR_THUMB) {
-          LOG_ERR("HOME", "Skipping remaining thumb gen (free heap %u < %u)", freeHeap,
-                  static_cast<unsigned>(MIN_FREE_HEAP_FOR_THUMB));
-          break;
-        }
-        // If epub, try to load the metadata for title/author and cover
-        if (FsHelpers::hasEpubExtension(book.path)) {
-          Epub epub(book.path, "/.crosspoint");
-          // Skip loading css since we only need metadata here
-          epub.load(false, true);
-
-          // Try to generate thumbnail image for Continue Reading card
-          if (!showingLoading) {
-            showingLoading = true;
-            popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
-          }
-          GUI.fillPopupProgress(renderer, popupRect, 10 + progress * (90 / recentBooks.size()));
-          bool success = epub.generateThumbBmp(coverHeight);
-          if (!success) {
-            RECENT_BOOKS.updateBook(book.path, book.title, book.author, "");
-            book.coverBmpPath = "";
+      if (isCarouselTheme) {
+        // For carousel: generate exact-size thumbnails for center and side slots.
+        // Load the source image once even when both sizes are missing.
+        const std::string centerPath = UITheme::getCoverThumbPath(book.coverBmpPath, LyraCarouselTheme::kCenterCoverW,
+                                                                  LyraCarouselTheme::kCenterCoverH);
+        const std::string sidePath = UITheme::getCoverThumbPath(book.coverBmpPath, LyraCarouselTheme::kSideCoverW,
+                                                                LyraCarouselTheme::kSideCoverH);
+        const bool centerMissing = !Storage.exists(centerPath.c_str());
+        const bool sideMissing = !Storage.exists(sidePath.c_str());
+
+        if (centerMissing || sideMissing) {
+          if (FsHelpers::hasEpubExtension(book.path)) {
+            Epub epub(book.path, "/.crosspoint");
+            if (!showingLoading) {
+              showingLoading = true;
+              popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
+            }
+            GUI.fillPopupProgress(renderer, popupRect, 10 + progress * progressIncrement);
+            if (!epub.load(false, true)) {
+              LOG_ERR("HOME", "carousel: failed to load EPUB cache for thumb generation: %s", book.path.c_str());
+              updateRecentBookCoverPath(book, "");
+              book.coverBmpPath = "";
+              coverRendered = false;
+              requestUpdate();
+              progress++;
+              continue;
+            }
+            bool success = true;
+            if (centerMissing)
+              success =
+                  epub.generateThumbBmp(LyraCarouselTheme::kCenterCoverW, LyraCarouselTheme::kCenterCoverH) && success;
+            if (sideMissing)
+              success =
+                  epub.generateThumbBmp(LyraCarouselTheme::kSideCoverW, LyraCarouselTheme::kSideCoverH) && success;
+            if (!success) {
+              updateRecentBookCoverPath(book, "");
+              book.coverBmpPath = "";
+            } else {
+              bookUpdated[bookIdx] = true;
+            }
+            coverRendered = false;
+            requestUpdate();
+          } else if (FsHelpers::hasXtcExtension(book.path)) {
+            Xtc xtc(book.path, "/.crosspoint");
+            if (xtc.load()) {
+              if (!showingLoading) {
+                showingLoading = true;
+                popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
+              }
+              GUI.fillPopupProgress(renderer, popupRect, 10 + progress * progressIncrement);
+              bool success = true;
+              if (centerMissing)
+                success =
+                    xtc.generateThumbBmp(LyraCarouselTheme::kCenterCoverW, LyraCarouselTheme::kCenterCoverH) && success;
+              if (sideMissing)
+                success =
+                    xtc.generateThumbBmp(LyraCarouselTheme::kSideCoverW, LyraCarouselTheme::kSideCoverH) && success;
+              if (!success) {
+                updateRecentBookCoverPath(book, "");
+                book.coverBmpPath = "";
+              } else {
+                bookUpdated[bookIdx] = true;
+              }
+              coverRendered = false;
+              requestUpdate();
+            }
           }
-          coverRendered = false;
-          requestUpdate();
-        } else if (FsHelpers::hasXtcExtension(book.path)) {
-          // Handle XTC file
-          Xtc xtc(book.path, "/.crosspoint");
-          if (xtc.load()) {
-            // Try to generate thumbnail image for Continue Reading card
+        }
+      } else {
+        // Non-carousel: generate height-keyed thumbnail
+        const bool useMinimalThumb = isMinimal && FsHelpers::hasEpubExtension(book.path);
+        const std::string coverPath = useMinimalThumb ? minimalHomeCoverPath(book, coverHeight)
+                                                      : UITheme::getCoverThumbPath(book.coverBmpPath, coverHeight);
+        if (coverPath.empty() || !Storage.exists(coverPath.c_str())) {
+          if (FsHelpers::hasEpubExtension(book.path)) {
+            Epub epub(book.path, "/.crosspoint");
             if (!showingLoading) {
               showingLoading = true;
               popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
             }
-            GUI.fillPopupProgress(renderer, popupRect, 10 + progress * (90 / recentBooks.size()));
-            bool success = xtc.generateThumbBmp(coverHeight);
+            GUI.fillPopupProgress(renderer, popupRect, 10 + progress * progressIncrement);
+            if (!epub.load(false, true)) {
+              LOG_ERR("HOME", "failed to load EPUB cache for thumb generation: %s", book.path.c_str());
+              updateRecentBookCoverPath(book, "");
+              book.coverBmpPath = "";
+              coverRendered = false;
+              requestUpdate();
+              progress++;
+              continue;
+            }
+            const bool success = useMinimalThumb
+                                     ? epub.generateThumbBmp(minimalHomeCoverWidth(coverHeight), coverHeight)
+                                     : epub.generateThumbBmp(0, coverHeight);
             if (!success) {
-              RECENT_BOOKS.updateBook(book.path, book.title, book.author, "");
+              updateRecentBookCoverPath(book, "");
               book.coverBmpPath = "";
+            } else {
+              bookUpdated[bookIdx] = true;  // non-carousel path reuses same tracking
             }
             coverRendered = false;
             requestUpdate();
+          } else if (FsHelpers::hasXtcExtension(book.path)) {
+            Xtc xtc(book.path, "/.crosspoint");
+            if (xtc.load()) {
+              if (!showingLoading) {
+                showingLoading = true;
+                popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
+              }
+              GUI.fillPopupProgress(renderer, popupRect, 10 + progress * progressIncrement);
+              bool success = xtc.generateThumbBmp(coverHeight);
+              if (!success) {
+                updateRecentBookCoverPath(book, "");
+                book.coverBmpPath = "";
+              } else {
+                bookUpdated[bookIdx] = true;
+              }
+              coverRendered = false;
+              requestUpdate();
+            }
           }
         }
       }
@@ -295,57 +562,133 @@ void HomeActivity::loadRecentCovers(int coverHeight) {
 
   recentsLoaded = true;
   recentsLoading = false;
+
+  // Re-render only the affected slots rather than rebuilding the entire cache.
+  if (isCarouselTheme) {
+    bool anyUpdated = false;
+    for (int i = 0; i < static_cast<int>(recentBooks.size()); ++i) {
+      if (static_cast<size_t>(i) >= bookUpdated.size() || !bookUpdated[i]) continue;
+      anyUpdated = true;
+      if (carouselFramesReady) {
+        // Only re-render the slot holding this book; books outside the window
+        // will be picked up by updateSlidingWindowCache on next navigation.
+        const int slot = gCarouselCache.findFrameSlot(i);
+        if (slot >= 0) renderCarouselFrame(i, slot);
+      }
+    }
+    if (anyUpdated) {
+      if (!carouselFramesReady) {
+        // Cover assets changed before the carousel cache was initialised, so
+        // any existing SD snapshot may still contain placeholder frames.
+        // Force a rebuild from the fresh thumbs instead of reusing stale
+        // `home_carousel_cache.bin` content keyed only by book order/layout.
+        if (Storage.exists(CAROUSEL_CACHE_PATH)) {
+          Storage.remove(CAROUSEL_CACHE_PATH);
+        }
+        if (Storage.exists(CAROUSEL_CACHE_TMP_PATH)) {
+          Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+        }
+        preRenderCarouselFrames();
+      } else {
+        // The live carousel frames are already updated above. Keep Home
+        // responsive by invalidating any stale SD snapshot instead of
+        // rewriting all 5 frames synchronously on this return-to-Home path.
+        if (Storage.exists(CAROUSEL_CACHE_PATH)) {
+          Storage.remove(CAROUSEL_CACHE_PATH);
+        }
+        if (Storage.exists(CAROUSEL_CACHE_TMP_PATH)) {
+          Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+        }
+      }
+      requestUpdate();
+    }
+  }
 }
 
 void HomeActivity::onEnter() {
   Activity::onEnter();
 
   hasOpdsServers = OPDS_STORE.hasServers();
+  const bool isCarouselTheme =
+      static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme) == CrossPointSettings::UI_THEME::LYRA_CAROUSEL;
 
   // Check if any books have bookmarks (directory scan only, no file parsing)
   hasBookmarks = BookmarkStore::hasAnyBookmarks();
 
   selectorIndex = 0;
+  lastCarouselBookIndex = 0;
+  minimalMenuOpen = false;
+  minimalSuppressInitialFrontRelease = isMinimalTheme();
+  minimalMenuIndex = 0;
+  minimalHomeNavIndex = -1;
+  carouselFramesReady = false;
+  carouselWarmupPending = isCarouselTheme;
 
   const auto& metrics = UITheme::getInstance().getMetrics();
   loadRecentBooks(metrics.homeRecentBooksCount);
 
-  // Load reading stats for the most recent EPUB book so they can be shown on the home card.
-  currentBookStats = BookReadingStats{};
-  currentBookProgressPercent = -1.0f;
-  if (!recentBooks.empty() && FsHelpers::hasEpubExtension(recentBooks[0].path)) {
-    const std::string cachePath = "/.crosspoint/epub_" + std::to_string(std::hash<std::string>{}(recentBooks[0].path));
-    currentBookStats = BookReadingStats::load(cachePath);
+  if (!APP_STATE.openEpubPath.empty()) {
+    for (int i = 0; i < static_cast<int>(recentBooks.size()); ++i) {
+      if (recentBooks[i].path == APP_STATE.openEpubPath) {
+        selectorIndex = i;
+        lastCarouselBookIndex = i;
+        break;
+      }
+    }
   }
-  if (!recentBooks.empty()) {
-    currentBookProgressPercent = loadRecentBookProgressPercent(recentBooks[0]);
+
+  globalStats = GlobalReadingStats::load();
+  if (isCarouselTheme) {
+    loadAllBookStats();
   }
+  updateHighlightedBookContext();
 
-  // Eagerly load per-book stats for the carousel covers. Each load is a
-  // 12-byte file; with homeRecentBooksCount capped at 5 this is negligible
-  // and cheaper than re-reading on every carousel scroll.
-  recentBookStats.clear();
-  recentBookStats.reserve(recentBooks.size());
-  for (const auto& book : recentBooks) {
-    BookReadingStats stats;
-    const std::string path = statsCachePathForBook(book.path);
-    if (!path.empty()) {
-      stats = BookReadingStats::load(path);
-    }
-    recentBookStats.push_back(stats);
+  if (isCarouselTheme && hasValidCarouselDiskCache(recentBooks, renderer)) {
+    preRenderCarouselFrames(false);
   }
-  globalStats = GlobalReadingStats::load();
-  hasReadingStats = hasAnyBookStats(currentBookStats) || hasAnyGlobalStats(globalStats);
 
-  // Trigger first update
   requestUpdate();
 }
 
+int HomeActivity::getHighlightedBookIndex() const {
+  if (recentBooks.empty()) {
+    return -1;
+  }
+
+  const int bookCount = static_cast<int>(recentBooks.size());
+  const int highlightedBookIdx = (selectorIndex < bookCount) ? selectorIndex : lastCarouselBookIndex;
+  return std::clamp(highlightedBookIdx, 0, bookCount - 1);
+}
+
+void HomeActivity::updateHighlightedBookContext() {
+  const auto start = millis();
+  currentBookStats = BookReadingStats{};
+  currentBookProgressPercent = -1.0f;
+
+  const int idx = getHighlightedBookIndex();
+  const bool useCachedStats = idx >= 0 && bookStatsCached && idx < kMaxCachedBooks;
+  if (idx >= 0) {
+    if (useCachedStats) {
+      currentBookStats = cachedBookStats[idx];
+      currentBookProgressPercent = cachedBookProgress[idx];
+    } else {
+      currentBookStats = loadRecentBookStats(recentBooks[idx]);
+      currentBookProgressPercent = RecentBookProgress::loadPercent(recentBooks[idx]);
+    }
+  }
+
+  hasReadingStats = hasAnyBookStats(currentBookStats) || hasAnyGlobalStats(globalStats);
+  LOG_DBG("HOME", "carousel: updateHighlightedBookContext idx=%d cached=%s took %lums", idx,
+          useCachedStats ? "yes" : "no", millis() - start);
+}
+
 void HomeActivity::onExit() {
   Activity::onExit();
 
-  // Free the stored cover buffer if any
   freeCoverBuffer();
+  gCarouselCache.invalidate();
+  freeCarouselFrames();
+  carouselWarmupPending = false;
 }
 
 bool HomeActivity::storeCoverBuffer() {
@@ -390,93 +733,649 @@ void HomeActivity::freeCoverBuffer() {
   coverBufferStored = false;
 }
 
-void HomeActivity::loop() {
-  const int menuCount = getMenuItemCount();
-  const int recentCount = static_cast<int>(recentBooks.size());
-  const bool inCarousel = static_cast<int>(selectorIndex) < recentCount;
-
-  // Up/Down rocker → menu navigation only. From the carousel, the first press
-  // jumps into the menu (Down → first item, Up → last item). Falling off the
-  // menu boundaries (Up from first item, Down from last item) drops back to
-  // the first book — the carousel is "home base", so vertical motion past
-  // the menu always returns there.
-  // Falling off either menu boundary drops back into the carousel on the
-  // book that's currently centered (lastBookIndex), not book 0. The carousel
-  // already shows that book while the user navigates the menu (see render's
-  // carouselDisplayIndex encoding), so this just makes the selection match
-  // what's already visible.
-  const int returnToBookIndex = (lastBookIndex >= 0 && lastBookIndex < recentCount) ? lastBookIndex : 0;
-  if (mappedInput.wasReleased(MappedInputManager::Button::Down)) {
-    if (inCarousel) {
-      lastBookIndex = selectorIndex;
-      selectorIndex = recentCount;
-    } else if (selectorIndex >= menuCount - 1) {
-      selectorIndex = returnToBookIndex;
-    } else {
-      ++selectorIndex;
+void HomeActivity::freeCarouselFrames() {
+  // Instance pointers are aliases into the static cache — do not free here.
+  for (int i = 0; i < kCarouselFrameCount; ++i) carouselFrames[i] = nullptr;
+  carouselFramesReady = false;
+}
+
+bool HomeActivity::allocateCarouselFrameSlots(int targetFrameCount) {
+  const size_t bufferSize = renderer.getBufferSize();
+  int frameCount = 0;
+  for (int attemptFrameCount = targetFrameCount; attemptFrameCount >= 1; --attemptFrameCount) {
+    bool allocFailed = false;
+    for (int i = 0; i < attemptFrameCount; ++i) {
+      gCarouselCache.frames[i] = static_cast<uint8_t*>(malloc(bufferSize));
+      if (!gCarouselCache.frames[i]) {
+        LOG_ERR("HOME", "preRenderCarouselFrames: malloc failed for frame %d while allocating %d frame(s)", i,
+                attemptFrameCount);
+        allocFailed = true;
+        break;
+      }
+      gCarouselCache.frameBookIdx[i] = -1;
     }
-    requestUpdate();
+
+    if (!allocFailed) {
+      frameCount = attemptFrameCount;
+      break;
+    }
+
+    for (int i = 0; i < attemptFrameCount; ++i) {
+      if (gCarouselCache.frames[i]) {
+        free(gCarouselCache.frames[i]);
+        gCarouselCache.frames[i] = nullptr;
+      }
+      gCarouselCache.frameBookIdx[i] = -1;
+    }
+  }
+
+  if (frameCount == 0) {
+    gCarouselCache.invalidate();
+    return false;
   }
-  if (mappedInput.wasReleased(MappedInputManager::Button::Up)) {
-    if (inCarousel) {
-      lastBookIndex = selectorIndex;
-      selectorIndex = menuCount - 1;
-    } else if (selectorIndex <= recentCount) {
-      selectorIndex = returnToBookIndex;
+
+  gCarouselCache.frameCount = frameCount;
+  LOG_INF("HOME", "carousel: frame cache capacity %d/%d", frameCount, targetFrameCount);
+  return true;
+}
+
+void HomeActivity::renderCarouselFrameToCurrentBuffer(int bookIdx, BookReadingStats* outStats,
+                                                      float* outProgressPercent, bool* outUsedCachedStats) {
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  const int pageWidth = renderer.getScreenWidth();
+  const int pageHeight = renderer.getScreenHeight();
+  const int bookCount = static_cast<int>(recentBooks.size());
+  bool dummy1 = false, dummy2 = false, dummy3 = false;
+  BookReadingStats frameStats;
+  const BookReadingStats* frameStatsPtr = nullptr;
+  float frameProgressPercent = -1.0f;
+  bool usedCachedStats = false;
+
+  if (bookIdx >= 0 && bookIdx < bookCount) {
+    if (bookStatsCached && bookIdx < kMaxCachedBooks) {
+      usedCachedStats = true;
+      frameStats = cachedBookStats[bookIdx];
+      frameProgressPercent = cachedBookProgress[bookIdx];
     } else {
-      --selectorIndex;
+      frameStats = loadRecentBookStats(recentBooks[bookIdx]);
+      frameProgressPercent = RecentBookProgress::loadPercent(recentBooks[bookIdx]);
     }
-    requestUpdate();
+    if (hasAnyBookStats(frameStats)) frameStatsPtr = &frameStats;
+  }
+
+  LyraCarouselTheme::setPreRenderIndex(bookIdx);
+  renderer.clearScreen();
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.homeTopPadding}, nullptr);
+  GUI.drawRecentBookCover(
+      renderer, Rect{0, metrics.homeTopPadding, pageWidth, metrics.homeCoverTileHeight}, recentBooks, bookCount, dummy1,
+      dummy2, dummy3, []() { return true; }, frameStatsPtr, frameProgressPercent);
+
+  const bool frameHasReadingStats = hasAnyBookStats(frameStats) || hasAnyGlobalStats(globalStats);
+  const auto menuItems = buildHomeMenuItems(hasOpdsServers, frameHasReadingStats, hasBookmarks);
+  GUI.drawButtonMenu(
+      renderer,
+      Rect{0, metrics.homeTopPadding + metrics.homeCoverTileHeight + metrics.verticalSpacing, pageWidth,
+           pageHeight - (metrics.headerHeight + metrics.homeTopPadding + metrics.verticalSpacing * 2 +
+                         metrics.buttonHintsHeight)},
+      static_cast<int>(menuItems.size()), -1, [&menuItems](int index) { return std::string(menuItems[index].label); },
+      [&menuItems](int index) { return menuItems[index].icon; });
+
+  const auto labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT));
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+
+  if (outStats) *outStats = frameStats;
+  if (outProgressPercent) *outProgressPercent = frameProgressPercent;
+  if (outUsedCachedStats) *outUsedCachedStats = usedCachedStats;
+}
+
+bool HomeActivity::buildCarouselCacheFile(const std::string& cacheKey, uint64_t cacheKeyHash, int bookCount,
+                                          bool showProgressPopup) {
+  (void)cacheKey;
+  uint8_t* frameBuffer = renderer.getFrameBuffer();
+  if (!frameBuffer || bookCount <= 0) return false;
+
+  Storage.mkdir("/.crosspoint");
+  if (Storage.exists(CAROUSEL_CACHE_TMP_PATH)) {
+    Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+  }
+
+  FsFile file;
+  if (!Storage.openFileForWrite("HOME", CAROUSEL_CACHE_TMP_PATH, file)) {
+    return false;
+  }
+
+  const CarouselCacheHeader header = {
+      CAROUSEL_CACHE_MAGIC,
+      CAROUSEL_CACHE_VERSION,
+      static_cast<uint16_t>(bookCount),
+      static_cast<uint32_t>(renderer.getBufferSize()),
+      cacheKeyHash,
+      static_cast<uint16_t>(renderer.getScreenWidth()),
+      static_cast<uint16_t>(renderer.getScreenHeight()),
+      static_cast<uint16_t>(LyraCarouselTheme::kCenterCoverW),
+      static_cast<uint16_t>(LyraCarouselTheme::kCenterCoverH),
+      static_cast<uint16_t>(LyraCarouselTheme::kSideCoverW),
+      static_cast<uint16_t>(LyraCarouselTheme::kSideCoverH),
+  };
+  if (!serialization::tryWritePod(file, header)) {
+    file.close();
+    Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+    LOG_ERR("HOME", "carousel: failed to write SD cache header");
+    return false;
   }
 
-  // Left/Right side buttons → carousel navigation only. From the menu, the
-  // first press drops back to the last book the user was on. Inside the
-  // carousel it wraps end-to-end.
-  if (recentCount > 0 && mappedInput.wasReleased(MappedInputManager::Button::Right)) {
-    if (!inCarousel) {
-      selectorIndex = lastBookIndex < recentCount ? lastBookIndex : 0;
+  const auto start = millis();
+  Rect popupRect{};
+  uint8_t* progressFrameBuffer = nullptr;
+  const size_t bufferSize = renderer.getBufferSize();
+  if (showProgressPopup) {
+    progressFrameBuffer = static_cast<uint8_t*>(malloc(bufferSize));
+    if (!progressFrameBuffer) {
+      LOG_ERR("HOME", "carousel: failed to allocate progress overlay buffer");
+      showProgressPopup = false;
     } else {
-      selectorIndex = (selectorIndex + 1) % recentCount;
+      popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
+      GUI.fillPopupProgress(renderer, popupRect, 0);
+      memcpy(progressFrameBuffer, frameBuffer, bufferSize);
     }
-    requestUpdate();
   }
-  if (recentCount > 0 && mappedInput.wasReleased(MappedInputManager::Button::Left)) {
-    if (!inCarousel) {
-      selectorIndex = lastBookIndex < recentCount ? lastBookIndex : 0;
+  bool writeFailed = false;
+  for (int i = 0; i < bookCount; ++i) {
+    const int cachedSlot = gCarouselCache.findFrameSlot(i);
+    if (cachedSlot >= 0 && carouselFrames[cachedSlot]) {
+      memcpy(frameBuffer, carouselFrames[cachedSlot], renderer.getBufferSize());
     } else {
-      selectorIndex = (selectorIndex == 0) ? recentCount - 1 : selectorIndex - 1;
+      renderCarouselFrameToCurrentBuffer(i, nullptr, nullptr, nullptr);
     }
-    requestUpdate();
+    if (file.write(frameBuffer, renderer.getBufferSize()) != renderer.getBufferSize()) {
+      writeFailed = true;
+      break;
+    }
+    if (showProgressPopup) {
+      memcpy(frameBuffer, progressFrameBuffer, bufferSize);
+      GUI.fillPopupProgress(renderer, popupRect, ((i + 1) * 100) / bookCount);
+    }
+  }
+
+  const bool syncOk = file.sync();
+  file.close();
+
+  if (writeFailed || !syncOk) {
+    free(progressFrameBuffer);
+    Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+    LOG_ERR("HOME", "carousel: failed to write SD cache snapshot");
+    return false;
+  }
+
+  if (Storage.exists(CAROUSEL_CACHE_PATH)) {
+    Storage.remove(CAROUSEL_CACHE_PATH);
+  }
+  if (!Storage.rename(CAROUSEL_CACHE_TMP_PATH, CAROUSEL_CACHE_PATH)) {
+    free(progressFrameBuffer);
+    Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+    LOG_ERR("HOME", "carousel: failed to promote SD cache snapshot");
+    return false;
+  }
+
+  free(progressFrameBuffer);
+  LOG_DBG("HOME", "carousel: built SD cache for %d book(s) in %lums", bookCount, millis() - start);
+  return true;
+}
+
+bool HomeActivity::loadCarouselFrameFromDisk(uint64_t cacheKeyHash, int bookCount, int bookIdx, int slotIdx) {
+  if (slotIdx < 0 || slotIdx >= kCarouselFrameCount || !gCarouselCache.frames[slotIdx] || bookIdx < 0 ||
+      bookIdx >= bookCount) {
+    return false;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("HOME", CAROUSEL_CACHE_PATH, file)) {
+    return false;
+  }
+
+  CarouselCacheHeader header{};
+  if (!readCarouselCacheHeader(file, header) ||
+      !isCarouselCacheHeaderValid(header, cacheKeyHash, bookCount, renderer)) {
+    file.close();
+    return false;
+  }
+
+  const size_t frameOffset = sizeof(CarouselCacheHeader) + static_cast<size_t>(bookIdx) * renderer.getBufferSize();
+  if (!file.seek(frameOffset)) {
+    file.close();
+    return false;
+  }
+  const size_t expectedBytes = renderer.getBufferSize();
+  size_t totalBytesRead = 0;
+  while (totalBytesRead < expectedBytes) {
+    const int bytesRead = file.read(gCarouselCache.frames[slotIdx] + totalBytesRead, expectedBytes - totalBytesRead);
+    if (bytesRead <= 0) {
+      break;
+    }
+    totalBytesRead += static_cast<size_t>(bytesRead);
+  }
+  file.close();
+  if (totalBytesRead != expectedBytes) {
+    LOG_ERR("HOME", "carousel: short read for slot %d (%zu/%zu bytes)", slotIdx, totalBytesRead, expectedBytes);
+    return false;
+  }
+
+  gCarouselCache.frameBookIdx[slotIdx] = bookIdx;
+  carouselFrames[slotIdx] = gCarouselCache.frames[slotIdx];
+  return true;
+}
+
+int HomeActivity::chooseCarouselEvictionSlot(int centerIdx, int bookCount, std::optional<int> protectedBookIdx) const {
+  for (int i = 0; i < kCarouselFrameCount; ++i) {
+    if (gCarouselCache.frames[i] && gCarouselCache.frameBookIdx[i] < 0) {
+      return i;
+    }
+  }
+
+  int evictSlot = -1;
+  int maxDist = -1;
+  for (int i = 0; i < kCarouselFrameCount; ++i) {
+    if (!gCarouselCache.frames[i]) continue;
+    const int cachedBookIdx = gCarouselCache.frameBookIdx[i];
+    if (protectedBookIdx.has_value() && cachedBookIdx == protectedBookIdx.value()) continue;
+    const int diff = std::abs(cachedBookIdx - centerIdx);
+    const int dist = std::min(diff, bookCount - diff);
+    if (dist > maxDist) {
+      maxDist = dist;
+      evictSlot = i;
+    }
+  }
+  return evictSlot;
+}
+
+bool HomeActivity::preRenderCarouselFrames(bool showProgressPopup) {
+  const int bookCount = static_cast<int>(recentBooks.size());
+  if (bookCount == 0) return false;
+  bool showedProgressPopup = false;
+
+  // Build cache key from book paths plus thumb-asset availability so we don't
+  // reuse a stale snapshot built before carousel-sized thumbs existed.
+  std::string newKey;
+  uint64_t newKeyHash = 0;
+  buildCarouselCacheKey(recentBooks, newKey, newKeyHash);
+
+  // Cache hit: same books in same order — reuse without any SD reads
+  if (newKey == gCarouselCache.key && gCarouselCache.frameCount > 0) {
+    for (int i = 0; i < gCarouselCache.frameCount; ++i) carouselFrames[i] = gCarouselCache.frames[i];
+    carouselFramesReady = true;
+    coverRendered = false;
+    coverBufferStored = false;
+    return false;
+  }
+
+  // Cache miss: free old cache and re-render
+  if (!renderer.getFrameBuffer()) return false;
+  freeCoverBuffer();  // reclaim 48KB before allocating frames
+  gCarouselCache.invalidate();
+
+  const int targetFrameCount = std::min(bookCount, kCarouselFrameCount);
+  bool diskCacheValid = false;
+  FsFile cacheFile;
+  if (Storage.openFileForRead("HOME", CAROUSEL_CACHE_PATH, cacheFile)) {
+    CarouselCacheHeader header{};
+    const bool readOk = readCarouselCacheHeader(cacheFile, header);
+    cacheFile.close();
+    diskCacheValid = readOk && isCarouselCacheHeaderValid(header, newKeyHash, bookCount, renderer);
+  }
+
+  if (!allocateCarouselFrameSlots(targetFrameCount)) {
+    return showedProgressPopup;
+  }
+
+  // Keep only the current frame in RAM; adjacent frames come from the SD
+  // snapshot on demand instead of occupying another framebuffer-sized slot.
+  const int selectedBookIdx = (selectorIndex < bookCount) ? selectorIndex : lastCarouselBookIndex;
+  const int initialBookIdx = (selectedBookIdx >= 0 && selectedBookIdx < bookCount) ? selectedBookIdx : 0;
+  auto loadOrRender = [&](int bookIdx, int slot) {
+    if (!diskCacheValid || !loadCarouselFrameFromDisk(newKeyHash, bookCount, bookIdx, slot)) {
+      renderCarouselFrame(bookIdx, slot);
+    }
+  };
+  loadOrRender(initialBookIdx, 0);
+  gCarouselCache.lastCenterIdx = initialBookIdx;
+
+  if (gCarouselCache.frameCount >= 2 && bookCount >= 2) {
+    const int nextIdx = (initialBookIdx + 1) % bookCount;
+    loadOrRender(nextIdx, 1);
+  }
+
+  if (gCarouselCache.frameCount >= 3 && bookCount >= 3) {
+    const int prevIdx = (initialBookIdx + bookCount - 1) % bookCount;
+    loadOrRender(prevIdx, 2);
+  }
+
+  const bool hasFullFrameCache = gCarouselCache.frameCount >= targetFrameCount;
+  gCarouselCache.key = newKey;
+  gCarouselCache.keyHash = diskCacheValid ? newKeyHash : 0;
+  carouselFramesReady = true;
+  coverRendered = false;
+  coverBufferStored = false;
+
+  // Persist the freshly-rendered carousel snapshot back to SD after Home is
+  // already visible so later reader->Home returns and carousel navigation can
+  // bootstrap from disk instead of live-rendering covers again.
+  if (!diskCacheValid && gCarouselCache.frameCount > 0) {
+    if (hasFullFrameCache) {
+      const bool cacheBuilt = buildCarouselCacheFile(newKey, newKeyHash, bookCount, showProgressPopup);
+      if (cacheBuilt) {
+        gCarouselCache.keyHash = newKeyHash;
+        showedProgressPopup = true;
+      }
+    } else {
+      LOG_INF("HOME", "carousel: skipping SD cache build in degraded frame cache mode");
+    }
+  }
+  return showedProgressPopup;
+}
+
+void HomeActivity::loop() {
+  if (isMinimalTheme()) {
+    const int pressedFrontButton = mappedInput.getPressedFrontButton();
+    const int releasedFrontButton = mappedInput.getReleasedFrontButton();
+
+    if (minimalSuppressInitialFrontRelease) {
+      if (releasedFrontButton >= 0) {
+        minimalSuppressInitialFrontRelease = false;
+        return;
+      }
+      if (!isAnyFrontButtonPressed(mappedInput)) {
+        minimalSuppressInitialFrontRelease = false;
+      }
+    }
+
+    if (minimalMenuOpen) {
+      const auto menuItems = buildMinimalMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks);
+      const int menuCount = static_cast<int>(menuItems.size());
+      if (menuCount <= 0) {
+        minimalMenuOpen = false;
+        minimalHomeNavIndex = -1;
+        requestUpdate();
+        return;
+      }
+
+      if (minimalMenuIndex >= menuCount) {
+        minimalMenuIndex = menuCount - 1;
+      }
+
+      buttonNavigator.onPreviousPress([this, menuCount] {
+        minimalMenuIndex = ButtonNavigator::previousIndex(minimalMenuIndex, menuCount);
+        requestUpdate();
+      });
+      buttonNavigator.onNextPress([this, menuCount] {
+        minimalMenuIndex = ButtonNavigator::nextIndex(minimalMenuIndex, menuCount);
+        requestUpdate();
+      });
+      if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+        minimalMenuOpen = false;
+        minimalHomeNavIndex = -1;
+        requestUpdate();
+        return;
+      }
+      if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+        switch (menuItems[minimalMenuIndex].action) {
+          case HomeMenuAction::BrowseFiles:
+            onFileBrowserOpen();
+            break;
+          case HomeMenuAction::RecentBooks:
+            onRecentsOpen();
+            break;
+          case HomeMenuAction::OpdsBrowser:
+            onOpdsBrowserOpen();
+            break;
+          case HomeMenuAction::ReadingStats:
+            onReadingStatsOpen();
+            break;
+          case HomeMenuAction::Bookmarks:
+            onBookmarksOpen();
+            break;
+          case HomeMenuAction::FileTransfer:
+            onFileTransferOpen();
+            break;
+          case HomeMenuAction::ContinueReading:
+          case HomeMenuAction::Settings:
+            break;
+        }
+      }
+      return;
+    }
+
+    const int homeNavCount = minimalHomeNavCount(!recentBooks.empty());
+    if (minimalHomeNavIndex >= homeNavCount) {
+      minimalHomeNavIndex = homeNavCount - 1;
+    }
+
+    if (mappedInput.wasPressed(MappedInputManager::Button::Up)) {
+      minimalHomeNavIndex = minimalHomeNavIndex < 0 ? homeNavCount - 1
+                                                    : ButtonNavigator::previousIndex(minimalHomeNavIndex, homeNavCount);
+      requestUpdate();
+      return;
+    }
+    if (mappedInput.wasPressed(MappedInputManager::Button::Down)) {
+      minimalHomeNavIndex = minimalHomeNavIndex < 0 ? 0 : ButtonNavigator::nextIndex(minimalHomeNavIndex, homeNavCount);
+      requestUpdate();
+      return;
+    }
+
+    auto activateMinimalHomeNav = [this](int index) {
+      switch (index) {
+        case 0:
+          minimalMenuOpen = true;
+          minimalMenuIndex = 0;
+          requestUpdate();
+          break;
+        case 1:
+          onFileBrowserOpen();
+          break;
+        case 2:
+          onSettingsOpen();
+          break;
+        case 3:
+          onContinueReading();
+          break;
+      }
+    };
+
+    if (releasedFrontButton == HalGPIO::BTN_BACK) {
+      minimalHomeNavIndex = 0;
+      activateMinimalHomeNav(minimalHomeNavIndex);
+      return;
+    }
+    if (releasedFrontButton == HalGPIO::BTN_CONFIRM) {
+      minimalHomeNavIndex = 1;
+      activateMinimalHomeNav(minimalHomeNavIndex);
+      return;
+    }
+    if (releasedFrontButton == HalGPIO::BTN_LEFT) {
+      minimalHomeNavIndex = 2;
+      activateMinimalHomeNav(minimalHomeNavIndex);
+      return;
+    }
+    if (releasedFrontButton == HalGPIO::BTN_RIGHT) {
+      if (!recentBooks.empty()) {
+        minimalHomeNavIndex = 3;
+        activateMinimalHomeNav(minimalHomeNavIndex);
+      }
+      return;
+    }
+    if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+      if (minimalHomeNavIndex >= 0) {
+        activateMinimalHomeNav(minimalHomeNavIndex);
+      }
+      return;
+    }
+    return;
+  }
+
+  const auto themeType = static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme);
+  const bool isLyraCarousel = themeType == CrossPointSettings::UI_THEME::LYRA_CAROUSEL;
+  const bool isLyraFlow = themeType == CrossPointSettings::UI_THEME::LYRA_FLOW;
+  const int previousHighlightedBookIdx = getHighlightedBookIndex();
+
+  if (isLyraCarousel) {
+    // Upstream's LYRA_CAROUSEL grammar: Left/Right iterate within the current
+    // row (carousel or menu), Up/Down toggle between rows.
+    const int bookCount = static_cast<int>(recentBooks.size());
+    const int menuItemCount =
+        static_cast<int>(buildHomeMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks).size());
+    const bool inCarouselRow = (selectorIndex < bookCount);
+    const int menuIdx = inCarouselRow ? 0 : (selectorIndex - bookCount);
+
+    if (mappedInput.wasPressed(MappedInputManager::Button::Right)) {
+      if (inCarouselRow && bookCount > 0)
+        selectorIndex = (selectorIndex + 1) % bookCount;
+      else if (!inCarouselRow)
+        selectorIndex = bookCount + (menuIdx + 1) % menuItemCount;
+      requestUpdate();
+    }
+    if (mappedInput.wasPressed(MappedInputManager::Button::Left)) {
+      if (inCarouselRow && bookCount > 0)
+        selectorIndex = (selectorIndex + bookCount - 1) % bookCount;
+      else if (!inCarouselRow)
+        selectorIndex = bookCount + (menuIdx + menuItemCount - 1) % menuItemCount;
+      requestUpdate();
+    }
+    if (mappedInput.wasPressed(MappedInputManager::Button::Down)) {
+      if (inCarouselRow) {
+        lastCarouselBookIndex = selectorIndex;
+        selectorIndex = bookCount;
+      } else {
+        selectorIndex = lastCarouselBookIndex;
+      }
+      requestUpdate();
+    }
+    if (mappedInput.wasPressed(MappedInputManager::Button::Up)) {
+      if (inCarouselRow) {
+        lastCarouselBookIndex = selectorIndex;
+        selectorIndex = bookCount;
+      } else {
+        selectorIndex = lastCarouselBookIndex;
+      }
+      requestUpdate();
+    }
+  } else if (isLyraFlow) {
+    // FlexBLE LYRA_FLOW (chintanvajariya's 5-book Flow theme):
+    //  - In the carousel: front Prev/Next (L/R) wraps within the carousel.
+    //  - In the menu list: front Prev/Next behaves identically to side Up/Down
+    //    — it iterates through menu items and wraps back to the last carousel
+    //    book at the menu boundaries. The carousel position itself does NOT
+    //    move while the menu cursor is active.
+    //  - Side U/D from carousel jumps to the first/last menu item; from menu,
+    //    iterates within and wraps back to carousel at the ends.
+    const int bookCount = static_cast<int>(recentBooks.size());
+    const int menuCount =
+        static_cast<int>(buildHomeMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks).size());
+    const int totalCount = bookCount + menuCount;
+    const bool inCarousel = (selectorIndex < bookCount);
+    const int returnToBookIndex =
+        (lastCarouselBookIndex >= 0 && lastCarouselBookIndex < bookCount) ? lastCarouselBookIndex : 0;
+
+    // Carousel-only L/R cycling. When in the menu, L/R falls through to the
+    // U/D handler below so it nav-steps through menu items.
+    if (inCarousel && bookCount > 0 && mappedInput.wasPressed(MappedInputManager::Button::Right)) {
+      selectorIndex = (selectorIndex + 1) % bookCount;
+      lastCarouselBookIndex = selectorIndex;
+      requestUpdate();
+    }
+    if (inCarousel && bookCount > 0 && mappedInput.wasPressed(MappedInputManager::Button::Left)) {
+      selectorIndex = (selectorIndex == 0) ? bookCount - 1 : selectorIndex - 1;
+      lastCarouselBookIndex = selectorIndex;
+      requestUpdate();
+    }
+
+    // Menu navigation: side U/D always, plus front L/R when the cursor is
+    // already in the menu. Recompute `inMenu` because the L/R branch above
+    // may have moved the cursor (carousel wrap stays in carousel; never
+    // crosses into menu).
+    const bool inMenuNow = (selectorIndex >= bookCount);
+    const bool downward = mappedInput.wasPressed(MappedInputManager::Button::Down) ||
+                          (inMenuNow && mappedInput.wasPressed(MappedInputManager::Button::Right));
+    const bool upward = mappedInput.wasPressed(MappedInputManager::Button::Up) ||
+                        (inMenuNow && mappedInput.wasPressed(MappedInputManager::Button::Left));
+
+    if (downward) {
+      if (!inMenuNow) {
+        lastCarouselBookIndex = selectorIndex;
+        selectorIndex = bookCount;  // first menu item
+      } else if (selectorIndex >= totalCount - 1) {
+        selectorIndex = returnToBookIndex;  // wrap past last menu item back to carousel
+      } else {
+        ++selectorIndex;
+      }
+      requestUpdate();
+    }
+    if (upward) {
+      if (!inMenuNow) {
+        lastCarouselBookIndex = selectorIndex;
+        selectorIndex = totalCount - 1;  // last menu item
+      } else if (selectorIndex <= bookCount) {
+        selectorIndex = returnToBookIndex;  // wrap past first menu item back to carousel
+      } else {
+        --selectorIndex;
+      }
+      requestUpdate();
+    }
+  } else {
+    const int menuCount = getMenuItemCount();
+    buttonNavigator.onNext([this, menuCount] {
+      selectorIndex = ButtonNavigator::nextIndex(selectorIndex, menuCount);
+      requestUpdate();
+    });
+    buttonNavigator.onPrevious([this, menuCount] {
+      selectorIndex = ButtonNavigator::previousIndex(selectorIndex, menuCount);
+      requestUpdate();
+    });
+  }
+
+  if (getHighlightedBookIndex() != previousHighlightedBookIdx) {
+    updateHighlightedBookContext();
   }
 
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
-    // Calculate dynamic indices based on which options are available
-    int idx = 0;
-    int menuSelectedIndex = selectorIndex - static_cast<int>(recentBooks.size());
-    const int fileBrowserIdx = idx++;
-    const int recentsIdx = idx++;
-    const int readingStatsIdx = hasReadingStats ? idx++ : -1;
-    const int bookmarksIdx = hasBookmarks ? idx++ : -1;
-    const int opdsLibraryIdx = hasOpdsServers ? idx++ : -1;
-    const int fileTransferIdx = idx++;
-    const int settingsIdx = idx;
-
-    if (selectorIndex < recentBooks.size()) {
+    const auto& metrics = UITheme::getInstance().getMetrics();
+    if (!metrics.homeContinueReadingInMenu && selectorIndex < recentBooks.size()) {
       onSelectBook(recentBooks[selectorIndex].path);
-    } else if (menuSelectedIndex == fileBrowserIdx) {
-      onFileBrowserOpen();
-    } else if (menuSelectedIndex == recentsIdx) {
-      onRecentsOpen();
-    } else if (menuSelectedIndex == opdsLibraryIdx) {
-      onOpdsBrowserOpen();
-    } else if (menuSelectedIndex == readingStatsIdx) {
-      onReadingStatsOpen();
-    } else if (menuSelectedIndex == bookmarksIdx) {
-      onBookmarksOpen();
-    } else if (menuSelectedIndex == fileTransferIdx) {
-      onFileTransferOpen();
-    } else if (menuSelectedIndex == settingsIdx) {
-      onSettingsOpen();
+      return;
+    }
+
+    auto menuItems = buildHomeMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks);
+    if (metrics.homeContinueReadingInMenu && !recentBooks.empty()) {
+      menuItems.insert(menuItems.begin(), {tr(STR_CONTINUE_READING), Book, HomeMenuAction::ContinueReading});
+    }
+    const int menuSelectedIndex = selectorIndex - getHomeMenuSelectionOffset(recentBooks);
+    if (menuSelectedIndex < 0 || menuSelectedIndex >= static_cast<int>(menuItems.size())) {
+      return;
+    }
+
+    switch (menuItems[menuSelectedIndex].action) {
+      case HomeMenuAction::BrowseFiles:
+        onFileBrowserOpen();
+        break;
+      case HomeMenuAction::ContinueReading:
+        onContinueReading();
+        break;
+      case HomeMenuAction::RecentBooks:
+        onRecentsOpen();
+        break;
+      case HomeMenuAction::OpdsBrowser:
+        onOpdsBrowserOpen();
+        break;
+      case HomeMenuAction::ReadingStats:
+        onReadingStatsOpen();
+        break;
+      case HomeMenuAction::Bookmarks:
+        onBookmarksOpen();
+        break;
+      case HomeMenuAction::FileTransfer:
+        onFileTransferOpen();
+        break;
+      case HomeMenuAction::Settings:
+        onSettingsOpen();
+        break;
     }
   }
 }
@@ -486,83 +1385,159 @@ void HomeActivity::render(RenderLock&&) {
   const auto pageWidth = renderer.getScreenWidth();
   const auto pageHeight = renderer.getScreenHeight();
 
-  renderer.clearScreen();
-  bool bufferRestored = coverBufferStored && restoreCoverBuffer();
+  if (isMinimalTheme()) {
+    renderer.clearScreen();
+
+    if (minimalMenuOpen) {
+      GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.homeTopPadding}, nullptr);
+      const auto menuItems = buildMinimalMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks);
+      GUI.drawButtonMenu(
+          renderer, Rect{0, metrics.homeTopPadding, pageWidth, pageHeight - metrics.homeTopPadding},
+          static_cast<int>(menuItems.size()), minimalMenuIndex,
+          [&menuItems](int index) { return std::string(menuItems[index].label); },
+          [&menuItems](int index) { return menuItems[index].icon; });
+      const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+      GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+      renderer.displayBuffer();
+      return;
+    }
 
-  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.homeTopPadding},
-                 metrics.homeContinueReadingInMenu && !recentBooks.empty() ? recentBooks[0].title.c_str() : nullptr);
+    bool bufferRestored = coverBufferStored && restoreCoverBuffer();
+    GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.homeTopPadding}, nullptr);
 
-  // When the user has navigated up/down into the menu, selectorIndex points
-  // at a menu row (>= recentCount). The carousel's "no selection" branch
-  // would otherwise pin to book 0 (most recent), losing the user's place.
-  // Encode the preferred center as (recentCount + lastBookIndex) so themes
-  // that scroll through covers (LyraFlowTheme) can keep that book centered;
-  // single-cover themes still see "selectorIndex != 0" → no selection drawn,
-  // unchanged behavior.
-  const int recentCountInt = static_cast<int>(recentBooks.size());
-  const bool inMenuForCarousel = static_cast<int>(selectorIndex) >= recentCountInt;
-  const int carouselDisplayIndex =
-      (inMenuForCarousel && lastBookIndex >= 0 && lastBookIndex < recentCountInt)
-          ? recentCountInt + lastBookIndex
-          : static_cast<int>(selectorIndex);
-  // Stats for the book currently centered in the carousel — Flow theme uses
-  // this to render an "Xh Ym" indicator under the cover. Resolve the centered
-  // index the same way carouselDisplayIndex does, then index the per-book
-  // vector populated in onEnter().
-  const int centeredBookIdx = inMenuForCarousel
-                                  ? (lastBookIndex >= 0 && lastBookIndex < recentCountInt ? lastBookIndex : 0)
-                                  : static_cast<int>(selectorIndex);
-  const BookReadingStats* centeredBookStats =
-      (centeredBookIdx >= 0 && centeredBookIdx < static_cast<int>(recentBookStats.size()))
-          ? &recentBookStats[centeredBookIdx]
-          : nullptr;
-  GUI.drawRecentBookCover(renderer, Rect{0, metrics.homeTopPadding, pageWidth, metrics.homeCoverTileHeight},
-                          recentBooks, carouselDisplayIndex, coverRendered, coverBufferStored, bufferRestored,
-                          std::bind(&HomeActivity::storeCoverBuffer, this), centeredBookStats,
-                          currentBookProgressPercent);
+    GUI.drawRecentBookCover(
+        renderer, Rect{0, metrics.homeTopPadding, pageWidth, metrics.homeCoverTileHeight}, recentBooks, selectorIndex,
+        coverRendered, coverBufferStored, bufferRestored, std::bind(&HomeActivity::storeCoverBuffer, this),
+        hasAnyBookStats(currentBookStats) ? &currentBookStats : nullptr, currentBookProgressPercent);
 
-  // Build menu items dynamically
-  std::vector<const char*> menuItems = {tr(STR_BROWSE_FILES), tr(STR_MENU_RECENT_BOOKS), tr(STR_FILE_TRANSFER),
-                                        tr(STR_SETTINGS_TITLE)};
-  std::vector<UIIcon> menuIcons = {Folder, Recent, Transfer, Settings};
+    const int homeNavCount = minimalHomeNavCount(!recentBooks.empty());
+    if (minimalHomeNavIndex >= homeNavCount) {
+      minimalHomeNavIndex = homeNavCount - 1;
+    }
+    MinimalTheme::setHomeButtonHintSelection(minimalHomeNavIndex);
+    GUI.drawButtonHints(renderer, tr(STR_MENU), tr(STR_BROWSE), tr(STR_SETTINGS_TITLE),
+                        recentBooks.empty() ? "" : tr(STR_READ));
 
-  if (hasOpdsServers) {
-    menuItems.insert(menuItems.begin() + 2, tr(STR_OPDS_BROWSER));
-    menuIcons.insert(menuIcons.begin() + 2, Library);
-  }
+    renderer.displayBuffer();
 
-  if (hasReadingStats) {
-    // Insert Reading Stats after OPDS (or after Recents if no OPDS), before File Transfer
-    const int insertPos = hasOpdsUrl ? 3 : 2;
-    menuItems.insert(menuItems.begin() + insertPos, tr(STR_READING_STATS));
-    menuIcons.insert(menuIcons.begin() + insertPos, Chart);
+    if (!firstRenderDone) {
+      firstRenderDone = true;
+      requestUpdate();
+      return;
+    }
+
+    if (!recentsLoaded && !recentsLoading) {
+      recentsLoading = true;
+      loadRecentCovers(metrics.homeCoverHeight);
+    }
+    return;
   }
 
-  if (hasBookmarks) {
-    int insertPos = 2;
-    if (hasOpdsUrl) insertPos++;
-    if (hasReadingStats) insertPos++;
-    menuItems.insert(menuItems.begin() + insertPos, tr(STR_BOOKMARKS));
-    menuIcons.insert(menuIcons.begin() + insertPos, BookmarkIcon);
+  // Fast path: pre-rendered frames ready — memcpy + border overlay
+  if (carouselFramesReady) {
+    uint8_t* frameBuffer = renderer.getFrameBuffer();
+    const int bookCount = static_cast<int>(recentBooks.size());
+    const bool inCarouselRow = (selectorIndex < bookCount);
+    const int centerIdx = inCarouselRow ? selectorIndex : lastCarouselBookIndex;
+    int slotIdx = gCarouselCache.findFrameSlot(centerIdx);
+
+    if (frameBuffer && slotIdx < 0 && gCarouselCache.keyHash != 0 && bookCount > 0) {
+      const int evictSlot = chooseCarouselEvictionSlot(centerIdx, bookCount);
+      if (evictSlot >= 0 && loadCarouselFrameFromDisk(gCarouselCache.keyHash, bookCount, centerIdx, evictSlot)) {
+        slotIdx = evictSlot;
+      }
+    }
+
+    if (frameBuffer && slotIdx >= 0 && carouselFrames[slotIdx]) {
+      memcpy(frameBuffer, carouselFrames[slotIdx], renderer.getBufferSize());
+      LyraCarouselTheme::setPreRenderIndex(centerIdx);
+
+      GUI.drawCarouselBorder(renderer, Rect{0, metrics.homeTopPadding, pageWidth, metrics.homeCoverTileHeight},
+                             recentBooks, centerIdx, inCarouselRow);
+      if (!inCarouselRow) {
+        const auto menuItems = buildHomeMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks);
+        if (static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme) ==
+            CrossPointSettings::UI_THEME::LYRA_CAROUSEL) {
+          static_cast<const LyraCarouselTheme&>(GUI).drawButtonMenuSelectionOverlay(
+              renderer, static_cast<int>(menuItems.size()), selectorIndex - recentBooks.size(),
+              [&menuItems](int index) { return std::string(menuItems[index].label); },
+              [&menuItems](int index) { return menuItems[index].icon; });
+        }
+      }
+
+      renderer.displayBuffer();
+      // E-ink refresh complete — pre-render the missing adjacent frame while idle.
+      updateSlidingWindowCache(centerIdx, bookCount);
+      // Mirror the slow-path trigger: generate missing thumbnails on the second
+      // render so the E-ink is already showing something before the SD work starts.
+      if (!firstRenderDone) {
+        firstRenderDone = true;
+        requestUpdate();
+      } else if (!recentsLoaded && !recentsLoading) {
+        recentsLoading = true;
+        loadRecentCovers(metrics.homeCoverHeight);
+      }
+      return;
+    }
   }
 
+  renderer.clearScreen();
+  bool bufferRestored = coverBufferStored && restoreCoverBuffer();
+
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.homeTopPadding},
+                 metrics.homeContinueReadingInMenu && !recentBooks.empty() ? recentBooks[0].title.c_str() : nullptr);
+
+  // Flow theme decodes (selectorIndex - bookCount) as a "carousel center hint"
+  // when no carousel slot is selected. Without this encoding the carousel
+  // would drift forward by one as the user iterates through menu items.
+  // Pinning the encoded hint to lastCarouselBookIndex keeps the carousel
+  // visually stationary while the menu cursor moves.
+  const int bookCountForRender = static_cast<int>(recentBooks.size());
+  const auto activeThemeForRender = static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme);
+  const bool flowCarouselHold =
+      activeThemeForRender == CrossPointSettings::UI_THEME::LYRA_FLOW && selectorIndex >= bookCountForRender;
+  const int coverSelectorIndex =
+      flowCarouselHold ? (bookCountForRender +
+                          (lastCarouselBookIndex >= 0 && lastCarouselBookIndex < bookCountForRender
+                               ? lastCarouselBookIndex
+                               : 0))
+                       : selectorIndex;
+
+  GUI.drawRecentBookCover(renderer, Rect{0, metrics.homeTopPadding, pageWidth, metrics.homeCoverTileHeight},
+                          recentBooks, coverSelectorIndex, coverRendered, coverBufferStored, bufferRestored,
+                          std::bind(&HomeActivity::storeCoverBuffer, this),
+                          hasAnyBookStats(currentBookStats) ? &currentBookStats : nullptr, currentBookProgressPercent);
+
+  auto menuItems = buildHomeMenuItems(hasOpdsServers, hasReadingStats, hasBookmarks);
+
   const int menuStartY = metrics.homeTopPadding + metrics.homeCoverTileHeight + metrics.homeMenuTopOffset;
   const int menuEndY = pageHeight - metrics.buttonHintsHeight;
   const int menuHeight = std::max(0, menuEndY - menuStartY);
 
   if (metrics.homeContinueReadingInMenu && !recentBooks.empty()) {
     // Insert Continue Reading at the top if enabled in theme
-    menuItems.insert(menuItems.begin(), tr(STR_CONTINUE_READING));
-    menuIcons.insert(menuIcons.begin(), Book);
+    menuItems.insert(menuItems.begin(), {tr(STR_CONTINUE_READING), Book, HomeMenuAction::ContinueReading});
   }
 
   GUI.drawButtonMenu(
       renderer, Rect{0, menuStartY, pageWidth, menuHeight}, static_cast<int>(menuItems.size()),
-      metrics.homeContinueReadingInMenu ? selectorIndex : selectorIndex - recentBooks.size(),
-      [&menuItems](int index) { return std::string(menuItems[index]); },
-      [&menuIcons](int index) { return menuIcons[index]; });
-
-  const auto labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_PREV), tr(STR_DIR_NEXT));
+      selectorIndex - getHomeMenuSelectionOffset(recentBooks),
+      [&menuItems](int index) { return std::string(menuItems[index].label); },
+      [&menuItems](int index) { return menuItems[index].icon; });
+
+  const auto activeTheme = static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme);
+  // LYRA_CAROUSEL keeps upstream's "Left/Right" front-button labels.
+  // LYRA_FLOW uses "Prev/Next" since L/R linearly traverses carousel + menu.
+  // Everything else (non-carousel themes) hints "Up/Down" because L/R there
+  // is just a thin wrapper over the menu's vertical buttonNavigator.
+  MappedInputManager::Labels labels;
+  if (activeTheme == CrossPointSettings::UI_THEME::LYRA_CAROUSEL) {
+    labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT));
+  } else if (activeTheme == CrossPointSettings::UI_THEME::LYRA_FLOW) {
+    labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_PREV), tr(STR_DIR_NEXT));
+  } else {
+    labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+  }
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
   renderer.displayBuffer();
@@ -570,16 +1545,65 @@ void HomeActivity::render(RenderLock&&) {
   if (!firstRenderDone) {
     firstRenderDone = true;
     requestUpdate();
-  } else if (!recentsLoaded && !recentsLoading) {
+    return;
+  }
+
+  if (!recentsLoaded && !recentsLoading) {
     recentsLoading = true;
     loadRecentCovers(metrics.homeCoverHeight);
   }
+
+  if (carouselWarmupPending && !carouselFramesReady) {
+    // Resolve any missing cover thumbs first, then warm the carousel snapshot.
+    // Cover generation needs more contiguous heap than the frame cache path.
+    carouselWarmupPending = false;
+    const bool showedWarmupProgress = preRenderCarouselFrames(true);
+    if (carouselFramesReady || showedWarmupProgress) {
+      requestUpdate();
+    }
+  }
 }
 
-void HomeActivity::onSelectBook(const std::string& path) { activityManager.goToReader(path); }
+void HomeActivity::renderCarouselFrame(int bookIdx, int slotIdx) {
+  const auto start = millis();
+  uint8_t* frameBuffer = renderer.getFrameBuffer();
+  if (!frameBuffer || !gCarouselCache.frames[slotIdx]) return;
+  BookReadingStats frameStats;
+  float frameProgressPercent = -1.0f;
+  bool usedCachedStats = false;
+  renderCarouselFrameToCurrentBuffer(bookIdx, &frameStats, &frameProgressPercent, &usedCachedStats);
+
+  memcpy(gCarouselCache.frames[slotIdx], frameBuffer, renderer.getBufferSize());
+  gCarouselCache.frameBookIdx[slotIdx] = bookIdx;
+  carouselFrames[slotIdx] = gCarouselCache.frames[slotIdx];
+  LOG_DBG("HOME", "carousel: renderCarouselFrame book=%d slot=%d cached=%s took %lums", bookIdx, slotIdx,
+          usedCachedStats ? "yes" : "no", millis() - start);
+}
+
+void HomeActivity::updateSlidingWindowCache(int centerIdx, int bookCount) {
+  (void)centerIdx;
+  (void)bookCount;
+  // The current carousel cache keeps one frame in RAM; other frames are paged
+  // from the SD snapshot cache on demand in render().
+}
+
+void HomeActivity::onSelectBook(const std::string& path) {
+  gCarouselCache.invalidate();
+  freeCarouselFrames();
+  if (Storage.exists(CAROUSEL_CACHE_TMP_PATH)) {
+    Storage.remove(CAROUSEL_CACHE_TMP_PATH);
+  }
+  activityManager.goToReader(path);
+}
 
 void HomeActivity::onFileBrowserOpen() { activityManager.goToFileBrowser(); }
 
+void HomeActivity::onContinueReading() {
+  if (!recentBooks.empty()) {
+    onSelectBook(recentBooks[0].path);
+  }
+}
+
 void HomeActivity::onRecentsOpen() { activityManager.goToRecentBooks(); }
 
 void HomeActivity::onSettingsOpen() { activityManager.goToSettings(); }
@@ -589,16 +1613,19 @@ void HomeActivity::onFileTransferOpen() { activityManager.goToFileTransfer(); }
 void HomeActivity::onOpdsBrowserOpen() { activityManager.goToBrowser(); }
 
 void HomeActivity::onReadingStatsOpen() {
-  // Replace home with stats so backing out lands on a fresh home with
-  // selectorIndex reset to 0 — same behavior as Browse Files / Recent
-  // Books / Settings, instead of the stack-preserved variant we had
-  // before. The reader's own stats menu still uses startActivityForResult
-  // (defined in EpubReaderActivity), so back from there returns to the
-  // reader as expected.
-  if (recentBooks.empty()) return;
-  activityManager.replaceActivity(std::make_unique<BookStatsActivity>(
-      renderer, mappedInput, recentBooks[0].path, recentBooks[0].title, recentBooks[0].coverBmpPath, currentBookStats,
-      globalStats, /*backToHome=*/true));
+  const int highlightedBookIdx = getHighlightedBookIndex();
+  const std::string bookTitle =
+      highlightedBookIdx >= 0 ? recentBooks[highlightedBookIdx].title : std::string(tr(STR_READING_STATS));
+  const std::string bookPath = highlightedBookIdx >= 0 ? recentBooks[highlightedBookIdx].path : std::string();
+  const std::string coverBmpPath =
+      highlightedBookIdx >= 0 ? recentBooks[highlightedBookIdx].coverBmpPath : std::string();
+  // FlexBLE inherits chintanvajariya's richer BookStatsActivity (recent-books
+  // navigation + cover image). The richer constructor needs path/cover and a
+  // backToHome flag; launched from home, so back returns here.
+  startActivityForResult(
+      std::make_unique<BookStatsActivity>(renderer, mappedInput, bookPath, bookTitle, coverBmpPath, currentBookStats,
+                                          globalStats, /*backToHome=*/true),
+      [this](const ActivityResult&) { requestUpdate(); });
 }
 
 void HomeActivity::onBookmarksOpen() {
diff --git a/src/activities/home/HomeActivity.h b/src/activities/home/HomeActivity.h
index 498bcc51..5a90c0e3 100644
--- a/src/activities/home/HomeActivity.h
+++ b/src/activities/home/HomeActivity.h
@@ -1,41 +1,60 @@
 #pragma once
+#include <array>
 #include <functional>
+#include <optional>
 #include <vector>
 
-#include "../Activity.h"
-#include "../reader/BookReadingStats.h"
-#include "../reader/GlobalReadingStats.h"
 #include "./FileBrowserActivity.h"
+#include "activities/Activity.h"
+#include "activities/reader/BookReadingStats.h"
+#include "activities/reader/GlobalReadingStats.h"
+#include "util/ButtonNavigator.h"
 
 struct RecentBook;
 struct Rect;
 
 class HomeActivity final : public Activity {
+ public:
+  // Keep one rendered carousel frame in RAM. Additional frames remain available
+  // through the SD snapshot cache and are paged in on demand.
+  static constexpr int kCarouselFrameCount = 1;
+  // Must be >= LyraCarouselMetrics::values.homeRecentBooksCount (asserted in .cpp)
+  static constexpr int kMaxCachedBooks = 3;
+
+ private:
+  ButtonNavigator buttonNavigator;
   int selectorIndex = 0;
-  // Remembered carousel position so Left/Right re-entry from the menu lands
-  // on the same book the user was last on, not back at index 0.
-  int lastBookIndex = 0;
+  int lastCarouselBookIndex = 0;  // remembered position when leaving carousel row
   bool recentsLoading = false;
   bool recentsLoaded = false;
   bool firstRenderDone = false;
-  bool hasOpdsUrl = false;
   bool hasReadingStats = false;
   bool hasBookmarks = false;
   bool hasOpdsServers = false;
+  bool minimalMenuOpen = false;
+  bool minimalSuppressInitialFrontRelease = false;
+  int minimalMenuIndex = 0;
+  int minimalHomeNavIndex = -1;
   bool coverRendered = false;      // Track if cover has been rendered once
   bool coverBufferStored = false;  // Track if cover buffer is stored
   uint8_t* coverBuffer = nullptr;  // HomeActivity's own buffer for cover image
   float currentBookProgressPercent = -1.0f;
   BookReadingStats currentBookStats;
   GlobalReadingStats globalStats;
+
+  // Per-book stats and progress cached at onEnter() to avoid SD reads during navigation.
+  std::array<BookReadingStats, kMaxCachedBooks> cachedBookStats{};
+  std::array<float, kMaxCachedBooks> cachedBookProgress{};
+  bool bookStatsCached = false;
+
+  uint8_t* carouselFrames[kCarouselFrameCount] = {};
+  bool carouselFramesReady = false;
+  bool carouselWarmupPending = false;
+
   std::vector<RecentBook> recentBooks;
-  // Per-book stats for the carousel covers. Populated in onEnter() so the
-  // Flow theme's "hours read" indicator can update as the user scrolls
-  // sideways through the carousel without doing file I/O per render.
-  // Same index as recentBooks; default-constructed when no stats file exists.
-  std::vector<BookReadingStats> recentBookStats;
   void onSelectBook(const std::string& path);
   void onFileBrowserOpen();
+  void onContinueReading();
   void onRecentsOpen();
   void onSettingsOpen();
   void onFileTransferOpen();
@@ -47,7 +66,22 @@ class HomeActivity final : public Activity {
   bool storeCoverBuffer();    // Store frame buffer for cover image
   bool restoreCoverBuffer();  // Restore frame buffer from stored cover
   void freeCoverBuffer();     // Free the stored cover buffer
+  bool preRenderCarouselFrames(bool showProgressPopup = false);
+  void freeCarouselFrames();
+  bool allocateCarouselFrameSlots(int targetFrameCount);
+  bool buildCarouselCacheFile(const std::string& cacheKey, uint64_t cacheKeyHash, int bookCount,
+                              bool showProgressPopup = false);
+  bool loadCarouselFrameFromDisk(uint64_t cacheKeyHash, int bookCount, int bookIdx, int slotIdx);
+  int chooseCarouselEvictionSlot(int centerIdx, int bookCount,
+                                 std::optional<int> protectedBookIdx = std::nullopt) const;
+  void renderCarouselFrameToCurrentBuffer(int bookIdx, BookReadingStats* outStats, float* outProgressPercent,
+                                          bool* outUsedCachedStats);
+  void renderCarouselFrame(int bookIdx, int slotIdx);
+  void updateSlidingWindowCache(int centerIdx, int bookCount);
+  int getHighlightedBookIndex() const;
+  void updateHighlightedBookContext();
   void loadRecentBooks(int maxBooks);
+  void loadAllBookStats();
   void loadRecentCovers(int coverHeight);
 
  public:
diff --git a/src/activities/home/RecentBookProgress.cpp b/src/activities/home/RecentBookProgress.cpp
new file mode 100644
index 00000000..93824566
--- /dev/null
+++ b/src/activities/home/RecentBookProgress.cpp
@@ -0,0 +1,157 @@
+#include "RecentBookProgress.h"
+
+#include <Epub.h>
+#include <FsHelpers.h>
+#include <HalStorage.h>
+#include <Serialization.h>
+#include <Txt.h>
+#include <Xtc.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <cstdio>
+#include <string>
+
+#include "RecentBooksStore.h"
+
+namespace {
+constexpr uint32_t TXT_CACHE_MAGIC = 0x54585449;  // "TXTI"
+constexpr uint8_t TXT_CACHE_VERSION = 2;
+
+float clampProgressPercent(const float progress) { return std::clamp(progress, 0.0f, 100.0f); }
+
+float loadEpubProgressPercent(const RecentBook& book) {
+  Epub epub(book.path, "/.crosspoint");
+  if (!epub.load(false, true)) {
+    return -1.0f;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("RBPR", epub.getCachePath() + "/progress.bin", file)) {
+    return -1.0f;
+  }
+
+  uint8_t data[6];
+  const int bytesRead = file.read(data, sizeof(data));
+  file.close();
+  if (bytesRead != 6) {
+    return -1.0f;
+  }
+
+  const int spineIndex = data[0] | (data[1] << 8);
+  const int currentPage = data[2] | (data[3] << 8);
+  const int pageCount = data[4] | (data[5] << 8);
+  if (pageCount <= 0) {
+    return 0.0f;
+  }
+
+  const float chapterProgress = static_cast<float>(currentPage + 1) / static_cast<float>(pageCount);
+  return clampProgressPercent(epub.calculateProgress(spineIndex, chapterProgress) * 100.0f);
+}
+
+float loadXtcProgressPercent(const RecentBook& book) {
+  Xtc xtc(book.path, "/.crosspoint");
+  if (!xtc.load()) {
+    return -1.0f;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("RBPR", xtc.getCachePath() + "/progress.bin", file)) {
+    return -1.0f;
+  }
+
+  uint8_t data[4];
+  const int bytesRead = file.read(data, sizeof(data));
+  file.close();
+  if (bytesRead != 4) {
+    return -1.0f;
+  }
+
+  const uint32_t currentPage = static_cast<uint32_t>(data[0]) | (static_cast<uint32_t>(data[1]) << 8) |
+                               (static_cast<uint32_t>(data[2]) << 16) | (static_cast<uint32_t>(data[3]) << 24);
+  return clampProgressPercent(static_cast<float>(xtc.calculateProgress(currentPage)));
+}
+
+float loadTxtProgressPercent(const RecentBook& book) {
+  Txt txt(book.path, "/.crosspoint");
+  if (!txt.load()) {
+    return -1.0f;
+  }
+
+  FsFile progressFile;
+  if (!Storage.openFileForRead("RBPR", txt.getCachePath() + "/progress.bin", progressFile)) {
+    return -1.0f;
+  }
+
+  uint8_t progressData[4];
+  const int progressBytes = progressFile.read(progressData, sizeof(progressData));
+  progressFile.close();
+  if (progressBytes != 4) {
+    return -1.0f;
+  }
+
+  const uint32_t currentPage = static_cast<uint32_t>(progressData[0]) | (static_cast<uint32_t>(progressData[1]) << 8) |
+                               (static_cast<uint32_t>(progressData[2]) << 16) |
+                               (static_cast<uint32_t>(progressData[3]) << 24);
+
+  FsFile indexFile;
+  if (!Storage.openFileForRead("RBPR", txt.getCachePath() + "/index.bin", indexFile)) {
+    return -1.0f;
+  }
+
+  uint32_t magic = 0;
+  uint8_t version = 0;
+  uint32_t fileSize = 0;
+  int32_t cachedWidth = 0;
+  int32_t cachedLines = 0;
+  int32_t fontId = 0;
+  int32_t margin = 0;
+  uint8_t alignment = 0;
+  uint32_t totalPages = 0;
+  const bool readOk =
+      serialization::tryReadPod(indexFile, magic) && serialization::tryReadPod(indexFile, version) &&
+      serialization::tryReadPod(indexFile, fileSize) && serialization::tryReadPod(indexFile, cachedWidth) &&
+      serialization::tryReadPod(indexFile, cachedLines) && serialization::tryReadPod(indexFile, fontId) &&
+      serialization::tryReadPod(indexFile, margin) && serialization::tryReadPod(indexFile, alignment) &&
+      serialization::tryReadPod(indexFile, totalPages);
+  indexFile.close();
+  if (!readOk) {
+    return -1.0f;
+  }
+  (void)cachedWidth;
+  (void)cachedLines;
+  (void)fontId;
+  (void)margin;
+  (void)alignment;
+
+  if (magic != TXT_CACHE_MAGIC || version != TXT_CACHE_VERSION || fileSize != txt.getFileSize() || totalPages == 0) {
+    return -1.0f;
+  }
+
+  return clampProgressPercent((static_cast<float>(currentPage + 1) / static_cast<float>(totalPages)) * 100.0f);
+}
+}  // namespace
+
+float RecentBookProgress::loadPercent(const RecentBook& book) {
+  if (FsHelpers::hasEpubExtension(book.path)) {
+    return loadEpubProgressPercent(book);
+  }
+  if (FsHelpers::hasXtcExtension(book.path)) {
+    return loadXtcProgressPercent(book);
+  }
+  if (FsHelpers::hasTxtExtension(book.path) || FsHelpers::hasMarkdownExtension(book.path)) {
+    return loadTxtProgressPercent(book);
+  }
+  return -1.0f;
+}
+
+bool RecentBookProgress::hasPercent(const float progress) { return progress >= 0.0f; }
+
+std::string RecentBookProgress::formatPercent(const float progress) {
+  if (!hasPercent(progress)) {
+    return "";
+  }
+  char buffer[8];
+  snprintf(buffer, sizeof(buffer), "%.0f%%", clampProgressPercent(progress));
+  return buffer;
+}
diff --git a/src/activities/home/RecentBookProgress.h b/src/activities/home/RecentBookProgress.h
new file mode 100644
index 00000000..c87c7fe6
--- /dev/null
+++ b/src/activities/home/RecentBookProgress.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+
+struct RecentBook;
+
+// Helpers for loading and displaying recent-book reading progress.
+// Progress values are percentages in the 0-100 range; negative means unknown.
+//
+// Example:
+//   const float progress = RecentBookProgress::loadPercent(book);
+//   const std::string label = RecentBookProgress::formatPercent(progress);
+namespace RecentBookProgress {
+// Loads the saved reading percentage for a recent EPUB, XTC, TXT, or Markdown book.
+// Returns -1.0f when progress is unavailable or the cache cannot be read.
+float loadPercent(const RecentBook& book);
+// Returns true when progress contains a known 0-100 percentage.
+bool hasPercent(float progress);
+// Formats progress as a rounded percentage string such as "42%".
+// Returns an empty string when progress is unknown.
+std::string formatPercent(float progress);
+}  // namespace RecentBookProgress
diff --git a/src/activities/home/RecentBooksActivity.cpp b/src/activities/home/RecentBooksActivity.cpp
index 6ba8f8cf..f7412ea7 100644
--- a/src/activities/home/RecentBooksActivity.cpp
+++ b/src/activities/home/RecentBooksActivity.cpp
@@ -13,14 +13,18 @@
 
 namespace {
 constexpr unsigned long GO_HOME_MS = 1000;
+constexpr size_t MAX_LIST_RECENT_BOOKS = 10;
 }  // namespace
 
 void RecentBooksActivity::loadRecentBooks() {
   recentBooks.clear();
   const auto& books = RECENT_BOOKS.getBooks();
-  recentBooks.reserve(books.size());
+  recentBooks.reserve(std::min(books.size(), MAX_LIST_RECENT_BOOKS));
 
   for (const auto& book : books) {
+    if (recentBooks.size() >= MAX_LIST_RECENT_BOOKS) {
+      break;
+    }
     // Skip if file no longer exists
     if (!Storage.exists(book.path.c_str())) {
       continue;
diff --git a/src/activities/home/RecentBooksActivity.h b/src/activities/home/RecentBooksActivity.h
index b1103f04..c9c70b36 100644
--- a/src/activities/home/RecentBooksActivity.h
+++ b/src/activities/home/RecentBooksActivity.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
 #include "RecentBooksStore.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class RecentBooksActivity final : public Activity {
diff --git a/src/activities/home/RecentBooksGridActivity.cpp b/src/activities/home/RecentBooksGridActivity.cpp
index 99f76b53..687db736 100644
--- a/src/activities/home/RecentBooksGridActivity.cpp
+++ b/src/activities/home/RecentBooksGridActivity.cpp
@@ -6,41 +6,251 @@
 #include <GfxRenderer.h>
 #include <HalStorage.h>
 #include <I18n.h>
+#include <Logging.h>
 #include <Xtc.h>
 
 #include <algorithm>
+#include <cmath>
+#include <cstdio>
 
+#include "CrossPointSettings.h"
 #include "MappedInputManager.h"
+#include "RecentBookProgress.h"
 #include "RecentBooksStore.h"
 #include "components/UITheme.h"
 #include "components/icons/book.h"
+#include "components/themes/lyra/LyraTheme.h"
 #include "fontIds.h"
 
+namespace {
+constexpr int kCoverCornerRadius = 2;
+constexpr int kGridColumns = 3;
+constexpr float kCircleRadians = 6.2831853f;
+constexpr float kCircleRadiansPerPercent = kCircleRadians / 100.0f;
+constexpr int kLyraGridContentTop =
+    LyraMetrics::values.topPadding + LyraMetrics::values.headerHeight + LyraMetrics::values.verticalSpacing;
+constexpr int kLyraGridSpacing = LyraMetrics::values.verticalSpacing;
+
+void drawGridHeader(const GfxRenderer& renderer, const int pageWidth) {
+  const Rect rect{0, LyraMetrics::values.topPadding, pageWidth, LyraMetrics::values.headerHeight};
+  renderer.fillRect(rect.x, rect.y, rect.width, rect.height, false);
+
+  const bool showBatteryPercentage =
+      SETTINGS.hideBatteryPercentage != CrossPointSettings::HIDE_BATTERY_PERCENTAGE::HIDE_ALWAYS;
+  const int batteryX = rect.x + rect.width - 12 - LyraMetrics::values.batteryWidth;
+  GUI.drawBatteryRight(renderer,
+                       Rect{batteryX, rect.y + 5, LyraMetrics::values.batteryWidth, LyraMetrics::values.batteryHeight},
+                       showBatteryPercentage);
+
+  const int titleMaxWidth = rect.width - LyraMetrics::values.contentSidePadding * 3;
+  const std::string title =
+      renderer.truncatedText(UI_12_FONT_ID, tr(STR_MENU_RECENT_BOOKS), titleMaxWidth, EpdFontFamily::BOLD);
+  renderer.drawText(UI_12_FONT_ID, rect.x + LyraMetrics::values.contentSidePadding,
+                    rect.y + LyraMetrics::values.batteryBarHeight + 3, title.c_str(), true, EpdFontFamily::BOLD);
+  renderer.drawLine(rect.x, rect.y + rect.height - 3, rect.x + rect.width - 1, rect.y + rect.height - 3, 3, true);
+}
+
+void drawInlineProgressCircle(const GfxRenderer& renderer, const int x, const int y, const int size,
+                              const float progressPercent) {
+  const int radius = size / 2;
+  if (radius <= 2) return;
+
+  const int centerX = x + radius;
+  const int centerY = y + radius;
+  const int outerRadius = radius;
+  const int innerRadius = std::max(1, radius - std::max(2, size / 4));
+  const int outerRadiusSq = outerRadius * outerRadius;
+  const int innerRadiusSq = innerRadius * innerRadius;
+  const float sweepRadians = std::clamp(progressPercent, 0.0f, 100.0f) * kCircleRadiansPerPercent;
+
+  for (int dy = -outerRadius; dy <= outerRadius; ++dy) {
+    for (int dx = -outerRadius; dx <= outerRadius; ++dx) {
+      const int distanceSq = dx * dx + dy * dy;
+      if (distanceSq > outerRadiusSq || distanceSq < innerRadiusSq) {
+        continue;
+      }
+
+      const int px = centerX + dx;
+      const int py = centerY + dy;
+      renderer.fillRectDither(px, py, 1, 1, Color::LightGray);
+
+      float angle = std::atan2(static_cast<float>(dx), static_cast<float>(-dy));
+      if (angle < 0.0f) {
+        angle += kCircleRadians;
+      }
+      if (angle <= sweepRadians) {
+        renderer.drawPixel(px, py, true);
+      }
+    }
+  }
+}
+
+int moveHorizontalInGrid(const int currentIndex, const int totalItems, const bool moveRight) {
+  if (totalItems <= 0) return 0;
+  return moveRight ? ButtonNavigator::nextIndex(currentIndex, totalItems)
+                   : ButtonNavigator::previousIndex(currentIndex, totalItems);
+}
+
+int moveVerticalInGrid(const int currentIndex, const int totalItems, const int columns, const int itemsPerPage,
+                       const bool moveDown) {
+  if (totalItems <= 0 || columns <= 0) return 0;
+
+  const int safeItemsPerPage = std::max(columns, itemsPerPage);
+  // Contract: safeItemsPerPage should describe whole grid rows. Partial rows
+  // are allowed only on the final page after totalItems is applied below.
+  if (safeItemsPerPage % columns != 0) {
+    LOG_ERR("RBGA", "moveVerticalInGrid requires whole rows (itemsPerPage=%d columns=%d)", safeItemsPerPage, columns);
+    return currentIndex;
+  }
+  const int totalPages = (totalItems + safeItemsPerPage - 1) / safeItemsPerPage;
+  const int currentPage = currentIndex / safeItemsPerPage;
+  const int indexInPage = currentIndex % safeItemsPerPage;
+  const int currentRow = indexInPage / columns;
+  const int currentColumn = indexInPage % columns;
+  const int rowsPerPage = safeItemsPerPage / columns;
+
+  if (moveDown) {
+    if (currentRow < rowsPerPage - 1) {
+      const int nextRowCandidate = currentIndex + columns;
+      if (nextRowCandidate < totalItems && (nextRowCandidate / safeItemsPerPage) == currentPage) {
+        return nextRowCandidate;
+      }
+    }
+
+    const int nextPage = (currentPage + 1) % totalPages;
+    const int nextPageStart = nextPage * safeItemsPerPage;
+    const int nextPageCount = std::min(safeItemsPerPage, totalItems - nextPageStart);
+    if (nextPageCount <= 0) return currentIndex;
+
+    if (currentColumn < nextPageCount) {
+      return nextPageStart + currentColumn;
+    }
+    return nextPageStart + nextPageCount - 1;
+  }
+
+  if (currentRow > 0) {
+    return currentIndex - columns;
+  }
+
+  const int previousPage = (currentPage - 1 + totalPages) % totalPages;
+  const int previousPageStart = previousPage * safeItemsPerPage;
+  const int previousPageCount = std::min(safeItemsPerPage, totalItems - previousPageStart);
+  if (previousPageCount <= 0) return currentIndex;
+
+  int previousPageCandidate = previousPageStart + ((previousPageCount - 1) / columns) * columns + currentColumn;
+  while (previousPageCandidate >= previousPageStart + previousPageCount) {
+    previousPageCandidate -= columns;
+  }
+  return std::max(previousPageStart, previousPageCandidate);
+}
+
+void updateRecentBookCoverPath(const RecentBook& book, const std::string& coverBmpPath) {
+  if (!RECENT_BOOKS.updateBook(book.path, book.title, book.author, coverBmpPath)) {
+    LOG_ERR("RBGA", "failed to update recent book metadata: %s", book.path.c_str());
+  }
+}
+
+bool hasThumbnailPlaceholder(const std::string& coverBmpPath) {
+  return coverBmpPath.find("[WIDTH]") != std::string::npos || coverBmpPath.find("[HEIGHT]") != std::string::npos;
+}
+
+bool needsCoverThumbGeneration(const RecentBook& book, const std::string& thumbPath) {
+  if (thumbPath.empty() || !Storage.exists(thumbPath.c_str())) {
+    return true;
+  }
+  if (!FsHelpers::hasXtcExtension(book.path)) {
+    return false;
+  }
+
+  FsFile file;
+  if (!Storage.openFileForRead("RBGA", thumbPath, file)) {
+    return true;
+  }
+  Bitmap bitmap(file);
+  const bool hasExpectedSize = bitmap.parseHeaders() == BmpReaderError::Ok &&
+                               bitmap.getWidth() == RecentBooksGridActivity::COVER_WIDTH &&
+                               bitmap.getHeight() == RecentBooksGridActivity::COVER_HEIGHT;
+  file.close();
+  return !hasExpectedSize;
+}
+
+void calculateCoverFillCrop(const Bitmap& bitmap, float& cropX, float& cropY) {
+  cropX = 0.0f;
+  cropY = 0.0f;
+  const float srcW = static_cast<float>(bitmap.getWidth());
+  const float srcH = static_cast<float>(bitmap.getHeight());
+  if (srcW <= 0.0f || srcH <= 0.0f) return;
+
+  const float srcRatio = srcW / srcH;
+  const float targetRatio = static_cast<float>(RecentBooksGridActivity::COVER_WIDTH) /
+                            static_cast<float>(RecentBooksGridActivity::COVER_HEIGHT);
+  if (srcRatio > targetRatio) {
+    cropX = std::max(0.0f, 1.0f - (targetRatio / srcRatio));
+  } else if (srcRatio < targetRatio) {
+    cropY = std::max(0.0f, 1.0f - (srcRatio / targetRatio));
+  }
+}
+
+std::string getReusableCoverPath(const RecentBook& book) {
+  if (FsHelpers::hasEpubExtension(book.path)) {
+    return Epub(book.path, "/.crosspoint").getThumbBmpPath();
+  }
+  if (FsHelpers::hasXtcExtension(book.path)) {
+    return Xtc(book.path, "/.crosspoint").getThumbBmpPath();
+  }
+  return book.coverBmpPath;
+}
+
+void ensureReusableCoverPath(RecentBook& book) {
+  if (book.coverBmpPath.empty() || hasThumbnailPlaceholder(book.coverBmpPath)) {
+    return;
+  }
+
+  const std::string reusablePath = getReusableCoverPath(book);
+  if (reusablePath.empty() || reusablePath == book.coverBmpPath) {
+    return;
+  }
+
+  book.coverBmpPath = reusablePath;
+  updateRecentBookCoverPath(book, reusablePath);
+}
+}  // namespace
+
 void RecentBooksGridActivity::loadRecentBooks() {
   recentBooks.clear();
   const auto& books = RECENT_BOOKS.getBooks();
-  recentBooks.reserve(std::min(static_cast<int>(books.size()), MAX_BOOKS));
+  recentBooks.reserve(std::min(books.size(), static_cast<size_t>(MAX_GRID_BOOKS)));
 
   for (const auto& book : books) {
-    if (static_cast<int>(recentBooks.size()) >= MAX_BOOKS) break;
-    // Skip if file is gone — keeps stale entries from showing up as
-    // permanently-broken cover slots. (We don't delete from the store
-    // because RecentBooksStore has no public remove API.)
+    if (recentBooks.size() >= MAX_GRID_BOOKS) break;
     if (!Storage.exists(book.path.c_str())) continue;
-    recentBooks.push_back(book);
+    recentBooks.push_back(BookState{book});
   }
 }
 
+void RecentBooksGridActivity::ensureProgressLoaded(const int index) {
+  if (index < 0 || index >= static_cast<int>(recentBooks.size())) return;
+  if (recentBooks[index].progressLoaded) {
+    return;
+  }
+
+  recentBooks[index].progress = RecentBookProgress::loadPercent(recentBooks[index].book);
+  recentBooks[index].progressLoaded = true;
+}
+
 void RecentBooksGridActivity::loadPageCovers(int pageStart) {
   const int pageEnd = std::min(pageStart + BOOKS_PER_PAGE, static_cast<int>(recentBooks.size()));
 
-  // Cheap pre-pass: if every visible thumb already exists on disk, skip the
-  // heavy Epub/Xtc load entirely (no popup, no flicker).
   bool needsGeneration = false;
   for (int i = pageStart; i < pageEnd; ++i) {
-    if (recentBooks[i].coverBmpPath.empty()) continue;
-    const std::string thumbPath = UITheme::getCoverThumbPath(recentBooks[i].coverBmpPath, COVER_HEIGHT);
-    if (!Storage.exists(thumbPath.c_str())) {
+    RecentBook& book = recentBooks[i].book;
+    ensureReusableCoverPath(book);
+    if (book.coverBmpPath.empty()) {
+      needsGeneration = true;
+      break;
+    }
+    const std::string thumbPath = UITheme::getCoverThumbPath(book.coverBmpPath, COVER_WIDTH, COVER_HEIGHT);
+    if (needsCoverThumbGeneration(book, thumbPath)) {
       needsGeneration = true;
       break;
     }
@@ -56,21 +266,24 @@ void RecentBooksGridActivity::loadPageCovers(int pageStart) {
   int processedCount = 0;
 
   for (int i = pageStart; i < pageEnd; ++i) {
-    RecentBook& book = recentBooks[i];
+    RecentBook& book = recentBooks[i].book;
     const std::string coverPath =
-        book.coverBmpPath.empty() ? "" : UITheme::getCoverThumbPath(book.coverBmpPath, COVER_HEIGHT);
-    if (coverPath.empty() || !Storage.exists(coverPath.c_str())) {
+        book.coverBmpPath.empty() ? "" : UITheme::getCoverThumbPath(book.coverBmpPath, COVER_WIDTH, COVER_HEIGHT);
+    if (needsCoverThumbGeneration(book, coverPath)) {
       if (FsHelpers::hasEpubExtension(book.path)) {
         Epub epub(book.path, "/.crosspoint");
-        // load(false, true) = skip CSS, metadata only — same flags HomeActivity uses.
         if (epub.load(false, true)) {
           if (!showingLoading) {
             showingLoading = true;
             popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
           }
-          GUI.fillPopupProgress(renderer, popupRect, 10 + processedCount * (90 / totalToProcess));
-          if (!epub.generateThumbBmp(COVER_HEIGHT)) {
-            RECENT_BOOKS.updateBook(book.path, book.title, book.author, "");
+          GUI.fillPopupProgress(renderer, popupRect, 10 + (processedCount * 90) / totalToProcess);
+          if (epub.generateThumbBmp(COVER_WIDTH, COVER_HEIGHT)) {
+            const std::string reusablePath = epub.getThumbBmpPath();
+            book.coverBmpPath = reusablePath;
+            updateRecentBookCoverPath(book, reusablePath);
+          } else {
+            updateRecentBookCoverPath(book, "");
             book.coverBmpPath = "";
           }
         }
@@ -81,9 +294,13 @@ void RecentBooksGridActivity::loadPageCovers(int pageStart) {
             showingLoading = true;
             popupRect = GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
           }
-          GUI.fillPopupProgress(renderer, popupRect, 10 + processedCount * (90 / totalToProcess));
-          if (!xtc.generateThumbBmp(COVER_HEIGHT)) {
-            RECENT_BOOKS.updateBook(book.path, book.title, book.author, "");
+          GUI.fillPopupProgress(renderer, popupRect, 10 + (processedCount * 90) / totalToProcess);
+          if (xtc.generateThumbBmp(COVER_WIDTH, COVER_HEIGHT)) {
+            const std::string reusablePath = xtc.getThumbBmpPath();
+            book.coverBmpPath = reusablePath;
+            updateRecentBookCoverPath(book, reusablePath);
+          } else {
+            updateRecentBookCoverPath(book, "");
             book.coverBmpPath = "";
           }
         }
@@ -94,8 +311,6 @@ void RecentBooksGridActivity::loadPageCovers(int pageStart) {
 
   loadedPageStart = pageStart;
   if (showingLoading) {
-    // Force a redraw so the freshly-generated covers replace the popup
-    // and any placeholder slots painted earlier.
     requestUpdate();
   }
 }
@@ -104,7 +319,8 @@ void RecentBooksGridActivity::onEnter() {
   Activity::onEnter();
   loadRecentBooks();
   selectorIndex = 0;
-  loadedPageStart = -1;
+  loadedPageStart = NO_PAGE_LOADED;
+  ensureProgressLoaded(selectorIndex);
   requestUpdate();
 }
 
@@ -115,9 +331,9 @@ void RecentBooksGridActivity::onExit() {
 
 void RecentBooksGridActivity::loop() {
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
-    if (!recentBooks.empty() && selectorIndex < recentBooks.size()) {
-      LOG_DBG("RBGA", "Selected recent book: %s", recentBooks[selectorIndex].path.c_str());
-      onSelectBook(recentBooks[selectorIndex].path);
+    if (!recentBooks.empty() && selectorIndex >= 0 && selectorIndex < static_cast<int>(recentBooks.size())) {
+      LOG_DBG("RBGA", "Selected recent book: %s", recentBooks[selectorIndex].book.path.c_str());
+      onSelectBook(recentBooks[selectorIndex].book.path);
       return;
     }
   }
@@ -128,26 +344,35 @@ void RecentBooksGridActivity::loop() {
   }
 
   const int listSize = static_cast<int>(recentBooks.size());
-
-  buttonNavigator.onNextRelease([this, listSize] {
-    selectorIndex = ButtonNavigator::nextIndex(static_cast<int>(selectorIndex), listSize);
-    requestUpdate();
-  });
-  buttonNavigator.onPreviousRelease([this, listSize] {
-    selectorIndex = ButtonNavigator::previousIndex(static_cast<int>(selectorIndex), listSize);
-    requestUpdate();
-  });
-  // Continuous-press jumps a full row (3 covers) for fast grid traversal,
-  // matching the Lua reference.
-  constexpr int ROW_STEP = 3;
-  buttonNavigator.onNextContinuous([this, listSize] {
-    selectorIndex = ButtonNavigator::nextPageIndex(static_cast<int>(selectorIndex), listSize, ROW_STEP);
-    requestUpdate();
-  });
-  buttonNavigator.onPreviousContinuous([this, listSize] {
-    selectorIndex = ButtonNavigator::previousPageIndex(static_cast<int>(selectorIndex), listSize, ROW_STEP);
+  enum class NavDirection { Right, Left, Down, Up };
+  auto handleNav = [this, listSize](NavDirection direction) {
+    switch (direction) {
+      case NavDirection::Right:
+        selectorIndex = moveHorizontalInGrid(selectorIndex, listSize, true);
+        break;
+      case NavDirection::Left:
+        selectorIndex = moveHorizontalInGrid(selectorIndex, listSize, false);
+        break;
+      case NavDirection::Down:
+        selectorIndex = moveVerticalInGrid(selectorIndex, listSize, kGridColumns, BOOKS_PER_PAGE, true);
+        break;
+      case NavDirection::Up:
+        selectorIndex = moveVerticalInGrid(selectorIndex, listSize, kGridColumns, BOOKS_PER_PAGE, false);
+        break;
+    }
+    ensureProgressLoaded(selectorIndex);
     requestUpdate();
-  });
+  };
+
+  buttonNavigator.onRelease({MappedInputManager::Button::Right}, [&] { handleNav(NavDirection::Right); });
+  buttonNavigator.onRelease({MappedInputManager::Button::Left}, [&] { handleNav(NavDirection::Left); });
+  buttonNavigator.onRelease({MappedInputManager::Button::Down}, [&] { handleNav(NavDirection::Down); });
+  buttonNavigator.onRelease({MappedInputManager::Button::Up}, [&] { handleNav(NavDirection::Up); });
+
+  buttonNavigator.onContinuous({MappedInputManager::Button::Right}, [&] { handleNav(NavDirection::Right); });
+  buttonNavigator.onContinuous({MappedInputManager::Button::Left}, [&] { handleNav(NavDirection::Left); });
+  buttonNavigator.onContinuous({MappedInputManager::Button::Down}, [&] { handleNav(NavDirection::Down); });
+  buttonNavigator.onContinuous({MappedInputManager::Button::Up}, [&] { handleNav(NavDirection::Up); });
 }
 
 void RecentBooksGridActivity::render(RenderLock&&) {
@@ -157,142 +382,130 @@ void RecentBooksGridActivity::render(RenderLock&&) {
   const auto pageHeight = renderer.getScreenHeight();
   const auto& metrics = UITheme::getInstance().getMetrics();
 
-  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_MENU_RECENT_BOOKS));
-
-  const int contentTop = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
+  drawGridHeader(renderer, pageWidth);
+  constexpr int contentTop = kLyraGridContentTop;
   constexpr int titleStripHeight = 32;
-  constexpr int titleGridGap = 16;  // breathing room between title strip and the top row of covers
-  constexpr int columns = 3;
-  // Vertical row gap is a bit more than the horizontal one — equal pixel
-  // values read as visually tighter vertically because covers are taller
-  // than they are wide.
-  const int rowSpacing = metrics.verticalSpacing + 4;
-  const int totalGridWidth = columns * COVER_WIDTH + (columns - 1) * metrics.verticalSpacing;
+  constexpr int titleGridGap = 16;
+  constexpr int selectionPadding = 4;
+  constexpr int selectionOutlineGap = 2;
+  constexpr int selectionOuterInset = selectionPadding + selectionOutlineGap;
+  constexpr int gridSpacing = kLyraGridSpacing;
+  constexpr int rowSpacing = gridSpacing + 4;
+  constexpr int totalGridWidth = kGridColumns * COVER_WIDTH + (kGridColumns - 1) * gridSpacing;
   const int startXOffset = (pageWidth - totalGridWidth) / 2;
 
   const int totalBooks = static_cast<int>(recentBooks.size());
   const int totalPages = (totalBooks + BOOKS_PER_PAGE - 1) / BOOKS_PER_PAGE;
-  const int currentPage = (totalBooks > 0) ? (static_cast<int>(selectorIndex) / BOOKS_PER_PAGE) : 0;
+  const int currentPage = (totalBooks > 0) ? (selectorIndex / BOOKS_PER_PAGE) : 0;
   const int pageStart = currentPage * BOOKS_PER_PAGE;
   const int pageCount = std::min(BOOKS_PER_PAGE, totalBooks - pageStart);
 
   if (recentBooks.empty()) {
     renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding, contentTop + 20, tr(STR_NO_RECENT_BOOKS));
   } else {
-    // Selected-book title strip: 32 px tall, sits between the screen
-    // heading and the grid. Aligned to the grid's left edge (same x as
-    // the leftmost cover) and constrained to the grid's full width so its
-    // side padding mirrors the grid's. Typography only — no border.
-    if (selectorIndex < recentBooks.size()) {
-      const int titleLh = renderer.getLineHeight(UI_12_FONT_ID);
+    if (selectorIndex >= 0 && selectorIndex < static_cast<int>(recentBooks.size())) {
+      const int titleLh = renderer.getLineHeight(UI_10_FONT_ID);
       const int titleY = contentTop + (titleStripHeight - titleLh) / 2;
-      const std::string truncTitle = renderer.truncatedText(
-          UI_12_FONT_ID, recentBooks[selectorIndex].title.c_str(), totalGridWidth, EpdFontFamily::BOLD);
-      renderer.drawText(UI_12_FONT_ID, startXOffset, titleY, truncTitle.c_str(), true, EpdFontFamily::BOLD);
-    }
+      const auto& selectedBook = recentBooks[selectorIndex];
+      const bool hasProgress = selectedBook.progressLoaded && RecentBookProgress::hasPercent(selectedBook.progress);
+      const std::string progressLabel = hasProgress ? RecentBookProgress::formatPercent(selectedBook.progress) : "";
 
-    // Tracks the last loaded book's actual rendered dimensions so empty
-    // grid slots on the same page can match (otherwise empty boxes drawn
-    // at COVER_WIDTH × COVER_HEIGHT look bigger than the aspect-fit covers).
-    int sampleBw = COVER_WIDTH;
-    int sampleBh = COVER_HEIGHT;
-    bool haveSample = false;
+      const int progressIconSize = hasProgress ? std::max(8, titleLh - 2) : 0;
+      const char* progressSeparator = "  |   ";
+      const int separatorWidth =
+          hasProgress ? renderer.getTextWidth(UI_10_FONT_ID, progressSeparator, EpdFontFamily::REGULAR) : 0;
+      const int progressWidth =
+          hasProgress ? renderer.getTextWidth(UI_10_FONT_ID, progressLabel.c_str(), EpdFontFamily::REGULAR) : 0;
+      const int progressIconGap = hasProgress ? renderer.getTextWidth(UI_10_FONT_ID, "  ", EpdFontFamily::REGULAR) : 0;
+      const int progressSuffixWidth =
+          hasProgress ? separatorWidth + progressWidth + progressIconGap + progressIconSize : 0;
+      const int titleMaxWidth = std::max(0, totalGridWidth - progressSuffixWidth);
+      const std::string truncTitle =
+          renderer.truncatedText(UI_10_FONT_ID, selectedBook.book.title.c_str(), titleMaxWidth, EpdFontFamily::REGULAR);
+      renderer.drawText(UI_10_FONT_ID, startXOffset, titleY, truncTitle.c_str(), true, EpdFontFamily::REGULAR);
+      if (hasProgress) {
+        const int titleWidth = renderer.getTextWidth(UI_10_FONT_ID, truncTitle.c_str(), EpdFontFamily::REGULAR);
+        int progressX = startXOffset + titleWidth;
+        progressX = std::min(progressX, startXOffset + totalGridWidth - progressSuffixWidth);
+        renderer.drawText(UI_10_FONT_ID, progressX, titleY, progressSeparator, true, EpdFontFamily::REGULAR);
+        progressX += separatorWidth;
+        renderer.drawText(UI_10_FONT_ID, progressX, titleY, progressLabel.c_str(), true, EpdFontFamily::REGULAR);
+        const int iconX = progressX + progressWidth + progressIconGap;
+        const int iconY = titleY + (titleLh - progressIconSize) / 2;
+        drawInlineProgressCircle(renderer, iconX, iconY, progressIconSize, selectedBook.progress);
+      }
+    }
 
     for (int i = 0; i < pageCount; ++i) {
       const int bookIdx = pageStart + i;
-      const int col = i % columns;
-      const int row = i / columns;
-      const int x = startXOffset + col * (COVER_WIDTH + metrics.verticalSpacing);
+      const int col = i % kGridColumns;
+      const int row = i / kGridColumns;
+      const int x = startXOffset + col * (COVER_WIDTH + gridSpacing);
       const int y = contentTop + titleStripHeight + titleGridGap + row * (COVER_HEIGHT + rowSpacing);
 
-      // Per-cell render bounds. Default to full cell for the placeholder
-      // path; if a real cover loads we shrink these to the cover's true
-      // aspect so the outline + selection border hug the cover and don't
-      // leave a white sliver on books that aren't 123:180.
-      int bx = x;
-      int by = y;
-      int bw = COVER_WIDTH;
-      int bh = COVER_HEIGHT;
+      const int bx = x;
+      const int by = y;
+      constexpr int bw = COVER_WIDTH;
+      constexpr int bh = COVER_HEIGHT;
       bool drawn = false;
       const std::string thumbPath =
-          recentBooks[bookIdx].coverBmpPath.empty()
+          recentBooks[bookIdx].book.coverBmpPath.empty()
               ? ""
-              : UITheme::getCoverThumbPath(recentBooks[bookIdx].coverBmpPath, COVER_HEIGHT);
+              : UITheme::getCoverThumbPath(recentBooks[bookIdx].book.coverBmpPath, COVER_WIDTH, COVER_HEIGHT);
       if (!thumbPath.empty() && Storage.exists(thumbPath.c_str())) {
         FsFile file;
         if (Storage.openFileForRead("RBGA", thumbPath, file)) {
           Bitmap bmp(file);
           if (bmp.parseHeaders() == BmpReaderError::Ok && bmp.getWidth() > 0 && bmp.getHeight() > 0) {
-            bw = std::min(COVER_WIDTH, bmp.getWidth());
-            bh = std::min(COVER_HEIGHT, bmp.getHeight());
-            bx = x + (COVER_WIDTH - bw) / 2;
-            by = y + (COVER_HEIGHT - bh) / 2;
-            renderer.drawBitmap(bmp, bx, by, bw, bh);
-            renderer.drawRect(bx, by, bw, bh, 2, true);
+            float cropX = 0.0f;
+            float cropY = 0.0f;
+            calculateCoverFillCrop(bmp, cropX, cropY);
+            renderer.fillRoundedRect(bx, by, bw, bh, kCoverCornerRadius, Color::White);
+            renderer.drawBitmap(bmp, bx, by, bw, bh, cropX, cropY);
+            renderer.maskRoundedRectOutsideCorners(bx, by, bw, bh, kCoverCornerRadius, Color::White);
+            renderer.drawRoundedRect(bx, by, bw, bh, 2, kCoverCornerRadius, true);
             drawn = true;
-            sampleBw = bw;
-            sampleBh = bh;
-            haveSample = true;
           }
           file.close();
         }
       }
       if (!drawn) {
-        // Empty cover slot: outlined box with a centered book icon.
-        renderer.drawRect(bx, by, bw, bh, 2, true);
-        renderer.fillRect(bx + 2, by + 2, bw - 4, bh - 4, false);
+        renderer.fillRoundedRect(bx, by, bw, bh, kCoverCornerRadius, Color::White);
+        renderer.drawRoundedRect(bx, by, bw, bh, 2, kCoverCornerRadius, true);
         renderer.drawIcon(BookIcon, bx + (bw - 32) / 2, by + (bh - 32) / 2, 32, 32);
       }
       if (bookIdx == static_cast<int>(selectorIndex)) {
-        renderer.drawRect(bx - 2, by - 2, bw + 4, bh + 4, 3, true);
+        renderer.drawRoundedRect(bx - selectionPadding, by - selectionPadding, bw + selectionPadding * 2,
+                                 bh + selectionPadding * 2, 3, kCoverCornerRadius + selectionPadding, true);
+        renderer.drawRoundedRect(bx - selectionOuterInset, by - selectionOuterInset, bw + selectionOuterInset * 2,
+                                 bh + selectionOuterInset * 2, 1, kCoverCornerRadius + selectionOuterInset, true);
       }
     }
 
-    // Empty grid slots get a thinner 1 px border (so the actual books'
-    // 2 px border reads as the dominant element). Sized to match the
-    // sampled book footprint so empty boxes don't look bigger than the
-    // aspect-fit covers around them; falls back to a 0.66 ratio if no
-    // book on this page rendered.
-    if (!haveSample) {
-      sampleBh = COVER_HEIGHT;
-      sampleBw = (COVER_HEIGHT * 66) / 100;
-    }
-    const int sampleXInset = (COVER_WIDTH - sampleBw) / 2;
-    const int sampleYInset = (COVER_HEIGHT - sampleBh) / 2;
-    for (int i = pageCount; i < BOOKS_PER_PAGE; ++i) {
-      const int col = i % columns;
-      const int row = i / columns;
-      const int px = startXOffset + col * (COVER_WIDTH + metrics.verticalSpacing) + sampleXInset;
-      const int py = contentTop + titleStripHeight + titleGridGap + row * (COVER_HEIGHT + rowSpacing) + sampleYInset;
-      renderer.drawRect(px, py, sampleBw, sampleBh, 1, true);
-    }
-
     if (totalPages > 1) {
-      constexpr int dotSize = 10;
-      constexpr int dotSpacing = 8;
+      constexpr int dotSize = 8;
+      constexpr int dotSpacing = 6;
       const int totalDotWidth = totalPages * dotSize + (totalPages - 1) * dotSpacing;
       const int dotsStartX = (pageWidth - totalDotWidth) / 2;
       const int dotY = pageHeight - metrics.buttonHintsHeight - metrics.verticalSpacing - 4;
-      constexpr int dotRadius = dotSize / 2;  // 5 → fully-circular bullet on 10x10
       for (int p = 0; p < totalPages; p++) {
         const int dx = dotsStartX + p * (dotSize + dotSpacing);
         if (p == currentPage) {
-          renderer.fillRoundedRect(dx, dotY, dotSize, dotSize, dotRadius, Color::Black);
+          renderer.fillRect(dx, dotY, dotSize, dotSize, true);
         } else {
-          renderer.drawRoundedRect(dx, dotY, dotSize, dotSize, 1, dotRadius, true);
+          renderer.drawRect(dx, dotY, dotSize, dotSize, true);
         }
       }
     }
   }
 
-  const auto labels = mappedInput.mapLabels(tr(STR_HOME), tr(STR_OPEN), tr(STR_DIR_PREV), tr(STR_DIR_NEXT));
+  // The four physical hint slots are already occupied; Up/Down still navigate
+  // the grid but are not rendered in this compact hint bar.
+  const auto labels = mappedInput.mapLabels(tr(STR_HOME), tr(STR_OPEN), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT));
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
   renderer.displayBuffer();
 
-  // Defer cover generation until AFTER displayBuffer so the user sees
-  // placeholder slots immediately when paging — then the popup appears and
-  // covers stream in. Same ordering as the Lua reference.
   if (!recentBooks.empty() && loadedPageStart != pageStart) {
     loadPageCovers(pageStart);
   }
diff --git a/src/activities/home/RecentBooksGridActivity.h b/src/activities/home/RecentBooksGridActivity.h
index 202e5588..490887b8 100644
--- a/src/activities/home/RecentBooksGridActivity.h
+++ b/src/activities/home/RecentBooksGridActivity.h
@@ -1,41 +1,39 @@
 #pragma once
-#include <I18n.h>
 
-#include <string>
 #include <vector>
 
 #include "../Activity.h"
 #include "RecentBooksStore.h"
 #include "util/ButtonNavigator.h"
 
-// Lua-fork-style grid view of recent books. 3x3 covers per page, paged when
-// there are more than 9 books, on-demand thumbnail generation behind a
-// loading popup. Replaces the plain-list RecentBooksActivity at the dispatch
-// site (ActivityManager::goToRecentBooks); the original activity file is
-// kept untouched for clean upstream merges.
 class RecentBooksGridActivity final : public Activity {
  public:
-  static constexpr int BOOKS_PER_PAGE = 9;   // 3 cols x 3 rows
-  static constexpr int MAX_BOOKS = BOOKS_PER_PAGE * 2;
+  static constexpr int BOOKS_PER_PAGE = 9;  // 3 cols x 3 rows
+  static constexpr int MAX_GRID_BOOKS = BOOKS_PER_PAGE * 2;
   static constexpr int COVER_HEIGHT = 180;
   static constexpr int COVER_WIDTH = 123;
 
- private:
-  ButtonNavigator buttonNavigator;
-  size_t selectorIndex = 0;
-  std::vector<RecentBook> recentBooks;
-  // Track which page's covers we've already attempted to generate, so we
-  // only run the heavy Epub/Xtc thumb path when the user pages.
-  int loadedPageStart = -1;
-
-  void loadRecentBooks();
-  void loadPageCovers(int pageStart);
-
- public:
   explicit RecentBooksGridActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
       : Activity("RecentBooksGrid", renderer, mappedInput) {}
   void onEnter() override;
   void onExit() override;
   void loop() override;
   void render(RenderLock&&) override;
+
+ private:
+  struct BookState {
+    RecentBook book;
+    float progress = -1.0f;
+    bool progressLoaded = false;
+  };
+  static constexpr int NO_PAGE_LOADED = -1;
+
+  ButtonNavigator buttonNavigator;
+  int selectorIndex = 0;
+  std::vector<BookState> recentBooks;
+  int loadedPageStart = NO_PAGE_LOADED;
+
+  void loadRecentBooks();
+  void loadPageCovers(int pageStart);
+  void ensureProgressLoaded(int index);
 };
diff --git a/src/activities/network/CrossPointWebServerActivity.cpp b/src/activities/network/CrossPointWebServerActivity.cpp
index 7b84cca0..f16fe1bf 100644
--- a/src/activities/network/CrossPointWebServerActivity.cpp
+++ b/src/activities/network/CrossPointWebServerActivity.cpp
@@ -30,6 +30,16 @@ constexpr int QR_CODE_HEIGHT = 198;
 // DNS server for captive portal (redirects all DNS queries to our IP)
 DNSServer* dnsServer = nullptr;
 constexpr uint16_t DNS_PORT = 53;
+
+// 0..4 bars from RSSI (dBm), with 3 dBm hysteresis on currentBars to suppress flicker.
+int barsForRssi(int rssi, int currentBars) {
+  static constexpr int RISE_DBM[] = {-85, -75, -65, -55};
+  static constexpr int FALL_DBM[] = {-88, -78, -68, -58};
+  int bars = std::clamp(currentBars, 0, 4);
+  while (bars < 4 && rssi >= RISE_DBM[bars]) bars++;
+  while (bars > 0 && rssi < FALL_DBM[bars - 1]) bars--;
+  return bars;
+}
 }  // namespace
 
 void CrossPointWebServerActivity::onEnter() {
@@ -247,6 +257,7 @@ void CrossPointWebServerActivity::startWebServer() {
   if (webServer->isRunning()) {
     state = WebServerActivityState::SERVER_RUNNING;
     LOG_DBG("WEBACT", "Web server started successfully");
+    lastWifiBars = isApMode ? 0 : barsForRssi(WiFi.RSSI(), 0);
 
     // Force an immediate render since we're transitioning from a subactivity
     // that had its own rendering task. We need to make sure our display is shown.
@@ -291,18 +302,42 @@ void CrossPointWebServerActivity::loop() {
       if (millis() - lastWifiCheck > 2000) {  // Check every 2 seconds
         lastWifiCheck = millis();
         const wl_status_t wifiStatus = WiFi.status();
+        // Driver auto-reconnect handles retries; abandon (via onGoHome) only
+        // after WIFI_ABANDON_MS, otherwise the activity freezes on a blip.
+        bool repaint = false;
         if (wifiStatus != WL_CONNECTED) {
-          LOG_DBG("WEBACT", "WiFi disconnected! Status: %d", wifiStatus);
-          // Show error and exit gracefully
-          state = WebServerActivityState::SHUTTING_DOWN;
-          requestUpdate();
-          return;
-        }
-        // Log weak signal warnings
-        const int rssi = WiFi.RSSI();
-        if (rssi < -75) {
-          LOG_DBG("WEBACT", "Warning: Weak WiFi signal: %d dBm", rssi);
+          if (consecutiveDisconnects == 0) {
+            firstDisconnectAt = millis();
+            repaint = true;
+          }
+          consecutiveDisconnects++;
+          LOG_DBG("WEBACT", "WiFi not connected (status=%d, consecutive=%d, total=%lu ms)", wifiStatus,
+                  consecutiveDisconnects, millis() - firstDisconnectAt);
+          if (millis() - firstDisconnectAt > WIFI_ABANDON_MS) {
+            LOG_DBG("WEBACT", "WiFi unavailable for >%lu s; returning to network selection", WIFI_ABANDON_MS / 1000UL);
+            state = WebServerActivityState::SHUTTING_DOWN;
+            onGoHome();
+            return;
+          }
+        } else {
+          if (consecutiveDisconnects > 0) {
+            LOG_DBG("WEBACT", "WiFi recovered after %d failed checks (%lu ms)", consecutiveDisconnects,
+                    millis() - firstDisconnectAt);
+            repaint = true;
+          }
+          consecutiveDisconnects = 0;
+          firstDisconnectAt = 0;
+          const int rssi = WiFi.RSSI();
+          if (rssi < -75) {
+            LOG_DBG("WEBACT", "Warning: Weak WiFi signal: %d dBm", rssi);
+          }
+          const int bars = barsForRssi(rssi, lastWifiBars);
+          if (bars != lastWifiBars) {
+            lastWifiBars = bars;
+            repaint = true;
+          }
         }
+        if (repaint) requestUpdate();
       }
     }
 
@@ -385,6 +420,10 @@ void CrossPointWebServerActivity::renderServerRunning() const {
   GUI.drawSubHeader(renderer, Rect{0, metrics.topPadding + metrics.headerHeight, pageWidth, metrics.tabBarHeight},
                     connectedSSID.c_str());
 
+  if (!isApMode) {
+    renderWifiIndicator(metrics.topPadding + metrics.headerHeight);
+  }
+
   int startY = metrics.topPadding + metrics.headerHeight + metrics.tabBarHeight + metrics.verticalSpacing * 2;
   int height10 = renderer.getLineHeight(UI_10_FONT_ID);
   if (isApMode) {
@@ -449,3 +488,35 @@ void CrossPointWebServerActivity::renderServerRunning() const {
   const auto labels = mappedInput.mapLabels(tr(STR_EXIT), "", "", "");
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 }
+
+void CrossPointWebServerActivity::renderWifiIndicator(int subHeaderTop) const {
+  constexpr int BAR_COUNT = 4;
+  constexpr int BAR_WIDTH = 4;
+  constexpr int BAR_GAP = 2;
+  constexpr int ICON_HEIGHT = 14;
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  const int iconWidth = BAR_COUNT * BAR_WIDTH + (BAR_COUNT - 1) * BAR_GAP;
+  const int iconRight = renderer.getScreenWidth() - metrics.contentSidePadding;
+  const int iconLeft = iconRight - iconWidth;
+  const int iconBottom = subHeaderTop + metrics.tabBarHeight - metrics.verticalSpacing;
+
+  const bool wifiUp = (WiFi.status() == WL_CONNECTED) && (consecutiveDisconnects == 0);
+  if (wifiUp) {
+    for (int i = 0; i < BAR_COUNT; i++) {
+      const int barHeight = (i + 1) * ICON_HEIGHT / BAR_COUNT;
+      const int x = iconLeft + i * (BAR_WIDTH + BAR_GAP);
+      const int y = iconBottom - barHeight;
+      if (i < lastWifiBars) {
+        renderer.fillRect(x, y, BAR_WIDTH, barHeight, true);
+      } else {
+        renderer.drawRect(x, y, BAR_WIDTH, barHeight, true);
+      }
+    }
+  } else {
+    const int xSize = ICON_HEIGHT;
+    const int x0 = iconRight - xSize;
+    const int y0 = iconBottom - xSize;
+    renderer.drawLine(x0, y0, x0 + xSize, y0 + xSize, 2, true);
+    renderer.drawLine(x0, y0 + xSize, x0 + xSize, y0, 2, true);
+  }
+}
diff --git a/src/activities/network/CrossPointWebServerActivity.h b/src/activities/network/CrossPointWebServerActivity.h
index dd97b508..99d32443 100644
--- a/src/activities/network/CrossPointWebServerActivity.h
+++ b/src/activities/network/CrossPointWebServerActivity.h
@@ -45,7 +45,16 @@ class CrossPointWebServerActivity final : public Activity {
   // Performance monitoring
   unsigned long lastHandleClientTime = 0;
 
+  // Sustained WiFi-loss tracking; abandon only after WIFI_ABANDON_MS.
+  int consecutiveDisconnects = 0;
+  unsigned long firstDisconnectAt = 0;
+  static constexpr unsigned long WIFI_ABANDON_MS = 5UL * 60UL * 1000UL;
+
+  // Cached signal-strength bracket (0..4) for the WiFi indicator.
+  int lastWifiBars = 0;
+
   void renderServerRunning() const;
+  void renderWifiIndicator(int subHeaderTop) const;
 
   void onNetworkModeSelected(NetworkMode mode);
   void onWifiSelectionComplete(bool connected);
diff --git a/src/activities/network/NetworkModeSelectionActivity.h b/src/activities/network/NetworkModeSelectionActivity.h
index a119bc1b..e9524c65 100644
--- a/src/activities/network/NetworkModeSelectionActivity.h
+++ b/src/activities/network/NetworkModeSelectionActivity.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 enum class NetworkMode { JOIN_NETWORK, CONNECT_CALIBRE, CREATE_HOTSPOT };
diff --git a/src/activities/network/WifiSelectionActivity.cpp b/src/activities/network/WifiSelectionActivity.cpp
index e6c61a5b..096901e6 100644
--- a/src/activities/network/WifiSelectionActivity.cpp
+++ b/src/activities/network/WifiSelectionActivity.cpp
@@ -292,6 +292,14 @@ void WifiSelectionActivity::checkConnectionStatus() {
 }
 
 void WifiSelectionActivity::loop() {
+  if ((state == WifiSelectionState::SCANNING || state == WifiSelectionState::CONNECTING ||
+       state == WifiSelectionState::AUTO_CONNECTING) &&
+      mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+    WiFi.disconnect();
+    onComplete(false);
+    return;
+  }
+
   // Check scan progress
   if (state == WifiSelectionState::SCANNING) {
     processWifiScanResults();
@@ -567,6 +575,9 @@ void WifiSelectionActivity::renderConnecting() const {
     }
     renderer.drawCenteredText(UI_10_FONT_ID, top, ssidInfo.c_str());
   }
+
+  const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 }
 
 void WifiSelectionActivity::renderConnected() const {
diff --git a/src/activities/reader/BookSettingsDrawerActivity.cpp b/src/activities/reader/BookSettingsDrawerActivity.cpp
index fc49efec..935bf60e 100644
--- a/src/activities/reader/BookSettingsDrawerActivity.cpp
+++ b/src/activities/reader/BookSettingsDrawerActivity.cpp
@@ -1,5 +1,6 @@
 #include "BookSettingsDrawerActivity.h"
 
+#include <BluetoothHIDManager.h>
 #include <GfxRenderer.h>
 #include <HalDisplay.h>
 #include <I18n.h>
@@ -106,9 +107,47 @@ void BookSettingsDrawerActivity::buildItems() {
     items.push_back(std::move(item));
   }
 
-  // (BT toggle / Reconnect Bonded Remote intentionally NOT included here.
-  // Those live in the existing reader menu's Bluetooth entry to keep the
-  // drawer focused on reading settings.)
+  // 2) Bluetooth quick-action. One-shot button: enables BLE (if needed) and
+  // reconnects to the bonded remote synchronously, then closes the drawer.
+  // If the user has no bonded remote, instead closes the drawer with a flag
+  // asking the reader to launch the full BT settings UI for pairing.
+  {
+    Item bt;
+    bt.nameId = StrId::STR_BT_QUICK_CONNECT;
+    bt.isAction = true;
+    bt.activate = [this]() {
+      auto& btMgr = BluetoothHIDManager::getInstance();
+      const bool hasBonded = SETTINGS.bleBondedDeviceAddr[0] != '\0';
+      if (!hasBonded) {
+        // No saved remote — bounce out to the BT settings activity so the
+        // user can scan and pair. Reader's drawer result handler picks up
+        // the flag and launches the BT UI.
+        MenuResult result;
+        result.settingsChanged = settingsChanged;
+        result.requestBluetoothFlow = true;
+        setResult(ActivityResult{result});
+        finish();
+        return;
+      }
+      // Show a "Connecting..." popup while the synchronous connect runs
+      // (~2-3 s for NimBLE + GATT handshake). The user is still inside the
+      // drawer render; we just paint over it.
+      GUI.drawPopup(renderer, tr(STR_CONNECTING));
+      renderer.displayBuffer(HalDisplay::FAST_REFRESH);
+      if (!btMgr.isEnabled()) {
+        btMgr.enable();
+      }
+      btMgr.connectToDevice(SETTINGS.bleBondedDeviceAddr);
+      // Whether connect succeeded or not, close the drawer. (If it failed,
+      // the BT stack stays enabled — auto-reconnect will retry on next
+      // button press.) Drawer dismissal mirrors the existing Back path.
+      MenuResult result;
+      result.settingsChanged = settingsChanged;
+      setResult(ActivityResult{result});
+      finish();
+    };
+    items.push_back(std::move(bt));
+  }
 }
 
 void BookSettingsDrawerActivity::layoutDrawer() {
diff --git a/src/activities/reader/BookSettingsDrawerActivity.h b/src/activities/reader/BookSettingsDrawerActivity.h
index 8a2b024d..5bcc941f 100644
--- a/src/activities/reader/BookSettingsDrawerActivity.h
+++ b/src/activities/reader/BookSettingsDrawerActivity.h
@@ -79,7 +79,10 @@ class BookSettingsDrawerActivity final : public Activity {
   int drawerH = 0;
   int itemHeight = 40;
   int itemsVisible = 8;
-  int hintsHeight = 28;
+  // Reserve enough vertical space below the list for the button-hint line
+  // to render fully — at 28 the SMALL_FONT baseline + descender was clipping
+  // against the screen bottom.
+  int hintsHeight = 44;
 
   // Tab + panel decoration constants. The tab sits centred above the panel's
   // top edge, with its bottom extending TAB_OVERLAP_PX into the panel so the
diff --git a/src/activities/reader/BookStatsView.cpp b/src/activities/reader/BookStatsView.cpp
index 54907b6c..294a70a1 100644
--- a/src/activities/reader/BookStatsView.cpp
+++ b/src/activities/reader/BookStatsView.cpp
@@ -157,6 +157,6 @@ void renderBookStatsView(GfxRenderer& renderer, const MappedInputManager* mapped
 
   if (showButtonHints && mappedInput) {
     const auto labels = mappedInput->mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
   }
 }
diff --git a/src/activities/reader/ControlsOptionsActivity.cpp b/src/activities/reader/ControlsOptionsActivity.cpp
new file mode 100644
index 00000000..7c2335ed
--- /dev/null
+++ b/src/activities/reader/ControlsOptionsActivity.cpp
@@ -0,0 +1,202 @@
+#include "ControlsOptionsActivity.h"
+
+#include <GfxRenderer.h>
+#include <I18n.h>
+#include <Logging.h>
+
+#include <algorithm>
+#include <cstring>
+
+#include "CrossPointSettings.h"
+#include "MappedInputManager.h"
+#include "SettingsList.h"
+#include "activities/settings/ButtonRemapActivity.h"
+#include "components/UITheme.h"
+#include "fontIds.h"
+
+void ControlsOptionsActivity::onEnter() {
+  Activity::onEnter();
+
+  rebuildSettingsList();
+  requestUpdate();
+}
+
+void ControlsOptionsActivity::onExit() { Activity::onExit(); }
+
+void ControlsOptionsActivity::rebuildSettingsList() {
+  settings.clear();
+
+  const auto allSettings = getSettingsList();
+  auto addControlSetting = [&](StrId nameId) {
+    const auto it = std::find_if(allSettings.begin(), allSettings.end(),
+                                 [nameId](const auto& setting) { return setting.nameId == nameId; });
+    if (it != allSettings.end()) {
+      settings.push_back(*it);
+      return;
+    }
+    LOG_ERR("CTRL", "Missing control setting definition for nameId=%d", static_cast<int>(nameId));
+  };
+  auto addControlSettingByKey = [&](const char* key) {
+    const auto it = std::find_if(allSettings.begin(), allSettings.end(), [key](const auto& setting) {
+      return setting.key && std::strcmp(setting.key, key) == 0;
+    });
+    if (it != allSettings.end()) {
+      settings.push_back(*it);
+      return;
+    }
+    LOG_ERR("CTRL", "Missing control setting definition for key=%s", key);
+  };
+
+  const bool hasTiltPageTurnSetting = std::any_of(allSettings.begin(), allSettings.end(), [](const auto& setting) {
+    return setting.nameId == StrId::STR_TILT_PAGE_TURN;
+  });
+  const size_t expectedControlsSettingsCount = hasTiltPageTurnSetting ? 15 : 13;
+  settings.reserve(expectedControlsSettingsCount);
+
+  settings.push_back(SettingInfo::SectionHeader(StrId::STR_POWER_BUTTON));
+  addControlSetting(StrId::STR_SHORT_PWR_BTN);
+  addControlSetting(StrId::STR_LONG_PRESS_ACTION);
+  settings.push_back(SettingInfo::SectionHeader(StrId::STR_FRONT_BUTTONS));
+  settings.push_back(SettingInfo::Action(StrId::STR_REMAP_FRONT_BUTTONS, SettingAction::RemapFrontButtons));
+  settings.push_back(
+      SettingInfo::Action(StrId::STR_REMAP_FRONT_BUTTONS_READER, SettingAction::RemapFrontButtonsReader));
+  addControlSettingByKey("frontButtonOrientationAware");
+  addControlSetting(StrId::STR_LONG_PRESS_BEHAVIOR);
+  addControlSetting(StrId::STR_LONG_PRESS_MENU_ACTION);
+  settings.push_back(SettingInfo::SectionHeader(StrId::STR_SIDE_BUTTONS));
+  addControlSetting(StrId::STR_SIDE_BTN_LAYOUT);
+  addControlSettingByKey("sideButtonOrientationAware");
+  addControlSetting(StrId::STR_SIDE_BTN_LONG_PRESS);
+  if (hasTiltPageTurnSetting) {
+    settings.push_back(SettingInfo::SectionHeader(StrId::STR_OTHER));
+    addControlSetting(StrId::STR_TILT_PAGE_TURN);
+  }
+
+  settingsCount = static_cast<int>(settings.size());
+  selectedIndex = 0;
+  while (selectedIndex < settingsCount && settings[selectedIndex].type == SettingType::SECTION_HEADER) {
+    selectedIndex++;
+  }
+  if (selectedIndex >= settingsCount) {
+    selectedIndex = 0;
+  }
+}
+
+void ControlsOptionsActivity::moveSelection(bool forward) {
+  if (settingsCount <= 0) return;
+
+  for (int i = 0; i < settingsCount; i++) {
+    selectedIndex = forward ? ButtonNavigator::nextIndex(selectedIndex, settingsCount)
+                            : ButtonNavigator::previousIndex(selectedIndex, settingsCount);
+    if (settings[selectedIndex].type != SettingType::SECTION_HEADER) {
+      break;
+    }
+  }
+}
+
+void ControlsOptionsActivity::toggleCurrentSetting() {
+  if (selectedIndex < 0 || selectedIndex >= settingsCount) return;
+  const auto& setting = settings[selectedIndex];
+
+  if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
+    const bool cur = SETTINGS.*(setting.valuePtr);
+    SETTINGS.*(setting.valuePtr) = !cur;
+    SETTINGS.saveToFile();
+  } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
+    const uint8_t cur = SETTINGS.*(setting.valuePtr);
+    SETTINGS.*(setting.valuePtr) = (cur + 1) % static_cast<uint8_t>(setting.enumValues.size());
+    SETTINGS.saveToFile();
+  } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
+    const int8_t cur = SETTINGS.*(setting.valuePtr);
+    if (cur + setting.valueRange.step > setting.valueRange.max) {
+      SETTINGS.*(setting.valuePtr) = setting.valueRange.min;
+    } else {
+      SETTINGS.*(setting.valuePtr) = cur + setting.valueRange.step;
+    }
+    SETTINGS.saveToFile();
+  } else if (setting.type == SettingType::ACTION) {
+    if (setting.action == SettingAction::RemapFrontButtons) {
+      startActivityForResult(std::make_unique<ButtonRemapActivity>(renderer, mappedInput, false),
+                             [](const ActivityResult&) { SETTINGS.saveToFile(); });
+      return;
+    }
+    if (setting.action == SettingAction::RemapFrontButtonsReader) {
+      startActivityForResult(std::make_unique<ButtonRemapActivity>(renderer, mappedInput, true),
+                             [](const ActivityResult&) { SETTINGS.saveToFile(); });
+      return;
+    }
+  }
+}
+
+void ControlsOptionsActivity::loop() {
+  buttonNavigator.onNextRelease([this] {
+    moveSelection(true);
+    requestUpdate();
+  });
+
+  buttonNavigator.onPreviousRelease([this] {
+    moveSelection(false);
+    requestUpdate();
+  });
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    toggleCurrentSetting();
+    requestUpdate();
+    return;
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+    SETTINGS.saveToFile();
+    finish();
+    return;
+  }
+}
+
+void ControlsOptionsActivity::render(RenderLock&&) {
+  renderer.clearScreen();
+
+  const auto pageWidth = renderer.getScreenWidth();
+  const auto pageHeight = renderer.getScreenHeight();
+  const auto& metrics = UITheme::getInstance().getMetrics();
+
+  const auto orientation = renderer.getOrientation();
+  const bool isLandscapeCw = orientation == GfxRenderer::Orientation::LandscapeClockwise;
+  const bool isLandscapeCcw = orientation == GfxRenderer::Orientation::LandscapeCounterClockwise;
+  const int hintGutterWidth = (isLandscapeCw || isLandscapeCcw) ? metrics.buttonHintsHeight : 0;
+  const int contentX = isLandscapeCw ? hintGutterWidth : 0;
+  const int contentWidth = pageWidth - hintGutterWidth;
+
+  GUI.drawHeader(renderer, Rect{contentX, metrics.topPadding, contentWidth, metrics.headerHeight}, tr(STR_CAT_CONTROLS),
+                 nullptr);
+
+  GUI.drawList(
+      renderer,
+      Rect{contentX, metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing, contentWidth,
+           pageHeight -
+               (metrics.topPadding + metrics.headerHeight + metrics.buttonHintsHeight + metrics.verticalSpacing * 2)},
+      settingsCount, selectedIndex, [this](int i) { return std::string(I18N.get(settings[i].nameId)); }, nullptr,
+      nullptr,
+      [this](int i) {
+        const auto& setting = settings[i];
+        std::string valueText;
+        if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
+          valueText = SETTINGS.*(setting.valuePtr) ? tr(STR_STATE_ON) : tr(STR_STATE_OFF);
+        } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
+          const uint8_t value = SETTINGS.*(setting.valuePtr);
+          const uint8_t safeValue = value < setting.enumValues.size() ? value : 0;
+          valueText = I18N.get(setting.enumValues[safeValue]);
+        } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
+          valueText = std::to_string(SETTINGS.*(setting.valuePtr));
+        }
+        return valueText;
+      },
+      true, nullptr, [this](int i) { return settings[i].type == SettingType::SECTION_HEADER; });
+
+  const bool currentIsAction =
+      selectedIndex >= 0 && selectedIndex < settingsCount && settings[selectedIndex].type == SettingType::ACTION;
+  const auto labels = mappedInput.mapLabels(tr(STR_BACK), currentIsAction ? tr(STR_SELECT) : tr(STR_TOGGLE),
+                                            tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
+
+  renderer.displayBuffer();
+}
diff --git a/src/activities/reader/ControlsOptionsActivity.h b/src/activities/reader/ControlsOptionsActivity.h
new file mode 100644
index 00000000..3f9df474
--- /dev/null
+++ b/src/activities/reader/ControlsOptionsActivity.h
@@ -0,0 +1,28 @@
+#pragma once
+#include <I18n.h>
+
+#include <vector>
+
+#include "../Activity.h"
+#include "../settings/SettingsActivity.h"
+#include "util/ButtonNavigator.h"
+
+class ControlsOptionsActivity final : public Activity {
+  ButtonNavigator buttonNavigator;
+  int selectedIndex = 0;
+  int settingsCount = 0;
+  std::vector<SettingInfo> settings;
+
+  void rebuildSettingsList();
+  void moveSelection(bool forward);
+  void toggleCurrentSetting();
+
+ public:
+  explicit ControlsOptionsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
+      : Activity("ControlsOptions", renderer, mappedInput) {}
+  void onEnter() override;
+  void onExit() override;
+  void loop() override;
+  void render(RenderLock&&) override;
+  bool allowPowerAsConfirmInReaderMode() const override { return true; }
+};
diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp
index d5eb40d1..3f749e6a 100644
--- a/src/activities/reader/EpubReaderActivity.cpp
+++ b/src/activities/reader/EpubReaderActivity.cpp
@@ -1,8 +1,9 @@
 #include "EpubReaderActivity.h"
 
+#include <Arduino.h>
 #include <BluetoothHIDManager.h>
-#include "../boot_sleep/SleepActivity.h"
 
+#include "../boot_sleep/SleepActivity.h"
 #include <Epub/Page.h>
 #include <Epub/blocks/TextBlock.h>
 #include <FontCacheManager.h>
@@ -11,13 +12,15 @@
 #include <HalStorage.h>
 #include <I18n.h>
 #include <Logging.h>
+#include <MemoryBudget.h>
 #include <esp_system.h>
 
-#include <array>
+#include <algorithm>
 #include <functional>
 #include <limits>
 #include <memory>
 
+#include "../settings/BluetoothSettingsActivity.h"
 #include "../settings/KOReaderSettingsActivity.h"
 #include "BookSettingsDrawerActivity.h"
 #include "BookStatsActivity.h"
@@ -27,26 +30,44 @@
 #include "EpubReaderChapterSelectionActivity.h"
 #include "EpubReaderFootnotesActivity.h"
 #include "EpubReaderPercentSelectionActivity.h"
+#include "EpubReaderUtils.h"
 #include "GlobalActions.h"
 #include "KOReaderCredentialStore.h"
 #include "KOReaderSyncActivity.h"
 #include "MappedInputManager.h"
+#include "ProgressMapper.h"
 #include "QrDisplayActivity.h"
 #include "ReaderUtils.h"
 #include "RecentBooksStore.h"
+#include "SdCardFontSystem.h"
 #include "activities/util/ConfirmationActivity.h"
+#include "activities/util/IntervalSelectionActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 #include "util/ScreenshotUtil.h"
 
 namespace {
 // pagesPerRefresh now comes from SETTINGS.getRefreshFrequency()
-constexpr unsigned long skipChapterMs = 700;
 constexpr unsigned long longPressMenuMs = 600;
-// seconds per page, ordered slowest to fastest; index 0 is unused (off state)
-constexpr std::array<int, 8> PAGE_TURN_INTERVALS_S = {0, 60, 45, 30, 20, 15, 10, 5};
+constexpr uint16_t DEFAULT_AUTO_PAGE_TURN_INTERVAL_S = 30;
+constexpr uint16_t MIN_AUTO_PAGE_TURN_INTERVAL_S = 5;
+constexpr uint16_t MAX_AUTO_PAGE_TURN_INTERVAL_S = 120;
 constexpr int MAX_PAGE_LOAD_RETRIES = 3;
 
+void drawToast(const GfxRenderer& renderer, const char* msg) {
+  constexpr int toastPadX = 20;
+  constexpr int toastPadY = 12;
+  const int msgW = renderer.getTextWidth(UI_10_FONT_ID, msg);
+  const int msgH = renderer.getLineHeight(UI_10_FONT_ID);
+  const int toastW = msgW + toastPadX * 2;
+  const int toastH = msgH + toastPadY * 2;
+  const int toastX = (renderer.getScreenWidth() - toastW) / 2;
+  const int toastY = (renderer.getScreenHeight() - toastH) / 2;
+  renderer.fillRect(toastX, toastY, toastW, toastH, true);
+  renderer.drawText(UI_10_FONT_ID, toastX + toastPadX, toastY + toastPadY, msg, false);
+  renderer.displayBuffer();
+}
+
 int clampPercent(int percent) {
   if (percent < 0) {
     return 0;
@@ -57,6 +78,10 @@ int clampPercent(int percent) {
   return percent;
 }
 
+uint16_t clampAutoPageTurnIntervalSeconds(const uint16_t seconds) {
+  return std::clamp(seconds, MIN_AUTO_PAGE_TURN_INTERVAL_S, MAX_AUTO_PAGE_TURN_INTERVAL_S);
+}
+
 }  // namespace
 
 float EpubReaderActivity::getCurrentBookProgressPercent() const {
@@ -225,7 +250,7 @@ void EpubReaderActivity::onEnter() {
   // Save current epub as last opened epub and add to recent books
   APP_STATE.openEpubPath = epub->getPath();
   APP_STATE.saveToFile();
-  RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), epub->getThumbBmpPath());
+  RECENT_BOOKS.addOrUpdateBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), epub->getThumbBmpPath());
 
   // Trigger first update
   requestUpdate();
@@ -436,8 +461,8 @@ void EpubReaderActivity::loop() {
                              // Always apply orientation change even if the menu was cancelled
                              const auto& menu = std::get<MenuResult>(result.data);
                              applyOrientation(menu.orientation);
-                             toggleAutoPageTurn(menu.pageTurnOption);
                              if (menu.settingsChanged) {
+                               sdFontSystem.ensureLoaded(renderer);
                                RenderLock lock(*this);
                                if (section) {
                                  cachedSpineIndex = currentSpineIndex;
@@ -469,10 +494,13 @@ void EpubReaderActivity::loop() {
     return;
   }
 
-  // Side button long-press: change font size.
-  // Always uses Button::Up (increase) and Button::Down (decrease) to keep intuitive
-  // top=bigger / bottom=smaller regardless of the Prev/Next side layout setting.
-  if (SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_FONT_SIZE) {
+  // Side button long-press actions use raw Up/Down so the direction stays
+  // physical regardless of the Prev/Next side layout setting.
+  const bool sideLongPressChangesFont =
+      SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_FONT_SIZE;
+  const bool sideLongPressChangesOrientation =
+      SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_ORIENTATION_CHANGE;
+  if (sideLongPressChangesFont || sideLongPressChangesOrientation) {
     const bool topReleased = mappedInput.wasReleased(MappedInputManager::Button::Up);
     const bool bottomReleased = mappedInput.wasReleased(MappedInputManager::Button::Down);
     if (sideButtonLongPressHandled && (topReleased || bottomReleased)) {
@@ -480,7 +508,7 @@ void EpubReaderActivity::loop() {
       return;
     }
 
-    const bool longPressReady = mappedInput.getHeldTime() > skipChapterMs;
+    const bool longPressReady = mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
     const bool topLongPressed =
         longPressReady && (mappedInput.isPressed(MappedInputManager::Button::Up) || topReleased);
     const bool bottomLongPressed =
@@ -488,15 +516,25 @@ void EpubReaderActivity::loop() {
 
     if (!sideButtonLongPressHandled && topLongPressed) {
       sideButtonLongPressHandled = !topReleased;
-      if (SETTINGS.changeReaderFontSize(/*larger=*/true)) {
-        reindexCurrentSection();
+      if (sideLongPressChangesFont) {
+        if (SETTINGS.changeReaderFontSize(/*larger=*/true)) {
+          reindexCurrentSection();
+        }
+      } else {
+        applyOrientation(ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/false));
+        requestUpdate();
       }
       return;
     }
     if (!sideButtonLongPressHandled && bottomLongPressed) {
       sideButtonLongPressHandled = !bottomReleased;
-      if (SETTINGS.changeReaderFontSize(/*larger=*/false)) {
-        reindexCurrentSection();
+      if (sideLongPressChangesFont) {
+        if (SETTINGS.changeReaderFontSize(/*larger=*/false)) {
+          reindexCurrentSection();
+        }
+      } else {
+        applyOrientation(ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/true));
+        requestUpdate();
       }
       return;
     }
@@ -512,6 +550,53 @@ void EpubReaderActivity::loop() {
     return;
   }
 
+  const bool frontLongPressAction = SETTINGS.longPressButtonBehavior == CrossPointSettings::CHAPTER_SKIP ||
+                                    SETTINGS.longPressButtonBehavior == CrossPointSettings::ORIENTATION_CHANGE;
+  if (frontLongPressAction) {
+    const bool leftReleased = mappedInput.wasReleased(MappedInputManager::Button::Left);
+    const bool rightReleased = mappedInput.wasReleased(MappedInputManager::Button::Right);
+    if (frontButtonLongPressHandled && (leftReleased || rightReleased)) {
+      frontButtonLongPressHandled = false;
+      return;
+    }
+
+    const bool longPressReady = mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
+    const bool prevLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Left);
+    const bool nextLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Right);
+    if (!frontButtonLongPressHandled && (prevLongPressed || nextLongPressed)) {
+      frontButtonLongPressHandled = true;
+      if (SETTINGS.longPressButtonBehavior == CrossPointSettings::CHAPTER_SKIP) {
+        if (currentSpineIndex > 0 && currentSpineIndex >= epub->getSpineItemsCount()) {
+          if (nextLongPressed) {
+            onGoHome();
+          } else {
+            currentSpineIndex = epub->getSpineItemsCount() - 1;
+            nextPageNumber = 0;
+            pendingPageJump = std::numeric_limits<uint16_t>::max();
+            requestUpdate();
+          }
+          return;
+        }
+
+        {
+          RenderLock lock(*this);
+          nextPageNumber = 0;
+          currentSpineIndex = nextLongPressed ? currentSpineIndex + 1 : currentSpineIndex - 1;
+          section.reset();
+        }
+        requestUpdate();
+        return;
+      }
+
+      const uint8_t newOrientation = nextLongPressed
+                                         ? ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/false)
+                                         : ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/true);
+      applyOrientation(newOrientation);
+      requestUpdate();
+      return;
+    }
+  }
+
   auto [prevTriggered, nextTriggered, fromSideBtn, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
   if (SETTINGS.longPwrBtn == CrossPointSettings::SHORT_PWRBTN::PAGE_TURN && consumeLongPowerButtonHold()) {
     nextTriggered = true;
@@ -535,10 +620,11 @@ void EpubReaderActivity::loop() {
     return;
   }
 
+  const bool longPress = !fromTilt && mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
   const bool skipChapter =
-      !fromTilt && mappedInput.getHeldTime() > skipChapterMs &&
+      longPress &&
       (fromSideBtn ? SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_CHAPTER_SKIP
-                   : static_cast<bool>(SETTINGS.longPressChapterSkip));
+                   : SETTINGS.longPressButtonBehavior == CrossPointSettings::CHAPTER_SKIP);
 
   // Don't skip chapter after screenshot
   if (gpio.wasReleased(HalGPIO::BTN_POWER) && gpio.wasReleased(HalGPIO::BTN_DOWN)) {
@@ -546,7 +632,6 @@ void EpubReaderActivity::loop() {
   }
 
   if (skipChapter) {
-    lastPageTurnTime = millis();
     // We don't want to delete the section mid-render, so grab the semaphore
     {
       RenderLock lock(*this);
@@ -558,6 +643,15 @@ void EpubReaderActivity::loop() {
     return;
   }
 
+  if (longPress && !fromSideBtn && SETTINGS.longPressButtonBehavior == CrossPointSettings::ORIENTATION_CHANGE) {
+    const uint8_t newOrientation =
+        nextTriggered ? (SETTINGS.orientation - 1 + SETTINGS.ORIENTATION_COUNT) % SETTINGS.ORIENTATION_COUNT
+                      : (SETTINGS.orientation + 1) % SETTINGS.ORIENTATION_COUNT;
+    applyOrientation(newOrientation);
+    requestUpdate();
+    return;
+  }
+
   // No current section, attempt to rerender the book
   if (!section) {
     requestUpdate();
@@ -715,6 +809,7 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
       return;
     }
     case EpubReaderMenuActivity::MenuAction::DELETE_CACHE: {
+      bool cacheDeleted = false;
       {
         RenderLock lock(*this);
         if (epub && section) {
@@ -722,11 +817,19 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
           uint16_t backupPage = section->currentPage;
           uint16_t backupPageCount = section->pageCount;
           section.reset();
-          epub->clearCache();
+          cacheDeleted = epub->clearCache();
           epub->setupCacheDir();
-          saveProgress(backupSpine, backupPage, backupPageCount);
+          if (!saveProgress(backupSpine, backupPage, backupPageCount)) {
+            LOG_ERR("ERS", "Failed to save progress before cache clear");
+          }
+          if (cacheDeleted) {
+            drawToast(renderer, tr(STR_BOOK_CACHE_DELETED));
+          }
         }
       }
+      if (cacheDeleted) {
+        delay(1000);
+      }
       onGoHome();
       return;
     }
@@ -767,23 +870,42 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
             paragraphIndex = *pIdx;
           }
         }
-        startActivityForResult(
-            std::make_unique<KOReaderSyncActivity>(renderer, mappedInput, epub, epub->getPath(), currentSpineIndex,
-                                                   currentPage, totalPages, paragraphIndex),
-            [this](const ActivityResult& result) {
-              if (!result.isCancelled) {
-                const auto& sync = std::get<SyncResult>(result.data);
-                if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
-                  RenderLock lock(*this);
-                  currentSpineIndex = sync.spineIndex;
-                  nextPageNumber = sync.page;
-                  cachedChapterTotalPageCount = 0;  // Prevent rescaling sync page
-                  pendingPageJump.reset();
-                  saveProgress(currentSpineIndex, nextPageNumber, 0);
-                  section.reset();
-                }
-              }
-            });
+
+        // Pre-compute local KO position and chapter name while Epub is still in RAM.
+        CrossPointPosition localPos = {currentSpineIndex, currentPage, totalPages};
+        if (paragraphIndex.has_value()) {
+          localPos.paragraphIndex = *paragraphIndex;
+          localPos.hasParagraphIndex = true;
+        }
+        KOReaderPosition localKoPos = ProgressMapper::toKOReader(epub, localPos);
+        const int tocIdx = epub->getTocIndexForSpineIndex(currentSpineIndex);
+        std::string localChapterName = (tocIdx >= 0) ? epub->getTocItem(tocIdx).title : "";
+        const std::string savedEpubPath = epub->getPath();
+
+        // Persist current position so the reader resumes at the right page on return.
+        // goToReader() depends on this file, so abort the sync if the write fails.
+        if (!saveProgress(currentSpineIndex, currentPage, totalPages)) {
+          LOG_ERR("KOSync", "Aborting sync because current progress could not be saved");
+          pendingSyncSaveError = true;
+          requestUpdate();
+          return;
+        }
+
+        // Release the heavy Section now. Keep Epub alive until onExit(), which still
+        // needs it for stats/cache cleanup before the sync activity starts.
+        LOG_DBG("KOSync", "Releasing section for sync (heap before: %u)", (unsigned)ESP.getFreeHeap());
+        {
+          RenderLock lock(*this);
+          if (section) {
+            nextPageNumber = section->currentPage;
+          }
+          section.reset();
+        }
+        LOG_DBG("KOSync", "Section released for sync (heap after: %u)", (unsigned)ESP.getFreeHeap());
+
+        activityManager.replaceActivity(std::make_unique<KOReaderSyncActivity>(
+            renderer, mappedInput, savedEpubPath, currentSpineIndex, currentPage, totalPages, std::move(localKoPos),
+            std::move(localChapterName), paragraphIndex));
       }
       break;
     }
@@ -834,14 +956,18 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
       break;
     }
     case EpubReaderMenuActivity::MenuAction::AUTO_PAGE_TURN:
+      openAutoPageTurnIntervalPicker();
+      break;
     case EpubReaderMenuActivity::MenuAction::ROTATE_SCREEN:
     case EpubReaderMenuActivity::MenuAction::READER_OPTIONS:
+    case EpubReaderMenuActivity::MenuAction::CONTROLS_OPTIONS:
       break;
   }
 }
 
 void EpubReaderActivity::reindexCurrentSection() {
   SETTINGS.saveToFile();
+  sdFontSystem.ensureLoaded(renderer);
   {
     RenderLock lock(*this);
     GUI.drawPopup(renderer, tr(STR_INDEXING));
@@ -863,6 +989,21 @@ void EpubReaderActivity::openFileTransfer() {
   activityManager.goToFileTransfer(epub ? epub->getPath() : std::string{});
 }
 
+void EpubReaderActivity::openAutoPageTurnIntervalPicker(const bool ignoreInitialConfirmRelease) {
+  startActivityForResult(
+      std::make_unique<IntervalSelectionActivity>(
+          renderer, mappedInput, "EpubReaderAutoPageTurnInterval", StrId::STR_AUTO_TURN_INTERVAL_SECONDS,
+          StrId::STR_AUTO_TURN_STEP_HINT, getAutoPageTurnIntervalSeconds(), MIN_AUTO_PAGE_TURN_INTERVAL_S,
+          MAX_AUTO_PAGE_TURN_INTERVAL_S, 1, 5, StrId::STR_NONE_OPT, /*readerActivity=*/true,
+          /*allowPowerAsConfirm=*/true, ignoreInitialConfirmRelease),
+      [this](const ActivityResult& result) {
+        if (!result.isCancelled) {
+          setAutoPageTurnIntervalSeconds(static_cast<uint16_t>(std::get<IntervalResult>(result.data).value));
+        }
+        requestUpdate();
+      });
+}
+
 void EpubReaderActivity::executeReaderQuickAction(CrossPointSettings::LONG_PRESS_MENU_ACTION action) {
   switch (action) {
     case CrossPointSettings::LONG_MENU_SLEEP:
@@ -909,14 +1050,7 @@ void EpubReaderActivity::executeReaderQuickAction(CrossPointSettings::LONG_PRESS
       onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction::SCREENSHOT);
       break;
     case CrossPointSettings::LONG_MENU_CYCLE_PAGE_TURN:
-      // Cycle Off->5s->10s->15s->20s->30s->45s->60s->Off (indices: 0,7,6,5,4,3,2,1)
-      if (currentPageTurnOption == 0) {
-        currentPageTurnOption = static_cast<uint8_t>(PAGE_TURN_INTERVALS_S.size() - 1);
-      } else {
-        currentPageTurnOption--;
-      }
-      toggleAutoPageTurn(currentPageTurnOption);
-      requestUpdate();
+      openAutoPageTurnIntervalPicker(/*ignoreInitialConfirmRelease=*/true);
       break;
     case CrossPointSettings::LONG_MENU_FILE_TRANSFER:
       openFileTransfer();
@@ -943,12 +1077,32 @@ void EpubReaderActivity::executeReaderQuickAction(CrossPointSettings::LONG_PRESS
                                  }
                                  section.reset();
                                }
+                               // If the drawer's Bluetooth entry asked us to launch BT settings
+                               // (user had no bonded remote), do it now via the same mechanism the
+                               // reader menu's BLUETOOTH action uses — exit-on-success so the user
+                               // lands back in the book after pairing.
+                               if (menu && menu->requestBluetoothFlow) {
+                                 startActivityForResult(
+                                     std::make_unique<BluetoothSettingsActivity>(
+                                         renderer, mappedInput, [] { activityManager.popActivity(); },
+                                         /*exitOnSuccessfulConnect=*/true),
+                                     [this](const ActivityResult&) { requestUpdate(); });
+                                 return;
+                               }
                                // No explicit requestUpdate() — ActivityManager's Pop path will
                                // automatically requestUpdateAndWait(), and adding our own here
                                // would cause the reader page to render twice (the dark→light
                                // greyscale pass would fire twice in succession).
                              });
       break;
+    case CrossPointSettings::LONG_MENU_TOGGLE_TILT_PAGE_TURN:
+      if (halTiltSensor.isAvailable()) {
+        SETTINGS.tiltPageTurn = SETTINGS.tiltPageTurn == CrossPointSettings::TILT_OFF ? CrossPointSettings::TILT_NORMAL
+                                                                                      : CrossPointSettings::TILT_OFF;
+        SETTINGS.saveToFile();
+        halTiltSensor.clearPendingEvents();
+      }
+      break;
     case CrossPointSettings::LONG_MENU_OFF:
     default:
       break;
@@ -992,6 +1146,9 @@ bool EpubReaderActivity::executeShortPowerButtonAction() {
     case CrossPointSettings::SHORT_PWRBTN::FILE_TRANSFER:
       executeReaderQuickAction(CrossPointSettings::LONG_MENU_FILE_TRANSFER);
       return true;
+    case CrossPointSettings::SHORT_PWRBTN::TOGGLE_TILT_PAGE_TURN:
+      executeReaderQuickAction(CrossPointSettings::LONG_MENU_TOGGLE_TILT_PAGE_TURN);
+      return true;
     default:
       return false;
   }
@@ -1052,6 +1209,9 @@ bool EpubReaderActivity::executeLongPowerButtonAction() {
     case CrossPointSettings::SHORT_PWRBTN::FILE_TRANSFER:
       executeReaderQuickAction(CrossPointSettings::LONG_MENU_FILE_TRANSFER);
       return true;
+    case CrossPointSettings::SHORT_PWRBTN::TOGGLE_TILT_PAGE_TURN:
+      executeReaderQuickAction(CrossPointSettings::LONG_MENU_TOGGLE_TILT_PAGE_TURN);
+      return true;
     default:
       return false;
   }
@@ -1127,15 +1287,23 @@ void EpubReaderActivity::applyOrientation(const uint8_t orientation) {
   }
 }
 
-void EpubReaderActivity::toggleAutoPageTurn(const uint8_t selectedPageTurnOption) {
-  currentPageTurnOption = selectedPageTurnOption;
-  if (selectedPageTurnOption == 0 || selectedPageTurnOption >= PAGE_TURN_INTERVALS_S.size()) {
+uint16_t EpubReaderActivity::getAutoPageTurnIntervalSeconds() const {
+  const uint16_t seconds = static_cast<uint16_t>(pageTurnDuration / 1000UL);
+  if (seconds == 0) {
+    return DEFAULT_AUTO_PAGE_TURN_INTERVAL_S;
+  }
+  return clampAutoPageTurnIntervalSeconds(seconds);
+}
+
+void EpubReaderActivity::setAutoPageTurnIntervalSeconds(uint16_t seconds) {
+  if (seconds == 0) {
     automaticPageTurnActive = false;
     return;
   }
 
+  seconds = clampAutoPageTurnIntervalSeconds(seconds);
   lastPageTurnTime = millis();
-  pageTurnDuration = static_cast<unsigned long>(PAGE_TURN_INTERVALS_S[selectedPageTurnOption]) * 1000UL;
+  pageTurnDuration = static_cast<unsigned long>(seconds) * 1000UL;
   automaticPageTurnActive = true;
 
   const uint8_t statusBarHeight = UITheme::getInstance().getStatusBarHeight();
@@ -1192,6 +1360,20 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     return;
   }
 
+  const auto showPendingSyncSaveError = [this]() {
+    if (!pendingSyncSaveError) return;
+    pendingSyncSaveError = false;
+    GUI.drawPopup(renderer, tr(STR_SAVE_PROGRESS_FAILED));
+  };
+
+  const auto showLowMemoryLayoutError = [this]() {
+    snprintf(APP_STATE.pendingAlertTitle, sizeof(APP_STATE.pendingAlertTitle), "%s", tr(STR_EPUB_LAYOUT_MEMORY_TITLE));
+    snprintf(APP_STATE.pendingAlertBody, sizeof(APP_STATE.pendingAlertBody), "%s", tr(STR_EPUB_LAYOUT_MEMORY_BODY));
+    APP_STATE.pendingAlertGoHomeOnBack.store(true, std::memory_order_relaxed);
+    APP_STATE.hasPendingAlert.store(true, std::memory_order_release);
+    GUI.drawPopup(renderer, tr(STR_EPUB_LAYOUT_MEMORY_TITLE));
+  };
+
   // edge case handling for sub-zero spine index
   if (currentSpineIndex < 0) {
     currentSpineIndex = 0;
@@ -1207,6 +1389,7 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_END_OF_BOOK), true, EpdFontFamily::BOLD);
     renderer.displayBuffer();
     automaticPageTurnActive = false;
+    showPendingSyncSaveError();
     return;
   }
 
@@ -1240,7 +1423,8 @@ void EpubReaderActivity::render(RenderLock&& lock) {
 
   if (!section) {
     const auto filepath = epub->getSpineItem(currentSpineIndex).href;
-    LOG_DBG("ERS", "Loading file: %s, index: %d", filepath.c_str(), currentSpineIndex);
+    LOG_DBG("ERS", "Loading file: %s, index: %d (free=%u, maxAlloc=%u)", filepath.c_str(), currentSpineIndex,
+            ESP.getFreeHeap(), ESP.getMaxAllocHeap());
     section = std::unique_ptr<Section>(new Section(epub, currentSpineIndex, renderer));
 
     if (!section->loadSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
@@ -1248,29 +1432,65 @@ void EpubReaderActivity::render(RenderLock&& lock) {
                                   SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
                                   SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle, SETTINGS.imageRendering,
                                   SETTINGS.bionicReadingEnabled, SETTINGS.guideReadingEnabled)) {
-      LOG_DBG("ERS", "Cache not found, building...");
+      LOG_DBG("ERS", "Cache not found, building... (free=%u, maxAlloc=%u)", ESP.getFreeHeap(), ESP.getMaxAllocHeap());
+
+      GUI.drawPopup(renderer, tr(STR_INDEXING));
 
       const auto popupFn = [this]() { GUI.drawPopup(renderer, tr(STR_INDEXING)); };
 
       bool imagesWereSuppressed = false;
-      if (!section->createSectionFile(
-              SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(), SETTINGS.extraParagraphSpacing,
-              SETTINGS.forceParagraphIndents, SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
-              SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle, SETTINGS.imageRendering,
-              SETTINGS.bionicReadingEnabled, SETTINGS.guideReadingEnabled, popupFn, &imagesWereSuppressed)) {
-        LOG_ERR("ERS", "Failed to persist page data to SD");
+      bool layoutAbortedForLowMemory = false;
+      if (!section->createSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
+                                      SETTINGS.extraParagraphSpacing, SETTINGS.forceParagraphIndents,
+                                      SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
+                                      SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle, SETTINGS.imageRendering,
+                                      SETTINGS.bionicReadingEnabled, SETTINGS.guideReadingEnabled, popupFn,
+                                      &imagesWereSuppressed, &layoutAbortedForLowMemory)) {
+        if (layoutAbortedForLowMemory) {
+          LOG_ERR("ERS", "EPUB section layout aborted for low heap; file may be corrupted or badly formatted");
+        }
+        if (!layoutAbortedForLowMemory) {
+          LOG_ERR("ERS", "Failed to persist page data to SD");
+        }
         section.reset();
+        // FlexBLE: if the layout aborted on heap pressure and BLE is still
+        // hogging ~58 KB, drop BLE and retry once. requestDisableLater()
+        // sets a flag that the next main-loop tick drains via
+        // tryDisableIfRequested(), which runs BEFORE the next render() —
+        // so on the retry, the parser sees the freed heap. BLE auto-
+        // reconnects on the user's next button press, so the only visible
+        // cost is a ~2-3 s delay during this one cold-cache parse.
+        if (layoutAbortedForLowMemory && BluetoothHIDManager::getInstance().isEnabled() &&
+            !layoutBleRetryAttempted) {
+          LOG_INF("ERS", "Layout aborted under BLE pressure; dropping BLE and retrying chapter load");
+          layoutBleRetryAttempted = true;
+          BluetoothHIDManager::getInstance().requestDisableLater();
+          requestUpdate();
+          return;
+        }
+        if (layoutAbortedForLowMemory) {
+          showLowMemoryLayoutError();
+        } else {
+          showPendingSyncSaveError();
+        }
         return;
       }
+      LOG_DBG("ERS", "Cache build complete: pages=%u free=%u maxAlloc=%u", section->pageCount, ESP.getFreeHeap(),
+              ESP.getMaxAllocHeap());
+      // Section parsed successfully — clear the BLE-retry latch so a future
+      // failure on a different chapter can also use the retry path.
+      layoutBleRetryAttempted = false;
 
       if (imagesWereSuppressed) {
         snprintf(APP_STATE.pendingAlertTitle, sizeof(APP_STATE.pendingAlertTitle), "%s",
                  tr(STR_LOW_MEMORY_IMAGES_TITLE));
         snprintf(APP_STATE.pendingAlertBody, sizeof(APP_STATE.pendingAlertBody), "%s", tr(STR_LOW_MEMORY_IMAGES_BODY));
+        APP_STATE.pendingAlertGoHomeOnBack.store(false, std::memory_order_relaxed);
         APP_STATE.hasPendingAlert.store(true, std::memory_order_release);
       }
     } else {
-      LOG_DBG("ERS", "Cache found, skipping build...");
+      LOG_DBG("ERS", "Cache found, skipping build... (pages=%u, free=%u, maxAlloc=%u)", section->pageCount,
+              ESP.getFreeHeap(), ESP.getMaxAllocHeap());
     }
 
     if (pendingPageJump.has_value()) {
@@ -1340,6 +1560,7 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     renderStatusBar();
     renderer.displayBuffer();
     automaticPageTurnActive = false;
+    showPendingSyncSaveError();
     return;
   }
 
@@ -1349,6 +1570,7 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     renderStatusBar();
     renderer.displayBuffer();
     automaticPageTurnActive = false;
+    showPendingSyncSaveError();
     return;
   }
 
@@ -1361,16 +1583,19 @@ void EpubReaderActivity::render(RenderLock&& lock) {
         section->clearCache();
         section.reset();
         requestUpdate();
-        return;
-      } else {
-        LOG_ERR("ERS", "Failed to load page from SD after %d retries", pageLoadRetryCount);
-        renderer.clearScreen();
-        renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_PAGE_LOAD_ERROR), true, EpdFontFamily::BOLD);
-        renderStatusBar();
-        renderer.displayBuffer();
         automaticPageTurnActive = false;
+        showPendingSyncSaveError();
         return;
       }
+
+      LOG_ERR("ERS", "Failed to load page from SD after %d retries", pageLoadRetryCount);
+      renderer.clearScreen();
+      renderer.drawCenteredText(UI_12_FONT_ID, 300, tr(STR_PAGE_LOAD_ERROR), true, EpdFontFamily::BOLD);
+      renderStatusBar();
+      renderer.displayBuffer();
+      automaticPageTurnActive = false;
+      showPendingSyncSaveError();
+      return;
     }
 
     pageLoadRetryCount = 0;
@@ -1383,9 +1608,13 @@ void EpubReaderActivity::render(RenderLock&& lock) {
     LOG_DBG("ERS", "Rendered page in %dms", millis() - start);
   }
   silentIndexNextChapterIfNeeded(viewportWidth, viewportHeight);
-  saveProgress(currentSpineIndex, section->currentPage, section->pageCount);
+  if (!saveProgress(currentSpineIndex, section->currentPage, section->pageCount)) {
+    pendingSyncSaveError = true;
+  }
   queueCompletionPromptIfNeeded();
 
+  showPendingSyncSaveError();
+
   if (pendingScreenshot) {
     pendingScreenshot = false;
     ScreenshotUtil::takeScreenshot(renderer);
@@ -1416,43 +1645,38 @@ void EpubReaderActivity::silentIndexNextChapterIfNeeded(const uint16_t viewportW
     return;
   }
 
-  LOG_DBG("ERS", "Silently indexing next chapter: %d", nextSpineIndex);
+  if (!MemoryBudget::hasHeapForOptionalEpubRebuild("ERS", "silent next-chapter indexing", nextSpineIndex)) {
+    return;
+  }
+
+  LOG_DBG("ERS", "Silently indexing next chapter: %d (free=%u, maxAlloc=%u)", nextSpineIndex, ESP.getFreeHeap(),
+          ESP.getMaxAllocHeap());
   if (!nextSection.createSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
                                      SETTINGS.extraParagraphSpacing, SETTINGS.forceParagraphIndents,
                                      SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
                                      SETTINGS.hyphenationEnabled, SETTINGS.embeddedStyle, SETTINGS.imageRendering,
                                      SETTINGS.bionicReadingEnabled, SETTINGS.guideReadingEnabled)) {
     LOG_ERR("ERS", "Failed silent indexing for chapter: %d", nextSpineIndex);
+  } else {
+    LOG_DBG("ERS", "Silent indexing complete: chapter=%d pages=%u free=%u maxAlloc=%u", nextSpineIndex,
+            nextSection.pageCount, ESP.getFreeHeap(), ESP.getMaxAllocHeap());
   }
 }
 
-void EpubReaderActivity::saveProgress(int spineIndex, int currentPage, int pageCount) {
-  FsFile f;
-  if (Storage.openFileForWrite("ERS", epub->getCachePath() + "/progress.bin", f)) {
-    uint8_t data[6];
-    data[0] = spineIndex & 0xFF;
-    data[1] = (spineIndex >> 8) & 0xFF;
-    data[2] = currentPage & 0xFF;
-    data[3] = (currentPage >> 8) & 0xFF;
-    data[4] = pageCount & 0xFF;
-    data[5] = (pageCount >> 8) & 0xFF;
-    f.write(data, 6);
-    LOG_DBG("ERS", "Progress saved: Chapter %d, Page %d", spineIndex, currentPage);
-  } else {
-    LOG_ERR("ERS", "Could not save progress!");
-  }
+bool EpubReaderActivity::saveProgress(int spineIndex, int currentPage, int pageCount) {
+  return EpubReaderUtils::saveProgress(*epub, spineIndex, currentPage, pageCount);
 }
 void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int orientedMarginTop,
                                         const int orientedMarginRight, const int orientedMarginBottom,
                                         const int orientedMarginLeft) {
   const auto t0 = millis();
-  auto* fcm = renderer.getFontCacheManager();
-  fcm->resetStats();
 
   // Font prewarm: scan pass accumulates text, then prewarm, then real render
+  auto* fcm = renderer.getFontCacheManager();
+  fcm->resetStats();
   const uint32_t heapBefore = esp_get_free_heap_size();
   auto scope = fcm->createPrewarmScope();
-  page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);  // scan pass
+  page->renderText(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);  // scan pass
   scope.endScanAndPrewarm();
   const uint32_t heapAfter = esp_get_free_heap_size();
   fcm->logStats("prewarm");
@@ -1585,8 +1809,6 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
     renderer.displayGrayBuffer();
     const auto tGrayDisplay = millis();
     renderer.setRenderMode(GfxRenderer::BW);
-    fcm->logStats("gray");
-
     // restore the bw data
     renderer.restoreBwBuffer();
     const auto tBwRestore = millis();
@@ -1725,6 +1947,7 @@ void EpubReaderActivity::readFolderMoveTask(void* arg) {
     snprintf(APP_STATE.pendingAlertTitle, sizeof(APP_STATE.pendingAlertTitle), "%s", tr(STR_MOVE_TO_READ_FAILED_TITLE));
     snprintf(APP_STATE.pendingAlertBody, sizeof(APP_STATE.pendingAlertBody), tr(STR_MOVE_TO_READ_FAILED_BODY),
              params->title.c_str());
+    APP_STATE.pendingAlertGoHomeOnBack.store(false, std::memory_order_relaxed);
     APP_STATE.hasPendingAlert.store(true, std::memory_order_release);
     delete params;
     vTaskDelete(nullptr);
@@ -1795,7 +2018,12 @@ bool EpubReaderActivity::drawCurrentPageToBuffer(const std::string& filePath, Gf
                                 SETTINGS.paragraphAlignment, viewportWidth, viewportHeight, SETTINGS.hyphenationEnabled,
                                 SETTINGS.embeddedStyle, SETTINGS.imageRendering, SETTINGS.bionicReadingEnabled,
                                 SETTINGS.guideReadingEnabled)) {
-    LOG_DBG("SLP", "EPUB: section cache not found for spine %d, rebuilding", spineIndex);
+    if (!MemoryBudget::hasHeapForOptionalEpubRebuild("SLP", "EPUB sleep-page cache rebuild", spineIndex)) {
+      return false;
+    }
+
+    LOG_DBG("SLP", "EPUB: section cache not found for spine %d, rebuilding (free=%u, maxAlloc=%u)", spineIndex,
+            ESP.getFreeHeap(), ESP.getMaxAllocHeap());
     if (!section->createSectionFile(SETTINGS.getReaderFontId(), SETTINGS.getReaderLineCompression(),
                                     SETTINGS.extraParagraphSpacing, SETTINGS.forceParagraphIndents,
                                     SETTINGS.paragraphAlignment, viewportWidth, viewportHeight,
@@ -1804,6 +2032,8 @@ bool EpubReaderActivity::drawCurrentPageToBuffer(const std::string& filePath, Gf
       LOG_ERR("SLP", "EPUB: failed to rebuild section cache for spine %d", spineIndex);
       return false;
     }
+    LOG_DBG("SLP", "EPUB: section cache rebuilt for spine %d (pages=%u, free=%u, maxAlloc=%u)", spineIndex,
+            section->pageCount, ESP.getFreeHeap(), ESP.getMaxAllocHeap());
   }
 
   if (pageNumber < 0 || pageNumber >= section->pageCount) pageNumber = 0;
diff --git a/src/activities/reader/EpubReaderActivity.h b/src/activities/reader/EpubReaderActivity.h
index 830e967d..6600b709 100644
--- a/src/activities/reader/EpubReaderActivity.h
+++ b/src/activities/reader/EpubReaderActivity.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <Epub.h>
 #include <Epub/FootnoteEntry.h>
+#include <Epub/Page.h>
 #include <Epub/Section.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
@@ -37,13 +38,20 @@ class EpubReaderActivity final : public Activity {
   // Normalized 0.0-1.0 progress within the target spine item, computed from book percentage.
   float pendingSpineProgress = 0.0f;
   bool pendingScreenshot = false;
+  bool pendingSyncSaveError = false;
   bool skipNextButtonCheck = false;  // Skip button processing for one frame after subactivity exit
   bool automaticPageTurnActive = false;
-  uint8_t currentPageTurnOption = 0;
   bool longPressMenuHandled = false;
   bool longPowerButtonHandled = false;
   bool sideButtonLongPressHandled = false;
+  bool frontButtonLongPressHandled = false;
   int pageLoadRetryCount = 0;
+  // FlexBLE: if a chapter layout aborts under heap pressure and BLE is
+  // currently consuming its ~58 KB share, retry the layout once with BLE
+  // disabled (NimBLE will auto-reconnect to the bonded remote on the user's
+  // next button press). Flag gates the retry so we don't loop forever if
+  // the chapter genuinely can't be parsed.
+  bool layoutBleRetryAttempted = false;
   enum class BookmarkFeedbackType : uint8_t {
     Added,
     Removed,
@@ -85,8 +93,9 @@ class EpubReaderActivity final : public Activity {
                       int orientedMarginBottom, int orientedMarginLeft);
   void renderStatusBar() const;
   void silentIndexNextChapterIfNeeded(uint16_t viewportWidth, uint16_t viewportHeight);
-  void saveProgress(int spineIndex, int currentPage, int pageCount);
+  bool saveProgress(int spineIndex, int currentPage, int pageCount);
   void openFileTransfer();
+  void openAutoPageTurnIntervalPicker(bool ignoreInitialConfirmRelease = false);
   // Jump to a percentage of the book (0-100), mapping it to spine and page.
   void jumpToPercent(int percent);
   void reindexCurrentSection();
@@ -98,7 +107,6 @@ class EpubReaderActivity final : public Activity {
   void onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction action);
   void applyOrientation(uint8_t orientation);
   void executeLongPressMenuAction();
-  void toggleAutoPageTurn(uint8_t selectedPageTurnOption);
   void pageTurn(bool isForwardTurn);
   float getCurrentBookProgressPercent() const;
   void initializeCompletionPromptTrigger();
@@ -121,6 +129,8 @@ class EpubReaderActivity final : public Activity {
   bool preventAutoSleep() override { return automaticPageTurnActive; }
   bool isReaderActivity() const override { return true; }
   bool canSnapshotForSleepOverlay() const override { return true; }
+  void setAutoPageTurnIntervalSeconds(uint16_t seconds);
+  uint16_t getAutoPageTurnIntervalSeconds() const;
 
   // Renders the last saved page to the frame buffer without flushing to display.
   // Used by SleepActivity to prepare the background for the overlay sleep mode.
diff --git a/src/activities/reader/EpubReaderBookmarkListActivity.cpp b/src/activities/reader/EpubReaderBookmarkListActivity.cpp
index 2b852fb0..7baa94ce 100644
--- a/src/activities/reader/EpubReaderBookmarkListActivity.cpp
+++ b/src/activities/reader/EpubReaderBookmarkListActivity.cpp
@@ -8,11 +8,13 @@
 #include <cstdio>
 
 #include "MappedInputManager.h"
+#include "activities/home/FileBrowserActionActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
 static constexpr int ROW_HEIGHT = 50;
 static constexpr int LIST_START_Y = 60;
+static constexpr unsigned long BOOKMARK_DELETE_HOLD_MS = 1000;
 
 int EpubReaderBookmarkListActivity::getPageItems() const {
   const auto orientation = renderer.getOrientation();
@@ -31,6 +33,57 @@ void EpubReaderBookmarkListActivity::onEnter() {
 
 void EpubReaderBookmarkListActivity::onExit() { Activity::onExit(); }
 
+void EpubReaderBookmarkListActivity::deleteSelectedBookmark() {
+  if (bookmarks.empty() || selectedIndex < 0 || selectedIndex >= static_cast<int>(bookmarks.size())) return;
+
+  if (!BOOKMARKS.removeBookmarkAt(static_cast<size_t>(selectedIndex))) return;
+
+  bookmarks = BOOKMARKS.getBookmarks();
+  if (bookmarks.empty()) {
+    selectedIndex = 0;
+  } else if (selectedIndex >= static_cast<int>(bookmarks.size())) {
+    selectedIndex = static_cast<int>(bookmarks.size()) - 1;
+  }
+  requestUpdate();
+}
+
+void EpubReaderBookmarkListActivity::showBookmarkActionMenu(bool ignoreInitialConfirmRelease) {
+  if (bookmarks.empty() || selectedIndex < 0 || selectedIndex >= static_cast<int>(bookmarks.size())) return;
+
+  const Bookmark selectedBookmark = bookmarks[selectedIndex];
+  const char* chapter = (selectedBookmark.chapterTitle[0] != '\0') ? selectedBookmark.chapterTitle : tr(STR_BOOKMARKS);
+  std::vector<FileBrowserActionActivity::MenuItem> items;
+  items.reserve(1);
+  items.push_back({FileBrowserAction::Delete, StrId::STR_DELETE});
+
+  startActivityForResult(
+      std::make_unique<FileBrowserActionActivity>(renderer, mappedInput, chapter, std::move(items),
+                                                  ignoreInitialConfirmRelease),
+      [this, selectedBookmark](const ActivityResult& result) {
+        longPressConfirmHandled = false;
+        if (result.isCancelled) {
+          requestUpdate();
+          return;
+        }
+
+        const auto* actionResult = std::get_if<FileBrowserActionResult>(&result.data);
+        if (!actionResult || static_cast<FileBrowserAction>(actionResult->action) != FileBrowserAction::Delete) {
+          requestUpdate();
+          return;
+        }
+
+        const auto it = std::find_if(bookmarks.begin(), bookmarks.end(), [&selectedBookmark](const Bookmark& bm) {
+          return bm.spineIndex == selectedBookmark.spineIndex && bm.progress == selectedBookmark.progress;
+        });
+        if (it != bookmarks.end()) {
+          selectedIndex = static_cast<int>(std::distance(bookmarks.begin(), it));
+          deleteSelectedBookmark();
+        } else {
+          requestUpdate();
+        }
+      });
+}
+
 void EpubReaderBookmarkListActivity::loop() {
   if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
     ActivityResult result;
@@ -40,7 +93,18 @@ void EpubReaderBookmarkListActivity::loop() {
     return;
   }
 
+  if (!bookmarks.empty() && !longPressConfirmHandled && mappedInput.isPressed(MappedInputManager::Button::Confirm) &&
+      mappedInput.getHeldTime() >= BOOKMARK_DELETE_HOLD_MS) {
+    longPressConfirmHandled = true;
+    showBookmarkActionMenu(true);
+    return;
+  }
+
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    if (longPressConfirmHandled) {
+      longPressConfirmHandled = false;
+      return;
+    }
     if (!bookmarks.empty() && selectedIndex >= 0 && selectedIndex < static_cast<int>(bookmarks.size())) {
       setResult(BookmarkResult{bookmarks[selectedIndex].spineIndex, bookmarks[selectedIndex].progress});
       finish();
@@ -95,7 +159,7 @@ void EpubReaderBookmarkListActivity::render(RenderLock&&) {
   if (bookmarks.empty()) {
     renderer.drawCenteredText(UI_10_FONT_ID, LIST_START_Y + contentY + 20, tr(STR_NO_BOOKMARKS));
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -127,7 +191,7 @@ void EpubReaderBookmarkListActivity::render(RenderLock&&) {
   }
 
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/EpubReaderBookmarkListActivity.h b/src/activities/reader/EpubReaderBookmarkListActivity.h
index 4baff319..67e4b397 100644
--- a/src/activities/reader/EpubReaderBookmarkListActivity.h
+++ b/src/activities/reader/EpubReaderBookmarkListActivity.h
@@ -22,7 +22,10 @@ class EpubReaderBookmarkListActivity final : public Activity {
  private:
   std::vector<Bookmark> bookmarks;
   int selectedIndex = 0;
+  bool longPressConfirmHandled = false;
   ButtonNavigator buttonNavigator;
 
+  void deleteSelectedBookmark();
+  void showBookmarkActionMenu(bool ignoreInitialConfirmRelease = false);
   int getPageItems() const;
 };
diff --git a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp
index ea68bd8f..71e72677 100644
--- a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp
+++ b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp
@@ -131,7 +131,7 @@ void EpubReaderChapterSelectionActivity::render(RenderLock&&) {
   }
 
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/EpubReaderChapterSelectionActivity.h b/src/activities/reader/EpubReaderChapterSelectionActivity.h
index 379cfa84..792049a0 100644
--- a/src/activities/reader/EpubReaderChapterSelectionActivity.h
+++ b/src/activities/reader/EpubReaderChapterSelectionActivity.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderChapterSelectionActivity final : public Activity {
diff --git a/src/activities/reader/EpubReaderFootnotesActivity.cpp b/src/activities/reader/EpubReaderFootnotesActivity.cpp
index a50163ae..731a8d20 100644
--- a/src/activities/reader/EpubReaderFootnotesActivity.cpp
+++ b/src/activities/reader/EpubReaderFootnotesActivity.cpp
@@ -74,7 +74,7 @@ void EpubReaderFootnotesActivity::render(RenderLock&&) {
   if (footnotes.empty()) {
     renderer.drawCenteredText(UI_10_FONT_ID, 90 + contentY, tr(STR_NO_FOOTNOTES));
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -104,7 +104,7 @@ void EpubReaderFootnotesActivity::render(RenderLock&&) {
   }
 
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "", "");
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/EpubReaderFootnotesActivity.h b/src/activities/reader/EpubReaderFootnotesActivity.h
index be0566ec..d760b69f 100644
--- a/src/activities/reader/EpubReaderFootnotesActivity.h
+++ b/src/activities/reader/EpubReaderFootnotesActivity.h
@@ -6,7 +6,7 @@
 #include <functional>
 #include <vector>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderFootnotesActivity final : public Activity {
diff --git a/src/activities/reader/EpubReaderMenuActivity.cpp b/src/activities/reader/EpubReaderMenuActivity.cpp
index f9f41d79..74cdb247 100644
--- a/src/activities/reader/EpubReaderMenuActivity.cpp
+++ b/src/activities/reader/EpubReaderMenuActivity.cpp
@@ -3,12 +3,72 @@
 #include <GfxRenderer.h>
 #include <I18n.h>
 
+#include <cstring>
+
 #include "../settings/BluetoothSettingsActivity.h"
 #include "CrossPointSettings.h"
 #include "MappedInputManager.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
+namespace {
+
+struct ReaderLayoutSettingsSnapshot {
+  uint8_t fontFamily;
+  uint8_t fontSize;
+  uint8_t lineSpacing;
+  uint8_t orientation;
+  uint8_t screenMargin;
+  uint8_t paragraphAlignment;
+  uint8_t embeddedStyle;
+  uint8_t hyphenationEnabled;
+  uint8_t imageRendering;
+  uint8_t extraParagraphSpacing;
+  uint8_t forceParagraphIndents;
+  uint8_t bionicReadingEnabled;
+  uint8_t guideReadingEnabled;
+  char sdFontFamilyName[sizeof(SETTINGS.sdFontFamilyName)] = {};
+
+  bool operator==(const ReaderLayoutSettingsSnapshot& other) const {
+    return fontFamily == other.fontFamily && fontSize == other.fontSize && lineSpacing == other.lineSpacing &&
+           orientation == other.orientation && screenMargin == other.screenMargin &&
+           paragraphAlignment == other.paragraphAlignment && embeddedStyle == other.embeddedStyle &&
+           hyphenationEnabled == other.hyphenationEnabled && imageRendering == other.imageRendering &&
+           extraParagraphSpacing == other.extraParagraphSpacing &&
+           forceParagraphIndents == other.forceParagraphIndents && bionicReadingEnabled == other.bionicReadingEnabled &&
+           guideReadingEnabled == other.guideReadingEnabled &&
+           std::strncmp(sdFontFamilyName, other.sdFontFamilyName, sizeof(sdFontFamilyName)) == 0;
+  }
+  bool operator!=(const ReaderLayoutSettingsSnapshot& other) const { return !(*this == other); }
+};
+
+ReaderLayoutSettingsSnapshot captureReaderLayoutSettings() {
+  ReaderLayoutSettingsSnapshot snapshot{
+      SETTINGS.fontFamily,
+      SETTINGS.fontSize,
+      SETTINGS.lineSpacing,
+      SETTINGS.orientation,
+      SETTINGS.screenMargin,
+      SETTINGS.paragraphAlignment,
+      SETTINGS.embeddedStyle,
+      SETTINGS.hyphenationEnabled,
+      SETTINGS.imageRendering,
+      SETTINGS.extraParagraphSpacing,
+      SETTINGS.forceParagraphIndents,
+      SETTINGS.bionicReadingEnabled,
+      SETTINGS.guideReadingEnabled,
+  };
+  std::strncpy(snapshot.sdFontFamilyName, SETTINGS.sdFontFamilyName, sizeof(snapshot.sdFontFamilyName) - 1);
+  snapshot.sdFontFamilyName[sizeof(snapshot.sdFontFamilyName) - 1] = '\0';
+  return snapshot;
+}
+
+bool haveReaderLayoutSettingsChanged(const ReaderLayoutSettingsSnapshot& before) {
+  return before != captureReaderLayoutSettings();
+}
+
+}  // namespace
+
 EpubReaderMenuActivity::EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
                                                const std::string& title, const int currentPage, const int totalPages,
                                                const int bookProgressPercent, const uint8_t currentOrientation,
@@ -27,17 +87,19 @@ std::vector<EpubReaderMenuActivity::MenuItem> EpubReaderMenuActivity::buildMenuI
                                                                                      bool isCurrentPageBookmarked,
                                                                                      bool isBookCompleted) {
   std::vector<MenuItem> items;
-  constexpr size_t baseItemCount = 14;
+  // 14 upstream items + 1 (FlexBLE Bluetooth entry).
+  constexpr size_t baseItemCount = 15;
   const size_t totalItemCount = baseItemCount + (hasFootnotes ? 1u : 0u) + (hasBookmarks ? 2u : 0u);
   items.reserve(totalItemCount);
   items.push_back({MenuAction::SELECT_CHAPTER, StrId::STR_SELECT_CHAPTER});
   items.push_back({MenuAction::READER_OPTIONS, StrId::STR_READER_OPTIONS});
+  items.push_back({MenuAction::CONTROLS_OPTIONS, StrId::STR_CAT_CONTROLS});
   items.push_back({MenuAction::BLUETOOTH, StrId::STR_BLUETOOTH});
   if (hasFootnotes) {
     items.push_back({MenuAction::FOOTNOTES, StrId::STR_FOOTNOTES});
   }
   items.push_back({MenuAction::ROTATE_SCREEN, StrId::STR_ORIENTATION});
-  items.push_back({MenuAction::AUTO_PAGE_TURN, StrId::STR_AUTO_TURN_PAGES_PER_MIN});
+  items.push_back({MenuAction::AUTO_PAGE_TURN, StrId::STR_AUTO_TURN_INTERVAL_SECONDS});
   items.push_back({MenuAction::GO_TO_PERCENT, StrId::STR_GO_TO_PERCENT});
   items.push_back(
       {MenuAction::BOOKMARK_TOGGLE, isCurrentPageBookmarked ? StrId::STR_REMOVE_BOOKMARK : StrId::STR_ADD_BOOKMARK});
@@ -84,37 +146,61 @@ void EpubReaderMenuActivity::loop() {
       return;
     }
 
-    if (selectedAction == MenuAction::AUTO_PAGE_TURN) {
-      selectedPageTurnOption = (selectedPageTurnOption + 1) % pageTurnLabels.size();
-      requestUpdate();
-      return;
-    }
-
     if (selectedAction == MenuAction::READER_OPTIONS) {
+      const auto before = captureReaderLayoutSettings();
       startActivityForResult(std::make_unique<ReaderOptionsActivity>(renderer, mappedInput),
-                             [this](const ActivityResult&) {
-                               settingsChanged = true;
+                             [this, before](const ActivityResult&) {
+                               settingsChanged = settingsChanged || haveReaderLayoutSettingsChanged(before);
                                pendingOrientation = SETTINGS.orientation;  // sync in case orientation changed
                                requestUpdate();
                              });
       return;
     }
 
+    if (selectedAction == MenuAction::CONTROLS_OPTIONS) {
+      startActivityForResult(std::make_unique<ControlsOptionsActivity>(renderer, mappedInput),
+                             [this](const ActivityResult&) {
+                               ActivityResult result;
+                               result.isCancelled = true;
+                               result.data = MenuResult{-1, pendingOrientation, settingsChanged};
+                               setResult(std::move(result));
+                               finish();
+                             });
+      return;
+    }
+
     if (selectedAction == MenuAction::BLUETOOTH) {
+      // exitOnSuccessfulConnect=true: when the user pairs a new remote or
+      // reconnects to a bonded one from inside the book, BluetoothSettings
+      // sets MenuResult.autoExitParent=true and pops itself. We then also
+      // finish this menu so the user lands straight back in the book —
+      // ActivityManager chains the two pops in the same loop iteration so
+      // the menu never visibly re-renders.
       startActivityForResult(
-          std::make_unique<BluetoothSettingsActivity>(renderer, mappedInput, [] { activityManager.popActivity(); }),
-          [this](const ActivityResult&) { requestUpdate(); });
+          std::make_unique<BluetoothSettingsActivity>(renderer, mappedInput, [] { activityManager.popActivity(); },
+                                                      /*exitOnSuccessfulConnect=*/true),
+          [this](const ActivityResult& result) {
+            const auto* menu = std::get_if<MenuResult>(&result.data);
+            if (menu && menu->autoExitParent) {
+              ActivityResult myResult;
+              myResult.isCancelled = true;
+              myResult.data = MenuResult{-1, pendingOrientation, settingsChanged};
+              setResult(std::move(myResult));
+              finish();
+              return;
+            }
+            requestUpdate();
+          });
       return;
     }
 
-    setResult(
-        MenuResult{static_cast<int>(selectedAction), pendingOrientation, selectedPageTurnOption, settingsChanged});
+    setResult(MenuResult{static_cast<int>(selectedAction), pendingOrientation, settingsChanged});
     finish();
     return;
   } else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
     ActivityResult result;
     result.isCancelled = true;
-    result.data = MenuResult{-1, pendingOrientation, selectedPageTurnOption, settingsChanged};
+    result.data = MenuResult{-1, pendingOrientation, settingsChanged};
     setResult(std::move(result));
     finish();
     return;
@@ -177,18 +263,11 @@ void EpubReaderMenuActivity::render(RenderLock&&) {
       const auto width = renderer.getTextWidth(UI_10_FONT_ID, value);
       renderer.drawText(UI_10_FONT_ID, contentX + contentWidth - 20 - width, displayY, value, !isSelected);
     }
-
-    if (menuItems[i].action == MenuAction::AUTO_PAGE_TURN) {
-      // Render current page turn value on the right edge of the content area.
-      const auto value = pageTurnLabels[selectedPageTurnOption];
-      const auto width = renderer.getTextWidth(UI_10_FONT_ID, value);
-      renderer.drawText(UI_10_FONT_ID, contentX + contentWidth - 20 - width, displayY, value, !isSelected);
-    }
   }
 
   // Footer / Hints
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/EpubReaderMenuActivity.h b/src/activities/reader/EpubReaderMenuActivity.h
index 7ac80c5b..85595f06 100644
--- a/src/activities/reader/EpubReaderMenuActivity.h
+++ b/src/activities/reader/EpubReaderMenuActivity.h
@@ -5,8 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "../Activity.h"
+#include "ControlsOptionsActivity.h"
 #include "ReaderOptionsActivity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class EpubReaderMenuActivity final : public Activity {
@@ -26,6 +27,7 @@ class EpubReaderMenuActivity final : public Activity {
     READING_STATS,
     TOGGLE_COMPLETED,
     READER_OPTIONS,
+    CONTROLS_OPTIONS,
     BOOKMARK_TOGGLE,
     VIEW_BOOKMARKS,
     DELETE_BOOKMARKS,
@@ -61,11 +63,8 @@ class EpubReaderMenuActivity final : public Activity {
   ButtonNavigator buttonNavigator;
   std::string title = "Reader Menu";
   uint8_t pendingOrientation = 0;
-  uint8_t selectedPageTurnOption = 0;
   const std::vector<StrId> orientationLabels = {StrId::STR_PORTRAIT, StrId::STR_LANDSCAPE_CW, StrId::STR_INVERTED,
                                                 StrId::STR_LANDSCAPE_CCW};
-  const std::vector<const char*> pageTurnLabels = {
-      I18N.get(StrId::STR_STATE_OFF), "60", "45", "30", "20", "15", "10", "5"};
   int currentPage = 0;
   int totalPages = 0;
   int bookProgressPercent = 0;
diff --git a/src/activities/reader/EpubReaderPercentSelectionActivity.cpp b/src/activities/reader/EpubReaderPercentSelectionActivity.cpp
index db4109f0..c83ed9bb 100644
--- a/src/activities/reader/EpubReaderPercentSelectionActivity.cpp
+++ b/src/activities/reader/EpubReaderPercentSelectionActivity.cpp
@@ -88,7 +88,7 @@ void EpubReaderPercentSelectionActivity::render(RenderLock&&) {
 
   // Button hints follow the current front button layout.
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "-", "+");
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/EpubReaderUtils.h b/src/activities/reader/EpubReaderUtils.h
new file mode 100644
index 00000000..f2d2a747
--- /dev/null
+++ b/src/activities/reader/EpubReaderUtils.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Epub.h>
+#include <HalStorage.h>
+#include <Logging.h>
+
+namespace EpubReaderUtils {
+
+// Persists reader progress for an EPUB to its cache directory. Returns true on success.
+inline bool saveProgress(Epub& epub, int spineIndex, int pageNumber, int pageCount) {
+  if (spineIndex < 0 || spineIndex > 0xFFFF || pageNumber < 0 || pageNumber > 0xFFFF || pageCount < 0 ||
+      pageCount > 0xFFFF) {
+    LOG_ERR("ERS", "Progress values out of range: spine=%d page=%d count=%d", spineIndex, pageNumber, pageCount);
+    return false;
+  }
+  FsFile f;
+  if (!Storage.openFileForWrite("ERS", epub.getCachePath() + "/progress.bin", f)) {
+    LOG_ERR("ERS", "Could not open progress file for write!");
+    return false;
+  }
+  uint8_t data[6];
+  data[0] = spineIndex & 0xFF;
+  data[1] = (spineIndex >> 8) & 0xFF;
+  data[2] = pageNumber & 0xFF;
+  data[3] = (pageNumber >> 8) & 0xFF;
+  data[4] = pageCount & 0xFF;
+  data[5] = (pageCount >> 8) & 0xFF;
+  const size_t written = f.write(data, sizeof(data));
+  if (written != sizeof(data)) {
+    LOG_ERR("ERS", "Short write saving progress: %u/%u bytes", (unsigned)written, (unsigned)sizeof(data));
+    return false;
+  }
+  LOG_DBG("ERS", "Progress saved: spine=%d page=%d", spineIndex, pageNumber);
+  return true;
+}
+
+}  // namespace EpubReaderUtils
diff --git a/src/activities/reader/KOReaderSyncActivity.cpp b/src/activities/reader/KOReaderSyncActivity.cpp
index 9dc2e9be..b2ef61c8 100644
--- a/src/activities/reader/KOReaderSyncActivity.cpp
+++ b/src/activities/reader/KOReaderSyncActivity.cpp
@@ -1,30 +1,27 @@
 #include "KOReaderSyncActivity.h"
 
 #include <GfxRenderer.h>
+#include <HalStorage.h>
 #include <I18n.h>
 #include <Logging.h>
 #include <WiFi.h>
 #include <esp_sntp.h>
 
+#include <algorithm>
+#include <cassert>
+
 #include "Epub/Section.h"
+#include "EpubReaderUtils.h"
 #include "KOReaderCredentialStore.h"
 #include "KOReaderDocumentId.h"
 #include "MappedInputManager.h"
+#include "ReaderUtils.h"
+#include "activities/ActivityManager.h"
 #include "activities/network/WifiSelectionActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
 namespace {
-CrossPointPosition makeLocalPositionWithParagraph(const int spineIndex, const int page, const int totalPages,
-                                                  const std::optional<uint16_t>& paragraphIndex) {
-  CrossPointPosition pos = {spineIndex, page, totalPages};
-  if (paragraphIndex.has_value()) {
-    pos.paragraphIndex = *paragraphIndex;
-    pos.hasParagraphIndex = true;
-  }
-  return pos;
-}
-
 void syncTimeWithNTP() {
   // Stop SNTP if already running (can't reconfigure while running)
   if (esp_sntp_enabled()) {
@@ -61,13 +58,43 @@ void wifiOff() {
 }
 }  // namespace
 
+void KOReaderSyncActivity::ensureEpubLoaded() {
+  if (!epub) {
+    LOG_DBG("KOSync", "Loading epub for progress mapping (heap: %u)", (unsigned)ESP.getFreeHeap());
+    epub = std::make_shared<Epub>(epubPath, "/.crosspoint");
+    epub->setupCacheDir();
+    // Load metadata only (no CSS needed for progress mapping, don't rebuild if cache is missing).
+    if (!epub->load(false, true)) {
+      LOG_ERR("KOSync", "Failed to load epub for progress mapping");
+      epub.reset();
+      return;
+    }
+    LOG_DBG("KOSync", "Epub loaded (heap: %u)", (unsigned)ESP.getFreeHeap());
+  }
+}
+
+void KOReaderSyncActivity::saveProgressAndReturn(int spineIndex, int page) {
+  // epub is guaranteed non-null here: ensureEpubLoaded() was called in performSync() before
+  // SHOWING_RESULT state is entered, and this method is only called from that state.
+  assert(epub);
+  if (!EpubReaderUtils::saveProgress(*epub, spineIndex, page, 0)) {
+    {
+      RenderLock lock(*this);
+      state = SYNC_FAILED;
+      statusMessage = tr(STR_SAVE_PROGRESS_FAILED);
+    }
+    requestUpdate(true);
+    return;
+  }
+  returnToReader();
+}
+
+void KOReaderSyncActivity::returnToReader() { activityManager.goToReader(epubPath); }
+
 void KOReaderSyncActivity::onWifiSelectionComplete(const bool success) {
   if (!success) {
     LOG_DBG("KOSync", "WiFi connection failed, exiting");
-    ActivityResult result;
-    result.isCancelled = true;
-    setResult(std::move(result));
-    finish();
+    returnToReader();
     return;
   }
 
@@ -115,7 +142,17 @@ void KOReaderSyncActivity::performSync() {
     RenderLock lock(*this);
     statusMessage = tr(STR_FETCH_PROGRESS);
   }
-  requestUpdateAndWait();
+  if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+    LOG_ERR("KOSync", "Fetch progress screen could not be rendered synchronously; aborting sync");
+    wifiOff();
+    {
+      RenderLock lock(*this);
+      state = SYNC_FAILED;
+      statusMessage = "Render update failed";
+    }
+    requestUpdate(true);
+    return;
+  }
 
   // Fetch remote progress
   const auto result = KOReaderSyncClient::getProgress(documentHash, remoteProgress);
@@ -141,27 +178,76 @@ void KOReaderSyncActivity::performSync() {
     return;
   }
 
-  // Convert remote progress to CrossPoint position
+  // Epub was released before sync to free RAM for the TLS handshake — reload it now.
   hasRemoteProgress = true;
+  ensureEpubLoaded();
+  if (!epub) {
+    {
+      RenderLock lock(*this);
+      state = SYNC_FAILED;
+      statusMessage = "";
+    }
+    requestUpdate(true);
+    return;
+  }
+
   KOReaderPosition koPos = {remoteProgress.progress, remoteProgress.percentage};
   remotePosition = ProgressMapper::toCrossPoint(epub, koPos, currentSpineIndex, totalPagesInSpine);
 
-  // If XPath carried a paragraph index, refine the page using the section cache's
-  // per-page paragraph LUT instead of anchor matching.
-  if (remotePosition.hasParagraphIndex) {
+  // Refine page using section cache LUTs: li index, anchor, or paragraph index.
+  if (remotePosition.hasLiIndex || remotePosition.xpathAnchorId[0] != '\0' || remotePosition.hasParagraphIndex) {
     Section tempSection(epub, remotePosition.spineIndex, renderer);
-    const auto paragraphPage = tempSection.getPageForParagraphIndex(remotePosition.paragraphIndex);
-    if (paragraphPage.has_value()) {
-      LOG_DBG("KOSync", "Paragraph %u resolved to page %d (was %d)", remotePosition.paragraphIndex, *paragraphPage,
-              remotePosition.pageNumber);
-      remotePosition.pageNumber = *paragraphPage;
+    bool refined = false;
+    if (remotePosition.hasLiIndex) {
+      const auto liPage = tempSection.getPageForListItemIndex(remotePosition.liIndex);
+      if (liPage.has_value()) {
+        LOG_DBG("KOSync", "Li index %u -> page %d (was %d)", remotePosition.liIndex, *liPage,
+                remotePosition.pageNumber);
+        remotePosition.pageNumber = *liPage;
+        refined = true;
+      } else {
+        LOG_DBG("KOSync", "Li index %u not found in section LUT", remotePosition.liIndex);
+      }
+    }
+    if (!refined && remotePosition.xpathAnchorId[0] != '\0') {
+      const auto anchorPage = tempSection.getPageForAnchor(std::string(remotePosition.xpathAnchorId));
+      if (anchorPage.has_value()) {
+        LOG_DBG("KOSync", "Anchor '%s' -> page %d (was %d)", remotePosition.xpathAnchorId, *anchorPage,
+                remotePosition.pageNumber);
+        remotePosition.pageNumber = *anchorPage;
+        refined = true;
+      } else {
+        LOG_DBG("KOSync", "Anchor '%s' not found in section cache", remotePosition.xpathAnchorId);
+      }
+    }
+    if (!refined && remotePosition.hasParagraphIndex) {
+      const auto paragraphPage = tempSection.getPageForParagraphIndex(remotePosition.paragraphIndex);
+      const auto nextParagraphPage = tempSection.getPageForParagraphIndex(remotePosition.paragraphIndex + 1);
+      if (paragraphPage.has_value()) {
+        int refinedPage = std::max(remotePosition.pageNumber, static_cast<int>(*paragraphPage));
+        if (nextParagraphPage.has_value()) {
+          const int lutSpan = static_cast<int>(*nextParagraphPage) - static_cast<int>(*paragraphPage);
+          // Only cap when the LUT span is >1. A span of 1 means the LUT granularity is too
+          // coarse to trust over the intra-spine position (e.g. a stale cache where the paragraph
+          // occupies different pages than at build time).
+          if (lutSpan > 1 && refinedPage >= static_cast<int>(*nextParagraphPage)) {
+            refinedPage = static_cast<int>(*nextParagraphPage) - 1;
+          }
+        }
+        char nextParaBuf[8];
+        if (nextParagraphPage.has_value())
+          snprintf(nextParaBuf, sizeof(nextParaBuf), "%d", *nextParagraphPage);
+        else
+          snprintf(nextParaBuf, sizeof(nextParaBuf), "none");
+        LOG_DBG("KOSync", "Paragraph %u -> LUT page %d, nextPara page %s, intra page %d, using %d",
+                remotePosition.paragraphIndex, *paragraphPage, nextParaBuf, remotePosition.pageNumber, refinedPage);
+        remotePosition.pageNumber = refinedPage;
+      } else {
+        LOG_DBG("KOSync", "Paragraph %u not found in section LUT", remotePosition.paragraphIndex);
+      }
     }
   }
-
-  // Calculate local progress in KOReader format (for display)
-  CrossPointPosition localPos =
-      makeLocalPositionWithParagraph(currentSpineIndex, currentPage, totalPagesInSpine, currentParagraphIndex);
-  localProgress = ProgressMapper::toKOReader(epub, localPos);
+  // localProgress was pre-computed in EpubReaderActivity before the Epub was released.
 
   {
     RenderLock lock(*this);
@@ -183,17 +269,23 @@ void KOReaderSyncActivity::performUpload() {
     state = UPLOADING;
     statusMessage = tr(STR_UPLOAD_PROGRESS);
   }
-  requestUpdateAndWait();
-
-  // Convert current position to KOReader format
-  CrossPointPosition localPos =
-      makeLocalPositionWithParagraph(currentSpineIndex, currentPage, totalPagesInSpine, currentParagraphIndex);
-  KOReaderPosition koPos = ProgressMapper::toKOReader(epub, localPos);
+  if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+    LOG_ERR("KOSync", "Upload progress screen could not be rendered synchronously; aborting upload");
+    wifiOff();
+    {
+      RenderLock lock(*this);
+      state = SYNC_FAILED;
+      statusMessage = "Render update failed";
+    }
+    requestUpdate(true);
+    return;
+  }
 
+  // localProgress was pre-computed in EpubReaderActivity before the Epub was released.
   KOReaderProgress progress;
   progress.document = documentHash;
-  progress.progress = koPos.xpath;
-  progress.percentage = koPos.percentage;
+  progress.progress = localProgress.xpath;
+  progress.percentage = localProgress.percentage;
 
   const auto result = KOReaderSyncClient::updateProgress(progress);
 
@@ -218,6 +310,7 @@ void KOReaderSyncActivity::performUpload() {
 
 void KOReaderSyncActivity::onEnter() {
   Activity::onEnter();
+  ReaderUtils::applyOrientation(renderer, SETTINGS.orientation);
 
   // Check for credentials first
   if (!KOREADER_STORE.hasCredentials()) {
@@ -256,7 +349,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     renderer.drawCenteredText(UI_10_FONT_ID, 320, tr(STR_KOREADER_SETUP_HINT));
 
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -271,15 +364,15 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     // Show comparison
     renderer.drawCenteredText(UI_10_FONT_ID, 120, tr(STR_PROGRESS_FOUND), true, EpdFontFamily::BOLD);
 
-    // Get chapter names from TOC
+    // Remote chapter name requires Epub (loaded lazily in performSync before this state).
     const int remoteTocIndex = epub->getTocIndexForSpineIndex(remotePosition.spineIndex);
-    const int localTocIndex = epub->getTocIndexForSpineIndex(currentSpineIndex);
     const std::string remoteChapter =
         (remoteTocIndex >= 0) ? epub->getTocItem(remoteTocIndex).title
                               : (std::string(tr(STR_SECTION_PREFIX)) + std::to_string(remotePosition.spineIndex + 1));
+    // Local chapter name was pre-computed before Epub was released.
     const std::string localChapter =
-        (localTocIndex >= 0) ? epub->getTocItem(localTocIndex).title
-                             : (std::string(tr(STR_SECTION_PREFIX)) + std::to_string(currentSpineIndex + 1));
+        !localChapterName.empty() ? localChapterName
+                                  : (std::string(tr(STR_SECTION_PREFIX)) + std::to_string(currentSpineIndex + 1));
 
     // Remote progress - chapter and page
     renderer.drawText(UI_10_FONT_ID, 20, 160, tr(STR_REMOTE_LABEL), true);
@@ -324,7 +417,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
 
     // Bottom button hints
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -334,7 +427,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     renderer.drawCenteredText(UI_10_FONT_ID, 320, tr(STR_UPLOAD_PROMPT));
 
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_UPLOAD), "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -343,7 +436,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     renderer.drawCenteredText(UI_10_FONT_ID, 300, tr(STR_UPLOAD_SUCCESS), true, EpdFontFamily::BOLD);
 
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -353,7 +446,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
     renderer.drawCenteredText(UI_10_FONT_ID, 320, statusMessage.c_str());
 
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
     renderer.displayBuffer();
     return;
   }
@@ -362,10 +455,7 @@ void KOReaderSyncActivity::render(RenderLock&&) {
 void KOReaderSyncActivity::loop() {
   if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
+      returnToReader();
     }
     return;
   }
@@ -384,9 +474,7 @@ void KOReaderSyncActivity::loop() {
 
     if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
       if (selectedOption == 0) {
-        // Wifi will be turned off in onExit()
-        setResult(SyncResult{remotePosition.spineIndex, remotePosition.pageNumber});
-        finish();
+        saveProgressAndReturn(remotePosition.spineIndex, remotePosition.pageNumber);
       } else if (selectedOption == 1) {
         // Upload local progress
         performUpload();
@@ -394,10 +482,7 @@ void KOReaderSyncActivity::loop() {
     }
 
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
+      returnToReader();
     }
     return;
   }
@@ -416,10 +501,7 @@ void KOReaderSyncActivity::loop() {
     }
 
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      ActivityResult result;
-      result.isCancelled = true;
-      setResult(std::move(result));
-      finish();
+      returnToReader();
     }
     return;
   }
diff --git a/src/activities/reader/KOReaderSyncActivity.h b/src/activities/reader/KOReaderSyncActivity.h
index 3488aa89..9edf27ac 100644
--- a/src/activities/reader/KOReaderSyncActivity.h
+++ b/src/activities/reader/KOReaderSyncActivity.h
@@ -21,20 +21,20 @@
  */
 class KOReaderSyncActivity final : public Activity {
  public:
-  explicit KOReaderSyncActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
-                                const std::shared_ptr<Epub>& epub, const std::string& epubPath, int currentSpineIndex,
-                                int currentPage, int totalPagesInSpine,
+  explicit KOReaderSyncActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::string& epubPath,
+                                int currentSpineIndex, int currentPage, int totalPagesInSpine,
+                                KOReaderPosition localKoPos, std::string localChapterName,
                                 std::optional<uint16_t> currentParagraphIndex = std::nullopt)
       : Activity("KOReaderSync", renderer, mappedInput),
-        epub(epub),
         epubPath(epubPath),
         currentSpineIndex(currentSpineIndex),
         currentPage(currentPage),
         totalPagesInSpine(totalPagesInSpine),
         currentParagraphIndex(currentParagraphIndex),
+        localChapterName(std::move(localChapterName)),
         remoteProgress{},
         remotePosition{},
-        localProgress{} {}
+        localProgress(std::move(localKoPos)) {}
 
   void onEnter() override;
   void onExit() override;
@@ -57,8 +57,9 @@ class KOReaderSyncActivity final : public Activity {
     NO_CREDENTIALS
   };
 
-  std::shared_ptr<Epub> epub;
+  std::shared_ptr<Epub> epub;  // null until lazy-loaded after TLS in performSync()
   std::string epubPath;
+  std::string localChapterName;
   int currentSpineIndex;
   int currentPage;
   int totalPagesInSpine;
@@ -73,7 +74,7 @@ class KOReaderSyncActivity final : public Activity {
   KOReaderProgress remoteProgress;
   CrossPointPosition remotePosition;
 
-  // Local progress as KOReader format (for display)
+  // Local progress as KOReader format (pre-computed before Epub was released)
   KOReaderPosition localProgress;
 
   // Selection in result screen (0=Apply, 1=Upload)
@@ -82,4 +83,7 @@ class KOReaderSyncActivity final : public Activity {
   void onWifiSelectionComplete(bool success);
   void performSync();
   void performUpload();
+  void ensureEpubLoaded();
+  void saveProgressAndReturn(int spineIndex, int page);
+  void returnToReader();
 };
diff --git a/src/activities/reader/QrDisplayActivity.cpp b/src/activities/reader/QrDisplayActivity.cpp
index 2bcf330a..df4dfa0d 100644
--- a/src/activities/reader/QrDisplayActivity.cpp
+++ b/src/activities/reader/QrDisplayActivity.cpp
@@ -39,7 +39,7 @@ void QrDisplayActivity::render(RenderLock&&) {
   QrUtils::drawQrCode(renderer, qrBounds, textPayload);
 
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/ReaderActivity.cpp b/src/activities/reader/ReaderActivity.cpp
index abd23627..e99d569d 100644
--- a/src/activities/reader/ReaderActivity.cpp
+++ b/src/activities/reader/ReaderActivity.cpp
@@ -6,6 +6,7 @@
 #include "CrossPointSettings.h"
 #include "Epub.h"
 #include "EpubReaderActivity.h"
+#include "SdCardFontSystem.h"
 #include "Txt.h"
 #include "TxtReaderActivity.h"
 #include "Xtc.h"
@@ -107,6 +108,8 @@ void ReaderActivity::onEnter() {
     return;
   }
 
+  sdFontSystem.ensureLoaded(renderer);
+
   currentBookPath = initialBookPath;
   if (isBmpFile(initialBookPath)) {
     onGoToBmpViewer(initialBookPath);
diff --git a/src/activities/reader/ReaderActivity.h b/src/activities/reader/ReaderActivity.h
index b9201097..b155ac74 100644
--- a/src/activities/reader/ReaderActivity.h
+++ b/src/activities/reader/ReaderActivity.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "activities/home/FileBrowserActivity.h"
 
 class Epub;
diff --git a/src/activities/reader/ReaderOptionsActivity.cpp b/src/activities/reader/ReaderOptionsActivity.cpp
index 665e25ba..a334d78d 100644
--- a/src/activities/reader/ReaderOptionsActivity.cpp
+++ b/src/activities/reader/ReaderOptionsActivity.cpp
@@ -8,20 +8,61 @@
 
 #include "CrossPointSettings.h"
 #include "MappedInputManager.h"
+#include "SdCardFontSystem.h"
 #include "SettingsList.h"
+#include "activities/settings/FontDownloadActivity.h"
+#include "activities/settings/FontSelectionActivity.h"
+#include "activities/settings/StatusBarSettingsActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
+namespace {
+uint8_t enumDisplayIndexForRawValue(const SettingInfo& setting, uint8_t rawValue) {
+  if (setting.enumRawValues.empty()) {
+    return rawValue;
+  }
+
+  auto it = std::find(setting.enumRawValues.begin(), setting.enumRawValues.end(), rawValue);
+  if (it == setting.enumRawValues.end()) {
+    return 0;
+  }
+  return static_cast<uint8_t>(std::distance(setting.enumRawValues.begin(), it));
+}
+
+uint8_t enumRawValueForDisplayIndex(const SettingInfo& setting, uint8_t displayIndex) {
+  if (setting.enumRawValues.empty()) {
+    return displayIndex;
+  }
+  if (displayIndex >= setting.enumRawValues.size()) {
+    return setting.enumRawValues.front();
+  }
+  return setting.enumRawValues[displayIndex];
+}
+}  // namespace
+
 void ReaderOptionsActivity::onEnter() {
   Activity::onEnter();
 
+  rebuildSettingsList();
+  requestUpdate();
+}
+
+void ReaderOptionsActivity::rebuildSettingsList() {
   settings.clear();
-  std::copy_if(getSettingsList().begin(), getSettingsList().end(), std::back_inserter(settings),
-               [](const auto& s) { return s.category == StrId::STR_CAT_READER && s.type != SettingType::ACTION; });
+  sdFontSystem.refreshIfDirty();
+  const auto allSettings = getSettingsList(&sdFontSystem.registry());
+  settings.reserve(allSettings.size() + 2);
+  std::copy_if(allSettings.begin(), allSettings.end(), std::back_inserter(settings),
+               [](const auto& s) { return s.category == StrId::STR_CAT_READER; });
+
+  const auto fontSizeSetting = std::find_if(settings.begin(), settings.end(),
+                                            [](const auto& setting) { return setting.nameId == StrId::STR_FONT_SIZE; });
+  const auto manageFontsSetting = SettingInfo::Action(StrId::STR_MANAGE_FONTS, SettingAction::DownloadFonts);
+  settings.insert(fontSizeSetting == settings.end() ? settings.end() : fontSizeSetting + 1, manageFontsSetting);
+  settings.push_back(SettingInfo::Action(StrId::STR_CUSTOMISE_STATUS_BAR, SettingAction::CustomiseStatusBar));
+
   settingsCount = static_cast<int>(settings.size());
   selectedIndex = 0;
-
-  requestUpdate();
 }
 
 void ReaderOptionsActivity::onExit() { Activity::onExit(); }
@@ -35,7 +76,25 @@ void ReaderOptionsActivity::toggleCurrentSetting() {
     SETTINGS.*(setting.valuePtr) = !cur;
   } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
     const uint8_t cur = SETTINGS.*(setting.valuePtr);
-    SETTINGS.*(setting.valuePtr) = (cur + 1) % static_cast<uint8_t>(setting.enumValues.size());
+    const uint8_t currentIndex = enumDisplayIndexForRawValue(setting, cur);
+    const uint8_t nextIndex = (currentIndex + 1) % static_cast<uint8_t>(setting.enumValues.size());
+    SETTINGS.*(setting.valuePtr) = enumRawValueForDisplayIndex(setting, nextIndex);
+  } else if (setting.type == SettingType::ENUM && setting.valueGetter && setting.valueSetter) {
+    if (setting.nameId == StrId::STR_FONT_FAMILY) {
+      startActivityForResult(std::make_unique<FontSelectionActivity>(renderer, mappedInput, &sdFontSystem.registry()),
+                             [this](const ActivityResult&) {
+                               SETTINGS.saveToFile();
+                               sdFontSystem.refreshIfDirty();
+                               rebuildSettingsList();
+                               requestUpdate();
+                             });
+      return;
+    }
+    const uint8_t totalValues = setting.enumStringValues.empty()
+                                    ? static_cast<uint8_t>(setting.enumValues.size())
+                                    : static_cast<uint8_t>(setting.enumStringValues.size());
+    const uint8_t cur = setting.valueGetter();
+    setting.valueSetter((cur + 1) % totalValues);
   } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
     const int8_t cur = SETTINGS.*(setting.valuePtr);
     if (cur + setting.valueRange.step > setting.valueRange.max) {
@@ -43,6 +102,22 @@ void ReaderOptionsActivity::toggleCurrentSetting() {
     } else {
       SETTINGS.*(setting.valuePtr) = cur + setting.valueRange.step;
     }
+  } else if (setting.type == SettingType::ACTION) {
+    if (setting.action == SettingAction::DownloadFonts) {
+      startActivityForResult(std::make_unique<FontDownloadActivity>(renderer, mappedInput),
+                             [this](const ActivityResult&) {
+                               SETTINGS.saveToFile();
+                               sdFontSystem.refreshIfDirty();
+                               rebuildSettingsList();
+                               requestUpdate();
+                             });
+      return;
+    }
+    if (setting.action == SettingAction::CustomiseStatusBar) {
+      startActivityForResult(std::make_unique<StatusBarSettingsActivity>(renderer, mappedInput),
+                             [](const ActivityResult&) { SETTINGS.saveToFile(); });
+      return;
+    }
   }
 }
 
@@ -100,7 +175,17 @@ void ReaderOptionsActivity::render(RenderLock&&) {
         if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
           valueText = SETTINGS.*(setting.valuePtr) ? tr(STR_STATE_ON) : tr(STR_STATE_OFF);
         } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
-          valueText = I18N.get(setting.enumValues[SETTINGS.*(setting.valuePtr)]);
+          const uint8_t value = SETTINGS.*(setting.valuePtr);
+          const uint8_t displayValue = enumDisplayIndexForRawValue(setting, value);
+          const uint8_t safeValue = displayValue < setting.enumValues.size() ? displayValue : 0;
+          valueText = I18N.get(setting.enumValues[safeValue]);
+        } else if (setting.type == SettingType::ENUM && setting.valueGetter) {
+          const uint8_t value = setting.valueGetter();
+          if (!setting.enumStringValues.empty() && value < setting.enumStringValues.size()) {
+            valueText = setting.enumStringValues[value];
+          } else if (value < setting.enumValues.size()) {
+            valueText = I18N.get(setting.enumValues[value]);
+          }
         } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
           valueText = std::to_string(SETTINGS.*(setting.valuePtr));
         }
@@ -109,7 +194,7 @@ void ReaderOptionsActivity::render(RenderLock&&) {
       true);
 
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_TOGGLE), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
 
   renderer.displayBuffer();
 }
diff --git a/src/activities/reader/ReaderOptionsActivity.h b/src/activities/reader/ReaderOptionsActivity.h
index 77e9bbfa..8f0d5c1f 100644
--- a/src/activities/reader/ReaderOptionsActivity.h
+++ b/src/activities/reader/ReaderOptionsActivity.h
@@ -13,6 +13,7 @@ class ReaderOptionsActivity final : public Activity {
   int settingsCount = 0;
   std::vector<SettingInfo> settings;
 
+  void rebuildSettingsList();
   void toggleCurrentSetting();
 
  public:
diff --git a/src/activities/reader/ReaderUtils.h b/src/activities/reader/ReaderUtils.h
index 9aa4aa86..fcd522ca 100644
--- a/src/activities/reader/ReaderUtils.h
+++ b/src/activities/reader/ReaderUtils.h
@@ -9,6 +9,7 @@
 
 namespace ReaderUtils {
 
+constexpr unsigned long SKIP_HOLD_MS = 700;
 constexpr unsigned long GO_HOME_MS = 1000;
 
 inline GfxRenderer::Orientation toRendererOrientation(const uint8_t orientation) {
@@ -30,6 +31,11 @@ inline void applyOrientation(GfxRenderer& renderer, const uint8_t orientation) {
   renderer.setOrientation(toRendererOrientation(orientation));
 }
 
+inline uint8_t rotatedOrientation(const uint8_t orientation, const bool clockwise) {
+  return clockwise ? (orientation + 1) % CrossPointSettings::ORIENTATION_COUNT
+                   : (orientation + CrossPointSettings::ORIENTATION_COUNT - 1) % CrossPointSettings::ORIENTATION_COUNT;
+}
+
 struct PageTurnResult {
   bool prev;
   bool next;
@@ -38,8 +44,6 @@ struct PageTurnResult {
 };
 
 inline PageTurnResult detectPageTurn(const MappedInputManager& input) {
-  // Front buttons fire on press when long-press chapter skip is disabled (faster response).
-  const bool frontUsePress = !SETTINGS.longPressChapterSkip;
   // Side buttons fire on press only when long-press action is OFF (nothing to detect).
   const bool sideUsePress = SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_OFF;
 
@@ -50,16 +54,14 @@ inline PageTurnResult detectPageTurn(const MappedInputManager& input) {
   const bool sideNext = sideUsePress ? input.wasPressed(MappedInputManager::Button::PageForward)
                                      : input.wasReleased(MappedInputManager::Button::PageForward);
 
-  const bool frontPrev = frontUsePress ? input.wasPressed(MappedInputManager::Button::Left)
-                                       : input.wasReleased(MappedInputManager::Button::Left);
+  const bool frontPrev = input.wasReleased(MappedInputManager::Button::Left);
   const bool powerReleased = input.wasReleased(MappedInputManager::Button::Power);
   const bool shortPowerTurn = SETTINGS.shortPwrBtn == CrossPointSettings::SHORT_PWRBTN::PAGE_TURN && powerReleased &&
                               input.getHeldTime() < SETTINGS.getPowerButtonLongPressDuration();
   const bool longPowerTurn = SETTINGS.longPwrBtn == CrossPointSettings::SHORT_PWRBTN::PAGE_TURN && powerReleased &&
                              input.getHeldTime() >= SETTINGS.getPowerButtonLongPressDuration();
   const bool powerTurn = shortPowerTurn || longPowerTurn;
-  const bool frontNext = frontUsePress ? (input.wasPressed(MappedInputManager::Button::Right) || powerTurn)
-                                       : (input.wasReleased(MappedInputManager::Button::Right) || powerTurn);
+  const bool frontNext = input.wasReleased(MappedInputManager::Button::Right) || powerTurn;
 
   // fromSideBtn is true when only side buttons contributed to this page turn.
   const bool fromSide = (sidePrev || sideNext) && !(frontPrev || frontNext);
diff --git a/src/activities/reader/TxtReaderActivity.cpp b/src/activities/reader/TxtReaderActivity.cpp
index 557516f7..c4004856 100644
--- a/src/activities/reader/TxtReaderActivity.cpp
+++ b/src/activities/reader/TxtReaderActivity.cpp
@@ -19,7 +19,7 @@ namespace {
 constexpr size_t CHUNK_SIZE = 8 * 1024;  // 8KB chunk for reading
 // Cache file magic and version
 constexpr uint32_t CACHE_MAGIC = 0x54585449;  // "TXTI"
-constexpr uint8_t CACHE_VERSION = 2;          // Increment when cache format changes
+constexpr uint8_t CACHE_VERSION = 3;          // Increment when cache format changes
 constexpr uint32_t MAX_CACHE_PAGES = 65535;   // Sanity cap to prevent unbounded reserve()
 
 // Parses and word-wraps lines from a file chunk into outLines.
@@ -39,7 +39,12 @@ size_t parseAndWrapLines(const uint8_t* buffer, size_t chunkSize, size_t fileOff
     std::string line(reinterpret_cast<const char*>(buffer + pos), displayLen);
     size_t lineBytePos = 0;
 
-    while (!line.empty() && static_cast<int>(outLines.size()) < linesPerPage) {
+    do {
+      if (line.empty()) {
+        outLines.emplace_back();
+        break;
+      }
+
       if (renderer.getTextWidth(fontId, line.c_str()) <= vw) {
         outLines.push_back(line);
         lineBytePos = displayLen;
@@ -65,7 +70,7 @@ size_t parseAndWrapLines(const uint8_t* buffer, size_t chunkSize, size_t fileOff
       if (breakPos < line.length() && line[breakPos] == ' ') skipChars++;
       lineBytePos += skipChars;
       line = line.substr(skipChars);
-    }
+    } while (!line.empty() && static_cast<int>(outLines.size()) < linesPerPage);
 
     if (line.empty()) {
       pos = lineEnd + 1;
@@ -100,7 +105,7 @@ void TxtReaderActivity::onEnter() {
   auto fileName = filePath.substr(filePath.rfind('/') + 1);
   APP_STATE.openEpubPath = filePath;
   APP_STATE.saveToFile();
-  RECENT_BOOKS.addBook(filePath, fileName, "", "");
+  RECENT_BOOKS.addOrUpdateBook(filePath, fileName, "", "");
 
   // Trigger first update
   requestUpdate();
@@ -136,6 +141,63 @@ void TxtReaderActivity::loop() {
     return;
   }
 
+  if (SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_ORIENTATION_CHANGE) {
+    const bool topReleased = mappedInput.wasReleased(MappedInputManager::Button::Up);
+    const bool bottomReleased = mappedInput.wasReleased(MappedInputManager::Button::Down);
+    if (sideButtonLongPressHandled && (topReleased || bottomReleased)) {
+      sideButtonLongPressHandled = false;
+      return;
+    }
+
+    const bool longPressReady = mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
+    const bool topLongPressed =
+        longPressReady && (mappedInput.isPressed(MappedInputManager::Button::Up) || topReleased);
+    const bool bottomLongPressed =
+        longPressReady && (mappedInput.isPressed(MappedInputManager::Button::Down) || bottomReleased);
+
+    if (!sideButtonLongPressHandled && (topLongPressed || bottomLongPressed)) {
+      sideButtonLongPressHandled = !(topReleased || bottomReleased);
+      SETTINGS.orientation = ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/bottomLongPressed);
+      SETTINGS.saveToFile();
+      {
+        RenderLock lock(*this);
+        ReaderUtils::applyOrientation(renderer, SETTINGS.orientation);
+        pageOffsets.clear();
+        currentPageLines.clear();
+        initialized = false;
+      }
+      requestUpdate();
+      return;
+    }
+  }
+
+  if (SETTINGS.longPressButtonBehavior == CrossPointSettings::ORIENTATION_CHANGE) {
+    const bool leftReleased = mappedInput.wasReleased(MappedInputManager::Button::Left);
+    const bool rightReleased = mappedInput.wasReleased(MappedInputManager::Button::Right);
+    if (frontButtonLongPressHandled && (leftReleased || rightReleased)) {
+      frontButtonLongPressHandled = false;
+      return;
+    }
+
+    const bool longPressReady = mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
+    const bool prevLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Left);
+    const bool nextLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Right);
+    if (!frontButtonLongPressHandled && (prevLongPressed || nextLongPressed)) {
+      frontButtonLongPressHandled = true;
+      SETTINGS.orientation = ReaderUtils::rotatedOrientation(SETTINGS.orientation, /*clockwise=*/prevLongPressed);
+      SETTINGS.saveToFile();
+      {
+        RenderLock lock(*this);
+        ReaderUtils::applyOrientation(renderer, SETTINGS.orientation);
+        pageOffsets.clear();
+        currentPageLines.clear();
+        initialized = false;
+      }
+      requestUpdate();
+      return;
+    }
+  }
+
   auto [prevTriggered, nextTriggered, fromSideBtn, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
   (void)fromSideBtn;
   (void)fromTilt;
@@ -259,6 +321,13 @@ bool TxtReaderActivity::loadPageAtOffset(size_t offset, std::vector<std::string>
   }
   buffer[chunkSize] = '\0';
 
+  // Prime the SD card font's advance table before the wrap helper starts
+  // measuring strings. This avoids on-demand SD glyph lookups for every width
+  // check while preserving the shared parseAndWrapLines() implementation.
+  if (renderer.isSdCardFont(cachedFontId)) {
+    renderer.ensureSdCardFontReady(cachedFontId, reinterpret_cast<const char*>(buffer), /*styleMask=*/0x01);
+  }
+
   size_t pos = parseAndWrapLines(buffer, chunkSize, offset, fileSize, linesPerPage, renderer, cachedFontId,
                                  viewportWidth, outLines);
   nextOffset = offset + pos;
@@ -323,12 +392,12 @@ void TxtReaderActivity::renderPage() {
             // x already set to left margin
             break;
           case CrossPointSettings::CENTER_ALIGN: {
-            int textWidth = renderer.getTextWidth(cachedFontId, line.c_str());
+            int textWidth = renderer.getTextAdvanceX(cachedFontId, line.c_str(), EpdFontFamily::REGULAR);
             x = cachedOrientedMarginLeft + (contentWidth - textWidth) / 2;
             break;
           }
           case CrossPointSettings::RIGHT_ALIGN: {
-            int textWidth = renderer.getTextWidth(cachedFontId, line.c_str());
+            int textWidth = renderer.getTextAdvanceX(cachedFontId, line.c_str(), EpdFontFamily::REGULAR);
             x = cachedOrientedMarginLeft + contentWidth - textWidth;
             break;
           }
diff --git a/src/activities/reader/TxtReaderActivity.h b/src/activities/reader/TxtReaderActivity.h
index a995f52e..8896c443 100644
--- a/src/activities/reader/TxtReaderActivity.h
+++ b/src/activities/reader/TxtReaderActivity.h
@@ -13,6 +13,8 @@ class TxtReaderActivity final : public Activity {
   int currentPage = 0;
   int totalPages = 1;
   int pagesUntilFullRefresh = 0;
+  bool sideButtonLongPressHandled = false;
+  bool frontButtonLongPressHandled = false;
 
   // Streaming text reader - stores file offsets for each page
   std::vector<size_t> pageOffsets;  // File offset for start of each page
diff --git a/src/activities/reader/XtcReaderActivity.cpp b/src/activities/reader/XtcReaderActivity.cpp
index dcd8adc4..0ee470d2 100644
--- a/src/activities/reader/XtcReaderActivity.cpp
+++ b/src/activities/reader/XtcReaderActivity.cpp
@@ -10,22 +10,20 @@
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
 #include <HalStorage.h>
-#include <HalTiltSensor.h>
 #include <I18n.h>
 
+#include <algorithm>
+
 #include "CrossPointSettings.h"
 #include "CrossPointState.h"
 #include "MappedInputManager.h"
+#include "ReaderUtils.h"
 #include "RecentBooksStore.h"
 #include "XtcReaderChapterSelectionActivity.h"
 #include "components/UITheme.h"
+#include "components/themes/lyra/LyraCarouselTheme.h"
 #include "fontIds.h"
 
-namespace {
-constexpr unsigned long skipPageMs = 700;
-constexpr unsigned long goHomeMs = 1000;
-}  // namespace
-
 void XtcReaderActivity::onEnter() {
   Activity::onEnter();
 
@@ -44,7 +42,7 @@ void XtcReaderActivity::onEnter() {
   // Save current XTC as last opened book and add to recent books
   APP_STATE.openEpubPath = xtc->getPath();
   APP_STATE.saveToFile();
-  RECENT_BOOKS.addBook(xtc->getPath(), xtc->getTitle(), xtc->getAuthor(), xtc->getThumbBmpPath());
+  RECENT_BOOKS.addOrUpdateBook(xtc->getPath(), xtc->getTitle(), xtc->getAuthor(), xtc->getThumbBmpPath());
 
   // Trigger first update
   requestUpdate();
@@ -57,6 +55,15 @@ void XtcReaderActivity::onExit() {
 
   APP_STATE.readerActivityLoadCount = 0;
   APP_STATE.saveToFile();
+
+  // Generate carousel thumbnails while XTC is still loaded so the home screen
+  // can display the cover on the very first render without a loading popup.
+  if (xtc &&
+      static_cast<CrossPointSettings::UI_THEME>(SETTINGS.uiTheme) == CrossPointSettings::UI_THEME::LYRA_CAROUSEL) {
+    xtc->generateThumbBmp(LyraCarouselTheme::kCenterCoverW, LyraCarouselTheme::kCenterCoverH);
+    xtc->generateThumbBmp(LyraCarouselTheme::kSideCoverW, LyraCarouselTheme::kSideCoverH);
+  }
+
   xtc.reset();
 }
 
@@ -75,19 +82,18 @@ void XtcReaderActivity::loop() {
   }
 
   // Long press BACK (1s+) goes to file selection
-  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= goHomeMs) {
+  if (mappedInput.isPressed(MappedInputManager::Button::Back) && mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS) {
     activityManager.goToFileBrowser(xtc ? xtc->getPath() : "");
     return;
   }
 
   // Short press BACK goes directly to home
-  if (mappedInput.wasReleased(MappedInputManager::Button::Back) && mappedInput.getHeldTime() < goHomeMs) {
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back) &&
+      mappedInput.getHeldTime() < ReaderUtils::GO_HOME_MS) {
     onGoHome();
     return;
   }
 
-  // Front buttons fire on press when long-press chapter skip is disabled (faster response).
-  const bool frontUsePress = !SETTINGS.longPressChapterSkip;
   // Side buttons fire on press only when long-press action is OFF.
   const bool sideUsePress = SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_OFF;
 
@@ -97,8 +103,7 @@ void XtcReaderActivity::loop() {
                                      : mappedInput.wasReleased(MappedInputManager::Button::PageBack);
   const bool sideNext = sideUsePress ? mappedInput.wasPressed(MappedInputManager::Button::PageForward)
                                      : mappedInput.wasReleased(MappedInputManager::Button::PageForward);
-  const bool frontPrev = frontUsePress ? mappedInput.wasPressed(MappedInputManager::Button::Left)
-                                       : mappedInput.wasReleased(MappedInputManager::Button::Left);
+  const bool frontPrev = mappedInput.wasReleased(MappedInputManager::Button::Left);
   const bool powerReleased = mappedInput.wasReleased(MappedInputManager::Button::Power);
   if (powerReleased && longPowerPageTurnHandled) {
     longPowerPageTurnHandled = false;
@@ -116,8 +121,44 @@ void XtcReaderActivity::loop() {
     longPowerPageTurnHandled = true;
   }
   const bool powerPageTurn = shortPowerTurn || longPowerTurn || timedLongPowerTurn;
-  const bool frontNext = frontUsePress ? (mappedInput.wasPressed(MappedInputManager::Button::Right) || powerPageTurn)
-                                       : (mappedInput.wasReleased(MappedInputManager::Button::Right) || powerPageTurn);
+  const bool frontNext = mappedInput.wasReleased(MappedInputManager::Button::Right) || powerPageTurn;
+
+  const bool frontLongPressAction = SETTINGS.longPressButtonBehavior == CrossPointSettings::CHAPTER_SKIP;
+  if (frontLongPressAction) {
+    const bool leftReleased = mappedInput.wasReleased(MappedInputManager::Button::Left);
+    const bool rightReleased = mappedInput.wasReleased(MappedInputManager::Button::Right);
+    if (frontButtonLongPressHandled && (leftReleased || rightReleased)) {
+      frontButtonLongPressHandled = false;
+      return;
+    }
+
+    const bool longPressReady = mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
+    const bool prevLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Left);
+    const bool nextLongPressed = longPressReady && mappedInput.isPressed(MappedInputManager::Button::Right);
+    if (!frontButtonLongPressHandled && (prevLongPressed || nextLongPressed)) {
+      frontButtonLongPressHandled = true;
+      if (currentPage >= xtc->getPageCount()) {
+        if (nextLongPressed) {
+          onGoHome();
+        } else {
+          currentPage = xtc->getPageCount() - 1;
+          requestUpdate();
+        }
+        return;
+      }
+
+      if (prevLongPressed) {
+        currentPage = currentPage >= 10 ? currentPage - 10 : 0;
+      } else {
+        currentPage += 10;
+        if (currentPage >= xtc->getPageCount()) {
+          currentPage = xtc->getPageCount();
+        }
+      }
+      requestUpdate();
+      return;
+    }
+  }
 
   const bool fromSideBtn = (sidePrev || sideNext) && !(frontPrev || frontNext);
   const bool fromTilt = tiltPrev || tiltNext;
@@ -128,6 +169,14 @@ void XtcReaderActivity::loop() {
     return;
   }
 
+  // XTC pages are fixed-size bitmaps, so the orientation long-press action is
+  // consumed here instead of rotating/clipping the pre-rendered page image.
+  if (fromSideBtn &&
+      SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_ORIENTATION_CHANGE &&
+      mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS) {
+    return;
+  }
+
   // At end of the book, forward button goes home and back button returns to last page
   if (currentPage >= xtc->getPageCount()) {
     if (nextTriggered) {
@@ -140,9 +189,9 @@ void XtcReaderActivity::loop() {
   }
 
   const bool skipPages =
-      !fromTilt && !powerPageTurn && mappedInput.getHeldTime() > skipPageMs &&
+      !fromTilt && !powerPageTurn && mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS &&
       (fromSideBtn ? SETTINGS.sideButtonLongPress == CrossPointSettings::SIDE_LONG_PRESS::SIDE_LONG_CHAPTER_SKIP
-                   : static_cast<bool>(SETTINGS.longPressChapterSkip));
+                   : SETTINGS.longPressButtonBehavior == CrossPointSettings::CHAPTER_SKIP);
   const int skipAmount = skipPages ? 10 : 1;
 
   if (prevTriggered) {
@@ -179,6 +228,76 @@ void XtcReaderActivity::render(RenderLock&&) {
   saveProgress();
 }
 
+XtcReaderActivity::StatusBarInfo XtcReaderActivity::getStatusBarInfo() const {
+  const int bookPageCount = static_cast<int>(xtc->getPageCount());
+  const int bookPage = static_cast<int>(currentPage) + 1;
+  std::string title =
+      SETTINGS.statusBarTitle == CrossPointSettings::STATUS_BAR_TITLE::BOOK_TITLE ? xtc->getTitle() : "";
+
+  if (!xtc->hasChapters()) {
+    return StatusBarInfo{bookPage, bookPageCount, std::move(title)};
+  }
+
+  const auto& chapters = xtc->getChapters();
+  const auto chapterIt = std::find_if(chapters.begin(), chapters.end(), [this](const xtc::ChapterInfo& chapter) {
+    return currentPage >= chapter.startPage && currentPage <= chapter.endPage;
+  });
+
+  if (chapterIt == chapters.end() || chapterIt->endPage < chapterIt->startPage) {
+    return StatusBarInfo{bookPage, bookPageCount, std::move(title)};
+  }
+
+  if (SETTINGS.statusBarTitle == CrossPointSettings::STATUS_BAR_TITLE::CHAPTER_TITLE) {
+    title = chapterIt->name.empty() ? tr(STR_UNNAMED) : chapterIt->name;
+  }
+
+  return StatusBarInfo{static_cast<int>(currentPage - chapterIt->startPage) + 1,
+                       static_cast<int>(chapterIt->endPage - chapterIt->startPage) + 1, std::move(title)};
+}
+
+void XtcReaderActivity::renderStatusBarOverlay(const StatusBarOverlayPosition position) const {
+  const bool drawBottom = SETTINGS.xtcStatusBarMode == CrossPointSettings::XTC_STATUS_BAR_MODE::XTC_STATUS_BAR_BOTTOM &&
+                          position == StatusBarOverlayPosition::Bottom;
+  const bool drawTop = SETTINGS.xtcStatusBarMode == CrossPointSettings::XTC_STATUS_BAR_MODE::XTC_STATUS_BAR_TOP &&
+                       position == StatusBarOverlayPosition::Top;
+  if (!drawBottom && !drawTop) {
+    return;
+  }
+
+  const int statusBarHeight = UITheme::getInstance().getStatusBarHeight();
+  if (statusBarHeight <= 0) {
+    return;
+  }
+
+  int orientedMarginTop, orientedMarginRight, orientedMarginBottom, orientedMarginLeft;
+  renderer.getOrientedViewableTRBL(&orientedMarginTop, &orientedMarginRight, &orientedMarginBottom,
+                                   &orientedMarginLeft);
+
+  int clearY;
+  int paddingBottom = 0;
+  if (position == StatusBarOverlayPosition::Bottom) {
+    clearY = renderer.getScreenHeight() - orientedMarginBottom - statusBarHeight - 4;
+    if (clearY < 0) {
+      clearY = 0;
+    }
+  } else {
+    clearY = orientedMarginTop;
+    paddingBottom = renderer.getScreenHeight() - statusBarHeight - orientedMarginBottom - orientedMarginTop - 4;
+  }
+  const int clearHeight = position == StatusBarOverlayPosition::Bottom
+                              ? renderer.getScreenHeight() - orientedMarginBottom - clearY
+                              : statusBarHeight + 4;
+  if (clearHeight > 0) {
+    renderer.fillRect(0, clearY, renderer.getScreenWidth(), clearHeight, false);
+  }
+
+  const int pageCount = static_cast<int>(xtc->getPageCount());
+  const int displayPage = static_cast<int>(currentPage) + 1;
+  const float progress = pageCount > 0 ? (static_cast<float>(displayPage) * 100.0f) / pageCount : 0.0f;
+  const auto pageInfo = getStatusBarInfo();
+  GUI.drawStatusBar(renderer, progress, pageInfo.currentPage, pageInfo.pageCount, pageInfo.title, paddingBottom);
+}
+
 void XtcReaderActivity::renderPage() {
   const uint16_t pageWidth = xtc->getPageWidth();
   const uint16_t pageHeight = xtc->getPageHeight();
@@ -270,13 +389,7 @@ void XtcReaderActivity::renderPage() {
     }
 
     // Display BW with conditional refresh based on pagesUntilFullRefresh
-    if (pagesUntilFullRefresh <= 1) {
-      renderer.displayBuffer(HalDisplay::HALF_REFRESH);
-      pagesUntilFullRefresh = SETTINGS.getRefreshFrequency();
-    } else {
-      renderer.displayBuffer();
-      pagesUntilFullRefresh--;
-    }
+    ReaderUtils::displayWithRefreshCycle(renderer, pagesUntilFullRefresh);
 
     // Pass 2: LSB buffer - mark DARK gray only (XTH value 1)
     // In LUT: 0 bit = apply gray effect, 1 bit = untouched
@@ -346,17 +459,15 @@ void XtcReaderActivity::renderPage() {
 
   free(pageBuffer);
 
-  // XTC pages already have status bar pre-rendered, no need to add our own
-
-  // Display with appropriate refresh
-  if (pagesUntilFullRefresh <= 1) {
-    renderer.displayBuffer(HalDisplay::HALF_REFRESH);
-    pagesUntilFullRefresh = SETTINGS.getRefreshFrequency();
+  if (SETTINGS.xtcStatusBarMode == CrossPointSettings::XTC_STATUS_BAR_MODE::XTC_STATUS_BAR_TOP) {
+    renderStatusBarOverlay(StatusBarOverlayPosition::Top);
   } else {
-    renderer.displayBuffer();
-    pagesUntilFullRefresh--;
+    renderStatusBarOverlay(StatusBarOverlayPosition::Bottom);
   }
 
+  // Display with appropriate refresh
+  ReaderUtils::displayWithRefreshCycle(renderer, pagesUntilFullRefresh);
+
   LOG_DBG("XTR", "Rendered page %lu/%lu (%u-bit)", currentPage + 1, xtc->getPageCount(), bitDepth);
 }
 
diff --git a/src/activities/reader/XtcReaderActivity.h b/src/activities/reader/XtcReaderActivity.h
index bd09533e..8d6879ab 100644
--- a/src/activities/reader/XtcReaderActivity.h
+++ b/src/activities/reader/XtcReaderActivity.h
@@ -9,6 +9,9 @@
 
 #include <Xtc.h>
 
+#include <string>
+#include <utility>
+
 #include "activities/Activity.h"
 
 class XtcReaderActivity final : public Activity {
@@ -17,8 +20,18 @@ class XtcReaderActivity final : public Activity {
   uint32_t currentPage = 0;
   int pagesUntilFullRefresh = 0;
   bool longPowerPageTurnHandled = false;
+  bool frontButtonLongPressHandled = false;
+
+  enum class StatusBarOverlayPosition { Bottom, Top };
+  struct StatusBarInfo {
+    int currentPage;
+    int pageCount;
+    std::string title;
+  };
 
   void renderPage();
+  void renderStatusBarOverlay(StatusBarOverlayPosition position) const;
+  StatusBarInfo getStatusBarInfo() const;
   void saveProgress() const;
   void loadProgress();
 
diff --git a/src/activities/reader/XtcReaderChapterSelectionActivity.cpp b/src/activities/reader/XtcReaderChapterSelectionActivity.cpp
index 99d6b28d..ed32f70c 100644
--- a/src/activities/reader/XtcReaderChapterSelectionActivity.cpp
+++ b/src/activities/reader/XtcReaderChapterSelectionActivity.cpp
@@ -133,7 +133,7 @@ void XtcReaderChapterSelectionActivity::render(RenderLock&&) {
   // Skip button hints in landscape CW mode (they overlap content)
   if (renderer.getOrientation() != GfxRenderer::LandscapeClockwise) {
     const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
-    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
   }
 
   renderer.displayBuffer();
diff --git a/src/activities/reader/XtcReaderChapterSelectionActivity.h b/src/activities/reader/XtcReaderChapterSelectionActivity.h
index 26ff5e4f..3996b04a 100644
--- a/src/activities/reader/XtcReaderChapterSelectionActivity.h
+++ b/src/activities/reader/XtcReaderChapterSelectionActivity.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 class XtcReaderChapterSelectionActivity final : public Activity {
diff --git a/src/activities/settings/BluetoothSettingsActivity.cpp b/src/activities/settings/BluetoothSettingsActivity.cpp
index ccbe18b0..b21d04bc 100644
--- a/src/activities/settings/BluetoothSettingsActivity.cpp
+++ b/src/activities/settings/BluetoothSettingsActivity.cpp
@@ -67,7 +67,13 @@ void BluetoothSettingsActivity::onExit() {
 }
 
 void BluetoothSettingsActivity::loop() {
-  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+  // Use the Back *release* edge, not the press edge: every other activity in
+  // the stack (EpubReaderMenu, EpubReader) also handles Back on release. If
+  // this activity exits on the press edge, the same physical tap's release
+  // arrives at whichever activity is now current, popping a second time —
+  // sending the user from BT settings → reader menu → book in one tap and
+  // sometimes triggering the reader's onExit BLE auto-disable.
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
     if (viewMode == ViewMode::DEVICE_LIST) {
       // Return to main menu
       viewMode = ViewMode::MAIN_MENU;
@@ -143,15 +149,22 @@ void BluetoothSettingsActivity::handleMainMenuInput() {
   constexpr int kForgetBondedRemoteIndex = 6;
 #endif
 
-  if (mappedInput.wasPressed(MappedInputManager::Button::Up)) {
+  // Match Reader Options / Controls Options convention: both side U/D and
+  // front L/R drive the same Up/Down navigation. Hint labels (line ~675)
+  // render this as "Up/Down" since that's the conceptual operation.
+  const bool prevPressed = mappedInput.wasPressed(MappedInputManager::Button::Up) ||
+                            mappedInput.wasPressed(MappedInputManager::Button::Left);
+  const bool nextPressed = mappedInput.wasPressed(MappedInputManager::Button::Down) ||
+                            mappedInput.wasPressed(MappedInputManager::Button::Right);
+  if (prevPressed) {
     selectedIndex = (selectedIndex > 0) ? selectedIndex - 1 : (kMainMenuItemCount - 1);
     requestUpdate();
-  } else if (mappedInput.wasPressed(MappedInputManager::Button::Down)) {
+  } else if (nextPressed) {
     selectedIndex = (selectedIndex < (kMainMenuItemCount - 1)) ? selectedIndex + 1 : 0;
     requestUpdate();
   }
   
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     if (!btMgr) {
       lastError = "BLE not available";
       LOG_ERR("BT", "BLE manager not available");
@@ -194,12 +207,31 @@ void BluetoothSettingsActivity::handleMainMenuInput() {
         lastError = "Reconnecting...";
         requestUpdate();
 
-        if (btMgr->connectToDevice(SETTINGS.bleBondedDeviceAddr)) {
+        const unsigned long reconnectStart = millis();
+        const bool reconnected = btMgr->connectToDevice(SETTINGS.bleBondedDeviceAddr);
+        if (reconnected) {
           lastError = std::string("Reconnected to ") +
                       (SETTINGS.bleBondedDeviceName[0] ? SETTINGS.bleBondedDeviceName : "bonded remote");
         } else {
           lastError = btMgr->lastError.empty() ? "Reconnect failed" : btMgr->lastError;
         }
+        // connectToDevice can block 2-3 s. If the user impatiently tapped
+        // Back during the freeze, swallow that release so it doesn't pop us
+        // out of the BT menu (and cascade into a reader exit + BLE disable).
+        if (millis() - reconnectStart > 500) {
+          mappedInput.suppressNextBackRelease();
+        }
+        // Auto-pop back to the reader on success when the caller opted in
+        // (in-book menu uses exitOnSuccessfulConnect=true). Signals
+        // autoExitParent so the EpubReaderMenu launching us also finishes
+        // itself, taking the user straight back to the book.
+        if (reconnected && exitOnSuccessfulConnect) {
+          MenuResult result;
+          result.autoExitParent = true;
+          setResult(ActivityResult{result});
+          finish();
+          return;
+        }
       }
       requestUpdate();
     } else if (selectedIndex == kDisconnectDevicesIndex) {
@@ -387,7 +419,7 @@ void BluetoothSettingsActivity::handleLearnInput() {
     return;
   }
 
-  if (learnStep == LearnStep::WAIT_TEST && mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+  if (learnStep == LearnStep::WAIT_TEST && mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     DeviceProfiles::setCustomProfile(learnedPrevKey, learnedNextKey, learnedReportIndex);
     if (btMgr) {
       const auto& connected = btMgr->getConnectedDevices();
@@ -405,7 +437,10 @@ void BluetoothSettingsActivity::handleLearnInput() {
     viewMode = ViewMode::MAIN_MENU;
     selectedIndex = 0;
     if (exitOnSuccessfulConnect) {
-      if (onComplete) onComplete();
+      MenuResult result;
+      result.autoExitParent = true;
+      setResult(ActivityResult{result});
+      finish();
       return;
     }
 
@@ -413,7 +448,7 @@ void BluetoothSettingsActivity::handleLearnInput() {
     return;
   }
 
-  if (learnStep == LearnStep::DONE && mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+  if (learnStep == LearnStep::DONE && mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     if (btMgr) {
       btMgr->setLearnInputCallback(nullptr);
     }
@@ -467,7 +502,7 @@ void BluetoothSettingsActivity::handleDeviceListInput() {
     return;
   }
   
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     // Check if "Refresh" is selected
     if (selectedIndex == static_cast<int>(devices.size())) {
       LOG_INF("BT", "Refreshing scan...");
@@ -514,7 +549,10 @@ void BluetoothSettingsActivity::handleDeviceListInput() {
         lastError = "Bluetooth enabled";
         LOG_INF("BT", "Successfully connected to %s", device.name.c_str());
         if (exitOnSuccessfulConnect) {
-          if (onComplete) onComplete();
+          MenuResult result;
+          result.autoExitParent = true;
+          setResult(ActivityResult{result});
+          finish();
           return;
         }
       } else {
@@ -543,7 +581,7 @@ void BluetoothSettingsActivity::handleDebugInput() {
     return;
   }
 
-  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     const bool next = !btMgr->isDebugCaptureEnabled();
     btMgr->setDebugCaptureEnabled(next);
     lastError = next ? "BT debug capture: ON" : "BT debug capture: OFF";
@@ -640,8 +678,9 @@ void BluetoothSettingsActivity::renderMainMenu() {
     renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding, statusY, statusText.c_str(), true);
   }
 
-  // Button hints
-  const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT));
+  // Button hints — front L/R are aliased to Up/Down navigation just like
+  // Reader Options / Controls, so label them as Up/Down to match.
+  const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
   renderer.displayBuffer();
diff --git a/src/activities/settings/ClearCacheActivity.cpp b/src/activities/settings/ClearCacheActivity.cpp
index 8e8c7c86..aadf4ca0 100644
--- a/src/activities/settings/ClearCacheActivity.cpp
+++ b/src/activities/settings/ClearCacheActivity.cpp
@@ -127,7 +127,15 @@ void ClearCacheActivity::loop() {
         RenderLock lock(*this);
         state = CLEARING;
       }
-      requestUpdateAndWait();
+      if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+        LOG_ERR("CLEAR_CACHE", "Clearing cache screen could not be rendered synchronously; aborting cache clear");
+        {
+          RenderLock lock(*this);
+          state = FAILED;
+        }
+        requestUpdate(true);
+        return;
+      }
 
       clearCache();
     }
diff --git a/src/activities/settings/FontDownloadActivity.cpp b/src/activities/settings/FontDownloadActivity.cpp
new file mode 100644
index 00000000..27abc575
--- /dev/null
+++ b/src/activities/settings/FontDownloadActivity.cpp
@@ -0,0 +1,589 @@
+#include "FontDownloadActivity.h"
+
+#include <ArduinoJson.h>
+#include <GfxRenderer.h>
+#include <HalStorage.h>
+#include <I18n.h>
+#include <Logging.h>
+#include <WiFi.h>
+#include <esp_rom_crc.h>
+
+#include "MappedInputManager.h"
+#include "SdCardFontSystem.h"
+#include "activities/network/WifiSelectionActivity.h"
+#include "activities/util/ConfirmationActivity.h"
+#include "components/UITheme.h"
+#include "fontIds.h"
+#include "network/HttpDownloader.h"
+
+FontDownloadActivity::FontDownloadActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
+    : Activity("FontDownload", renderer, mappedInput), fontInstaller_(sdFontSystem.registry()) {}
+
+// --- Lifecycle ---
+
+void FontDownloadActivity::onEnter() {
+  Activity::onEnter();
+  WiFi.mode(WIFI_STA);
+  startActivityForResult(std::make_unique<WifiSelectionActivity>(renderer, mappedInput),
+                         [this](const ActivityResult& result) { onWifiSelectionComplete(!result.isCancelled); });
+}
+
+void FontDownloadActivity::onExit() {
+  Activity::onExit();
+  WiFi.disconnect(false);
+  delay(100);
+  WiFi.mode(WIFI_OFF);
+  delay(100);
+}
+
+void FontDownloadActivity::onWifiSelectionComplete(const bool success) {
+  if (!success) {
+    finish();
+    return;
+  }
+
+  {
+    RenderLock lock(*this);
+    state_ = LOADING_MANIFEST;
+  }
+  requestUpdateAndWait();
+
+  if (!fetchAndParseManifest()) {
+    {
+      RenderLock lock(*this);
+      state_ = ERROR;
+    }
+    return;
+  }
+
+  {
+    RenderLock lock(*this);
+    state_ = FAMILY_LIST;
+    selectedIndex_ = 0;
+  }
+}
+
+// --- Manifest fetching ---
+
+bool FontDownloadActivity::fetchAndParseManifest() {
+  // Download manifest to a temp file on SD card to avoid holding both
+  // TLS buffers and the full JSON string in RAM simultaneously.
+  static constexpr const char* MANIFEST_TMP = "/fonts_manifest.tmp";
+
+  auto result = HttpDownloader::downloadToFile(FONT_MANIFEST_URL, MANIFEST_TMP, nullptr);
+  if (result != HttpDownloader::OK) {
+    LOG_ERR("FONT", "Failed to fetch manifest from %s", FONT_MANIFEST_URL);
+    errorMessage_ = "Failed to fetch font list";
+    Storage.remove(MANIFEST_TMP);
+    return false;
+  }
+
+  // HTTP client is now closed — TLS buffers freed. Parse JSON from file.
+  FsFile manifestFile;
+  if (!Storage.openFileForRead("FONT", MANIFEST_TMP, manifestFile)) {
+    LOG_ERR("FONT", "Failed to open temp manifest");
+    Storage.remove(MANIFEST_TMP);
+    errorMessage_ = "Failed to read font list";
+    return false;
+  }
+
+  JsonDocument doc;
+  DeserializationError err = deserializeJson(doc, manifestFile);
+  manifestFile.close();
+  Storage.remove(MANIFEST_TMP);
+
+  if (err) {
+    LOG_ERR("FONT", "Manifest parse error: %s", err.c_str());
+    errorMessage_ = "Invalid font manifest";
+    return false;
+  }
+
+  int version = doc["version"] | 0;
+  if (version != FONTS_MANIFEST_VERSION) {
+    LOG_ERR("FONT", "Unsupported manifest version: %d", version);
+    errorMessage_ = "Unsupported manifest version";
+    return false;
+  }
+
+  baseUrl_ = doc["baseUrl"] | "";
+  families_.clear();
+  fontInstaller_.refreshRegistry();
+
+  JsonArray familiesArr = doc["families"].as<JsonArray>();
+  families_.reserve(familiesArr.size());
+
+  for (JsonObject fObj : familiesArr) {
+    ManifestFamily family;
+    family.name = fObj["name"] | "";
+    family.description = fObj["description"] | "";
+
+    for (JsonVariant s : fObj["styles"].as<JsonArray>()) {
+      family.styles.push_back(s.as<std::string>());
+    }
+
+    family.totalSize = 0;
+    for (JsonObject fileObj : fObj["files"].as<JsonArray>()) {
+      ManifestFile file;
+      file.name = fileObj["name"] | "";
+      file.size = fileObj["size"] | 0;
+
+      if (!fileObj["crc32"].is<uint32_t>()) {
+        LOG_ERR("FONT", "Malformed manifest file entry: missing or invalid crc32 for %s", file.name.c_str());
+        errorMessage_ = "Invalid font manifest";
+        return false;
+      }
+      file.crc32 = fileObj["crc32"].as<uint32_t>();
+
+      family.totalSize += file.size;
+      family.files.push_back(std::move(file));
+    }
+
+    family.installed = fontInstaller_.isFamilyInstalled(family.name.c_str());
+
+    // Detect updates by comparing manifest file sizes with files on disk.
+    // Not a checksum, but a size mismatch reliably indicates a rebuild in practice.
+    if (family.installed) {
+      for (const auto& file : family.files) {
+        char path[128];
+        FontInstaller::buildFontPath(family.name.c_str(), file.name.c_str(), path, sizeof(path));
+        FsFile f;
+        if (Storage.openFileForRead("FONT", path, f)) {
+          size_t actual = f.fileSize();
+          f.close();
+          if (actual != file.size) {
+            family.hasUpdate = true;
+            break;
+          }
+        } else {
+          // File missing on disk but family dir exists — treat as update
+          family.hasUpdate = true;
+          break;
+        }
+      }
+    }
+
+    families_.push_back(std::move(family));
+  }
+
+  LOG_DBG("FONT", "Manifest loaded: %zu families", families_.size());
+  return true;
+}
+
+// --- Download ---
+
+void FontDownloadActivity::downloadAll() {
+  for (size_t i = 0; i < families_.size(); i++) {
+    if (families_[i].installed) continue;
+    downloadFamily(families_[i]);
+    if (state_ == ERROR) return;
+  }
+
+  {
+    RenderLock lock(*this);
+    state_ = COMPLETE;
+  }
+}
+
+void FontDownloadActivity::updateAll() {
+  for (size_t i = 0; i < families_.size(); i++) {
+    if (!families_[i].hasUpdate) continue;
+    downloadFamily(families_[i]);
+    if (state_ == ERROR) return;
+  }
+
+  {
+    RenderLock lock(*this);
+    state_ = COMPLETE;
+  }
+}
+
+bool FontDownloadActivity::showDownloadAllRow() const {
+  for (const auto& f : families_) {
+    if (!f.installed) return true;
+  }
+  return false;
+}
+
+bool FontDownloadActivity::showUpdateAllRow() const {
+  for (const auto& f : families_) {
+    if (f.hasUpdate) return true;
+  }
+  return false;
+}
+
+int FontDownloadActivity::specialRowCount() const {
+  return (showDownloadAllRow() ? 1 : 0) + (showUpdateAllRow() ? 1 : 0);
+}
+
+bool FontDownloadActivity::isDownloadAllRow(int index) const { return showDownloadAllRow() && index == 0; }
+
+bool FontDownloadActivity::isUpdateAllRow(int index) const {
+  return showUpdateAllRow() && index == (showDownloadAllRow() ? 1 : 0);
+}
+
+int FontDownloadActivity::listItemCount() const {
+  return families_.empty() ? 0 : static_cast<int>(families_.size()) + specialRowCount();
+}
+
+size_t FontDownloadActivity::totalDownloadSize() const {
+  size_t total = 0;
+  for (const auto& f : families_) {
+    if (!f.installed) total += f.totalSize;
+  }
+  return total;
+}
+
+size_t FontDownloadActivity::totalUpdateSize() const {
+  size_t total = 0;
+  for (const auto& f : families_) {
+    if (f.hasUpdate) total += f.totalSize;
+  }
+  return total;
+}
+
+// Standard CRC32 matching zlib/Python zlib.crc32().
+bool FontDownloadActivity::computeFileCrc32(const char* path, uint32_t& outCrc) {
+  FsFile f;
+  if (!Storage.openFileForRead("FONT", path, f)) {
+    return false;
+  }
+  constexpr size_t BUF_SIZE = 128;
+  uint8_t buf[BUF_SIZE];
+  uint32_t crc = 0;
+  while (f.available()) {
+    const int n = f.read(buf, BUF_SIZE);
+    if (n <= 0) break;
+    crc = esp_rom_crc32_le(crc, buf, static_cast<uint32_t>(n));
+  }
+  outCrc = crc;
+  return true;
+}
+
+void FontDownloadActivity::downloadFamily(ManifestFamily& family) {
+  {
+    RenderLock lock(*this);
+    state_ = DOWNLOADING;
+    downloadingFamilyIndex_ = static_cast<int>(&family - families_.data());
+    currentFileIndex_ = 0;
+    currentFileTotal_ = family.files.size();
+    fileProgress_ = 0;
+    fileTotal_ = 0;
+  }
+  requestUpdateAndWait();
+
+  if (!fontInstaller_.ensureFamilyDir(family.name.c_str())) {
+    RenderLock lock(*this);
+    state_ = ERROR;
+    errorMessage_ = "Failed to create font directory";
+    return;
+  }
+
+  for (size_t i = 0; i < family.files.size(); i++) {
+    const auto& file = family.files[i];
+
+    {
+      RenderLock lock(*this);
+      currentFileIndex_ = i;
+      fileProgress_ = 0;
+      fileTotal_ = file.size;
+    }
+    requestUpdateAndWait();
+
+    char destPath[128];
+    FontInstaller::buildFontPath(family.name.c_str(), file.name.c_str(), destPath, sizeof(destPath));
+
+    std::string url = baseUrl_ + file.name;
+
+    auto result = HttpDownloader::downloadToFile(url, destPath, [this](size_t downloaded, size_t total) {
+      fileProgress_ = downloaded;
+      fileTotal_ = total;
+      requestUpdate(true);
+    });
+
+    if (result != HttpDownloader::OK) {
+      LOG_ERR("FONT", "Download failed: %s (%d)", file.name.c_str(), result);
+      fontInstaller_.deleteFamily(family.name.c_str());
+      family.installed = false;
+      family.hasUpdate = false;
+      RenderLock lock(*this);
+      state_ = ERROR;
+      errorMessage_ = "Download failed: " + file.name;
+      return;
+    }
+
+    uint32_t actualCrc = 0;
+    if (!computeFileCrc32(destPath, actualCrc)) {
+      LOG_ERR("FONT", "Failed to open file for CRC check: %s", destPath);
+      fontInstaller_.deleteFamily(family.name.c_str());
+      family.installed = false;
+      family.hasUpdate = false;
+      RenderLock lock(*this);
+      state_ = ERROR;
+      errorMessage_ = "Failed to compute checksum: " + file.name;
+      return;
+    }
+    if (actualCrc != file.crc32) {
+      LOG_ERR("FONT", "CRC32 mismatch for %s: got %08x expected %08x", file.name.c_str(), actualCrc, file.crc32);
+      fontInstaller_.deleteFamily(family.name.c_str());
+      family.installed = false;
+      family.hasUpdate = false;
+      RenderLock lock(*this);
+      state_ = ERROR;
+      errorMessage_ = "Checksum mismatch: " + file.name;
+      return;
+    }
+    LOG_DBG("FONT", "Downloaded %s (size=%zu crc32=%08x)", file.name.c_str(), file.size, actualCrc);
+
+    if (!fontInstaller_.validateCpfontFile(destPath)) {
+      LOG_ERR("FONT", "Invalid .cpfont: %s", destPath);
+      fontInstaller_.deleteFamily(family.name.c_str());
+      family.installed = false;
+      family.hasUpdate = false;
+      RenderLock lock(*this);
+      state_ = ERROR;
+      errorMessage_ = "Invalid font file: " + file.name;
+      return;
+    }
+  }
+
+  fontInstaller_.refreshRegistry();
+  family.installed = true;
+  family.hasUpdate = false;
+
+  {
+    RenderLock lock(*this);
+    state_ = COMPLETE;
+  }
+}
+
+void FontDownloadActivity::promptDeleteSelectedFamily() {
+  const int pendingDeleteFamilyIndex = familyIndexFromList(selectedIndex_);
+  if (pendingDeleteFamilyIndex < 0 || pendingDeleteFamilyIndex >= static_cast<int>(families_.size())) {
+    return;
+  }
+
+  std::string heading = tr(STR_DELETE);
+  const auto& family = families_[pendingDeleteFamilyIndex];
+  std::string body = family.name;
+  startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, body),
+                         [this](const ActivityResult& result) { onDeleteConfirmationResult(result); });
+}
+
+void FontDownloadActivity::onDeleteConfirmationResult(const ActivityResult& result) {
+  if (result.isCancelled) {
+    requestUpdate();
+    return;
+  }
+
+  auto& family = families_[familyIndexFromList(selectedIndex_)];
+
+  if (fontInstaller_.deleteFamily(family.name.c_str()) != FontInstaller::Error::OK) {
+    RenderLock lock(*this);
+    state_ = ERROR;
+    errorMessage_ = "Failed to delete font";
+  } else {
+    fontInstaller_.refreshRegistry();
+    family.installed = false;
+    family.hasUpdate = false;
+  }
+
+  requestUpdate();
+}
+
+bool FontDownloadActivity::isSelectedFamilyDeletable() const {
+  if (isDownloadAllRow(selectedIndex_) || isUpdateAllRow(selectedIndex_)) return false;
+  if (selectedIndex_ < specialRowCount() || selectedIndex_ >= listItemCount()) return false;
+  const auto& family = families_[familyIndexFromList(selectedIndex_)];
+  return family.installed && !family.hasUpdate;
+}
+
+// --- Input handling ---
+
+void FontDownloadActivity::loop() {
+  if (state_ == FAMILY_LIST) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+      finish();
+      return;
+    }
+
+    const int listSize = listItemCount();
+    const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false);
+
+    buttonNavigator_.onNextRelease([this, listSize] {
+      selectedIndex_ = ButtonNavigator::nextIndex(selectedIndex_, listSize);
+      requestUpdate();
+    });
+
+    buttonNavigator_.onPreviousRelease([this, listSize] {
+      selectedIndex_ = ButtonNavigator::previousIndex(selectedIndex_, listSize);
+      requestUpdate();
+    });
+
+    buttonNavigator_.onNextContinuous([this, listSize, pageItems] {
+      selectedIndex_ = ButtonNavigator::nextPageIndex(selectedIndex_, listSize, pageItems);
+      requestUpdate();
+    });
+
+    buttonNavigator_.onPreviousContinuous([this, listSize, pageItems] {
+      selectedIndex_ = ButtonNavigator::previousPageIndex(selectedIndex_, listSize, pageItems);
+      requestUpdate();
+    });
+
+    if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+      if (!families_.empty()) {
+        if (isDownloadAllRow(selectedIndex_)) {
+          downloadAll();
+        } else if (isUpdateAllRow(selectedIndex_)) {
+          updateAll();
+        } else {
+          auto& family = families_[familyIndexFromList(selectedIndex_)];
+          if (!family.installed || family.hasUpdate) {
+            downloadFamily(family);
+          } else {
+            promptDeleteSelectedFamily();
+            return;
+          }
+        }
+        requestUpdateAndWait();
+        return;
+      }
+    }
+  } else if (state_ == COMPLETE) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back) ||
+        mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+      {
+        RenderLock lock(*this);
+        state_ = FAMILY_LIST;
+      }
+      requestUpdate();
+    }
+  } else if (state_ == ERROR) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+      {
+        RenderLock lock(*this);
+        state_ = FAMILY_LIST;
+      }
+      requestUpdate();
+    } else if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+      if (downloadingFamilyIndex_ >= 0 && downloadingFamilyIndex_ < static_cast<int>(families_.size())) {
+        downloadFamily(families_[downloadingFamilyIndex_]);
+        requestUpdateAndWait();
+        return;
+      } else {
+        {
+          RenderLock lock(*this);
+          state_ = FAMILY_LIST;
+        }
+        requestUpdate();
+      }
+    }
+  }
+}
+
+// --- Rendering ---
+
+std::string FontDownloadActivity::formatSize(size_t bytes) {
+  char buf[32];
+  if (bytes >= 1024 * 1024) {
+    snprintf(buf, sizeof(buf), "%.1f MB", static_cast<double>(bytes) / (1024.0 * 1024.0));
+  } else if (bytes >= 1024) {
+    snprintf(buf, sizeof(buf), "%.0f KB", static_cast<double>(bytes) / 1024.0);
+  } else {
+    snprintf(buf, sizeof(buf), "%zu B", bytes);
+  }
+  return buf;
+}
+
+void FontDownloadActivity::render(RenderLock&&) {
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  const auto pageWidth = renderer.getScreenWidth();
+  const auto pageHeight = renderer.getScreenHeight();
+
+  renderer.clearScreen();
+
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_FONT_BROWSER));
+
+  const auto lineHeight = renderer.getLineHeight(UI_10_FONT_ID);
+  const auto contentTop = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
+  const auto centerY = (pageHeight - lineHeight) / 2;
+
+  if (state_ == LOADING_MANIFEST) {
+    renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_LOADING_FONT_LIST));
+  } else if (state_ == FAMILY_LIST) {
+    if (families_.empty()) {
+      renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_NO_FONTS_AVAILABLE));
+      const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+      GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    } else {
+      GUI.drawList(
+          renderer,
+          Rect{0, contentTop, pageWidth, pageHeight - contentTop - metrics.buttonHintsHeight - metrics.verticalSpacing},
+          listItemCount(), selectedIndex_,
+          [this](int index) -> std::string {
+            if (isDownloadAllRow(index)) {
+              return std::string(tr(STR_DOWNLOAD_ALL)) + " (" + formatSize(totalDownloadSize()) + ")";
+            }
+            if (isUpdateAllRow(index)) {
+              return std::string(tr(STR_UPDATE_ALL)) + " (" + formatSize(totalUpdateSize()) + ")";
+            }
+            return families_[familyIndexFromList(index)].name;
+          },
+          [this](int index) -> std::string {
+            if (isDownloadAllRow(index) || isUpdateAllRow(index)) return "";
+            return families_[familyIndexFromList(index)].description;
+          },
+          nullptr,
+          [this](int index) -> std::string {
+            if (isDownloadAllRow(index) || isUpdateAllRow(index)) return "";
+            const auto& f = families_[familyIndexFromList(index)];
+            if (f.hasUpdate) return tr(STR_UPDATE_AVAILABLE);
+            if (f.installed) return tr(STR_INSTALLED);
+            return "";
+          },
+          true,
+          [this](int index) -> bool {
+            if (isDownloadAllRow(index) || isUpdateAllRow(index)) return false;
+            const auto& f = families_[familyIndexFromList(index)];
+            return f.installed && !f.hasUpdate;
+          });
+
+      const auto labels = mappedInput.mapLabels(tr(STR_BACK),
+                                                isSelectedFamilyDeletable()      ? tr(STR_DELETE)
+                                                : isUpdateAllRow(selectedIndex_) ? tr(STR_UPDATE)
+                                                                                 : tr(STR_DOWNLOAD),
+                                                tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+      GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+    }
+  } else if (state_ == DOWNLOADING) {
+    const auto& family = families_[downloadingFamilyIndex_];
+
+    std::string statusText = std::string(tr(STR_DOWNLOADING)) + " " + family.name + " (" +
+                             std::to_string(currentFileIndex_ + 1) + "/" + std::to_string(currentFileTotal_) + ")";
+    renderer.drawCenteredText(UI_10_FONT_ID, centerY - lineHeight, statusText.c_str());
+
+    float progress = 0;
+    if (fileTotal_ > 0) {
+      progress = static_cast<float>(fileProgress_) / static_cast<float>(fileTotal_);
+    }
+
+    int barY = centerY + metrics.verticalSpacing;
+    GUI.drawProgressBar(
+        renderer,
+        Rect{metrics.contentSidePadding, barY, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
+        static_cast<int>(progress * 100), 100);
+  } else if (state_ == COMPLETE) {
+    renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_FONT_INSTALLED), true, EpdFontFamily::BOLD);
+    const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  } else if (state_ == ERROR) {
+    renderer.drawCenteredText(UI_10_FONT_ID, centerY - lineHeight, tr(STR_FONT_INSTALL_FAILED), true,
+                              EpdFontFamily::BOLD);
+    if (!errorMessage_.empty()) {
+      renderer.drawCenteredText(UI_10_FONT_ID, centerY + metrics.verticalSpacing, errorMessage_.c_str());
+    }
+    const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_RETRY), "", "");
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  }
+
+  renderer.displayBuffer();
+}
diff --git a/src/activities/settings/FontDownloadActivity.h b/src/activities/settings/FontDownloadActivity.h
new file mode 100644
index 00000000..7f76e7c6
--- /dev/null
+++ b/src/activities/settings/FontDownloadActivity.h
@@ -0,0 +1,102 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "FontInstaller.h"
+#include "SdCardFont.h"
+#include "activities/Activity.h"
+#include "util/ButtonNavigator.h"
+
+// JSON schema version of the fonts.json manifest. The canonical version for
+// the build tooling lives in lib/EpdFont/scripts/cpfont_version.py. This
+// firmware-side copy must be bumped manually when the firmware is updated to
+// support a new manifest schema.
+#define FONTS_MANIFEST_VERSION 1
+
+#ifndef FONT_MANIFEST_URL
+// Manifest + .cpfont assets are published by .github/workflows/release-fonts.yml
+// to the crosspoint-fonts repo under the "sd-fonts-m<META>-b<BIN>" tag. The tag
+// pattern must stay in sync with the workflow; it derives its version numbers
+// from lib/EpdFont/scripts/cpfont_version.py.
+#define FONT_MANIFEST_URL_STRINGIFY_INNER(x) #x
+#define FONT_MANIFEST_URL_STRINGIFY(x) FONT_MANIFEST_URL_STRINGIFY_INNER(x)
+#define FONT_MANIFEST_URL                                                                                           \
+  "https://github.com/crosspoint-reader/crosspoint-fonts/releases/download/sd-fonts-m" FONT_MANIFEST_URL_STRINGIFY( \
+      FONTS_MANIFEST_VERSION) "-b" FONT_MANIFEST_URL_STRINGIFY(CPFONT_VERSION) "/fonts.json"
+#endif
+
+class FontDownloadActivity : public Activity {
+ public:
+  explicit FontDownloadActivity(GfxRenderer& renderer, MappedInputManager& mappedInput);
+
+  void onEnter() override;
+  void onExit() override;
+  void loop() override;
+  void render(RenderLock&&) override;
+  bool preventAutoSleep() override { return state_ == LOADING_MANIFEST || state_ == DOWNLOADING; }
+  bool skipLoopDelay() override { return true; }
+
+ private:
+  enum State {
+    WIFI_SELECTION,
+    LOADING_MANIFEST,
+    FAMILY_LIST,
+    DOWNLOADING,
+    COMPLETE,
+    ERROR,
+  };
+
+  struct ManifestFile {
+    std::string name;
+    size_t size = 0;
+    uint32_t crc32 = 0;
+  };
+
+  struct ManifestFamily {
+    std::string name;
+    std::string description;
+    std::vector<std::string> styles;
+    std::vector<ManifestFile> files;
+    size_t totalSize = 0;
+    bool installed = false;
+    bool hasUpdate = false;
+  };
+
+  State state_ = WIFI_SELECTION;
+  FontInstaller fontInstaller_;
+  ButtonNavigator buttonNavigator_;
+
+  // Manifest data
+  std::string baseUrl_;
+  std::vector<ManifestFamily> families_;
+  int selectedIndex_ = 0;
+
+  // Download progress
+  size_t currentFileIndex_ = 0;
+  size_t currentFileTotal_ = 0;
+  size_t fileProgress_ = 0;
+  size_t fileTotal_ = 0;
+  int downloadingFamilyIndex_ = 0;
+  std::string errorMessage_;
+
+  void onWifiSelectionComplete(bool success);
+  bool fetchAndParseManifest();
+  void downloadFamily(ManifestFamily& family);
+  void downloadAll();
+  void updateAll();
+  static bool computeFileCrc32(const char* path, uint32_t& outCrc);
+  bool showDownloadAllRow() const;
+  bool showUpdateAllRow() const;
+  int specialRowCount() const;
+  bool isDownloadAllRow(int index) const;
+  bool isUpdateAllRow(int index) const;
+  bool isSelectedFamilyDeletable() const;
+  void promptDeleteSelectedFamily();
+  void onDeleteConfirmationResult(const ActivityResult& result);
+  int familyIndexFromList(int listIndex) const { return listIndex - specialRowCount(); }
+  int listItemCount() const;
+  size_t totalDownloadSize() const;
+  size_t totalUpdateSize() const;
+  static std::string formatSize(size_t bytes);
+};
diff --git a/src/activities/settings/FontSelectionActivity.cpp b/src/activities/settings/FontSelectionActivity.cpp
new file mode 100644
index 00000000..e27e23f8
--- /dev/null
+++ b/src/activities/settings/FontSelectionActivity.cpp
@@ -0,0 +1,139 @@
+#include "FontSelectionActivity.h"
+
+#include <GfxRenderer.h>
+#include <I18n.h>
+
+#include "CrossPointSettings.h"
+#include "MappedInputManager.h"
+#include "components/UITheme.h"
+#include "fontIds.h"
+
+FontSelectionActivity::FontSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
+                                             const SdCardFontRegistry* registry)
+    : Activity("FontSelect", renderer, mappedInput), registry_(registry) {}
+
+void FontSelectionActivity::onEnter() {
+  Activity::onEnter();
+
+  // Build combined font list: built-in + SD card fonts
+  fonts_.clear();
+  fonts_.reserve(CrossPointSettings::BUILTIN_FONT_COUNT + (registry_ ? registry_->getFamilyCount() : 0));
+
+  fonts_.push_back({I18N.get(StrId::STR_LEXEND_DECA), true, 0});
+  fonts_.push_back({I18N.get(StrId::STR_BITTER), true, 1});
+  fonts_.push_back({I18N.get(StrId::STR_CHAREINK), true, 2});
+
+  if (registry_) {
+    const auto& families = registry_->getFamilies();
+    for (int i = 0; i < static_cast<int>(families.size()); i++) {
+      fonts_.push_back({families[i].name, false, static_cast<uint8_t>(CrossPointSettings::BUILTIN_FONT_COUNT + i)});
+    }
+  }
+
+  // Find current selection
+  selectedIndex_ = 0;
+  if (SETTINGS.sdFontFamilyName[0] != '\0' && registry_) {
+    const auto& families = registry_->getFamilies();
+    for (int i = 0; i < static_cast<int>(families.size()); i++) {
+      if (families[i].name == SETTINGS.sdFontFamilyName) {
+        selectedIndex_ = CrossPointSettings::BUILTIN_FONT_COUNT + i;
+        break;
+      }
+    }
+  } else {
+    selectedIndex_ = SETTINGS.fontFamily < CrossPointSettings::BUILTIN_FONT_COUNT ? SETTINGS.fontFamily : 0;
+  }
+
+  requestUpdate();
+}
+
+void FontSelectionActivity::onExit() { Activity::onExit(); }
+
+void FontSelectionActivity::loop() {
+  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+    finish();
+    return;
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    handleSelection();
+    return;
+  }
+
+  const int listSize = static_cast<int>(fonts_.size());
+  const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false);
+
+  buttonNavigator_.onNextRelease([this, listSize] {
+    selectedIndex_ = ButtonNavigator::nextIndex(selectedIndex_, listSize);
+    requestUpdate();
+  });
+
+  buttonNavigator_.onPreviousRelease([this, listSize] {
+    selectedIndex_ = ButtonNavigator::previousIndex(selectedIndex_, listSize);
+    requestUpdate();
+  });
+
+  buttonNavigator_.onNextContinuous([this, listSize, pageItems] {
+    selectedIndex_ = ButtonNavigator::nextPageIndex(selectedIndex_, listSize, pageItems);
+    requestUpdate();
+  });
+
+  buttonNavigator_.onPreviousContinuous([this, listSize, pageItems] {
+    selectedIndex_ = ButtonNavigator::previousPageIndex(selectedIndex_, listSize, pageItems);
+    requestUpdate();
+  });
+}
+
+void FontSelectionActivity::handleSelection() {
+  const auto& font = fonts_[selectedIndex_];
+  if (font.settingIndex < CrossPointSettings::BUILTIN_FONT_COUNT) {
+    SETTINGS.fontFamily = font.settingIndex;
+    SETTINGS.sdFontFamilyName[0] = '\0';
+  } else if (registry_) {
+    int sdIdx = font.settingIndex - CrossPointSettings::BUILTIN_FONT_COUNT;
+    const auto& families = registry_->getFamilies();
+    if (sdIdx < static_cast<int>(families.size())) {
+      strncpy(SETTINGS.sdFontFamilyName, families[sdIdx].name.c_str(), sizeof(SETTINGS.sdFontFamilyName) - 1);
+      SETTINGS.sdFontFamilyName[sizeof(SETTINGS.sdFontFamilyName) - 1] = '\0';
+    }
+  }
+  finish();
+}
+
+void FontSelectionActivity::render(RenderLock&&) {
+  renderer.clearScreen();
+
+  const auto pageWidth = renderer.getScreenWidth();
+  const auto pageHeight = renderer.getScreenHeight();
+  const auto& metrics = UITheme::getInstance().getMetrics();
+
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_FONT_FAMILY));
+
+  const int contentTop = metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing;
+  const int contentHeight = pageHeight - contentTop - metrics.buttonHintsHeight - metrics.verticalSpacing;
+
+  // Determine which font index is currently active (to mark as "Selected")
+  int currentFontIndex = 0;
+  if (SETTINGS.sdFontFamilyName[0] != '\0' && registry_) {
+    const auto& families = registry_->getFamilies();
+    for (int i = 0; i < static_cast<int>(families.size()); i++) {
+      if (families[i].name == SETTINGS.sdFontFamilyName) {
+        currentFontIndex = CrossPointSettings::BUILTIN_FONT_COUNT + i;
+        break;
+      }
+    }
+  } else {
+    currentFontIndex = SETTINGS.fontFamily < CrossPointSettings::BUILTIN_FONT_COUNT ? SETTINGS.fontFamily : 0;
+  }
+
+  GUI.drawList(
+      renderer, Rect{0, contentTop, pageWidth, contentHeight}, static_cast<int>(fonts_.size()), selectedIndex_,
+      [this](int index) { return fonts_[index].name; }, nullptr, nullptr,
+      [this, currentFontIndex](int index) -> std::string { return index == currentFontIndex ? tr(STR_SELECTED) : ""; },
+      true);
+
+  const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+
+  renderer.displayBuffer();
+}
diff --git a/src/activities/settings/FontSelectionActivity.h b/src/activities/settings/FontSelectionActivity.h
new file mode 100644
index 00000000..9094c802
--- /dev/null
+++ b/src/activities/settings/FontSelectionActivity.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <SdCardFontRegistry.h>
+
+#include <string>
+#include <vector>
+
+#include "activities/Activity.h"
+#include "util/ButtonNavigator.h"
+
+class FontSelectionActivity final : public Activity {
+ public:
+  explicit FontSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
+                                 const SdCardFontRegistry* registry);
+
+  void onEnter() override;
+  void onExit() override;
+  void loop() override;
+  void render(RenderLock&&) override;
+
+ private:
+  void handleSelection();
+
+  struct FontEntry {
+    std::string name;
+    bool isBuiltin;
+    uint8_t settingIndex;  // index used by valueSetter
+  };
+
+  const SdCardFontRegistry* registry_;
+  ButtonNavigator buttonNavigator_;
+  std::vector<FontEntry> fonts_;
+  int selectedIndex_ = 0;
+};
diff --git a/src/activities/settings/LanguageSelectActivity.cpp b/src/activities/settings/LanguageSelectActivity.cpp
index 793f4901..b60459b3 100644
--- a/src/activities/settings/LanguageSelectActivity.cpp
+++ b/src/activities/settings/LanguageSelectActivity.cpp
@@ -37,6 +37,8 @@ void LanguageSelectActivity::loop() {
     return;
   }
 
+  const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false);
+
   // Handle navigation
   buttonNavigator.onNextRelease([this] {
     selectedIndex = ButtonNavigator::nextIndex(static_cast<int>(selectedIndex), totalItems);
@@ -47,6 +49,16 @@ void LanguageSelectActivity::loop() {
     selectedIndex = ButtonNavigator::previousIndex(static_cast<int>(selectedIndex), totalItems);
     requestUpdate();
   });
+
+  buttonNavigator.onNextContinuous([this, pageItems] {
+    selectedIndex = ButtonNavigator::nextPageIndex(static_cast<int>(selectedIndex), totalItems, pageItems);
+    requestUpdate();
+  });
+
+  buttonNavigator.onPreviousContinuous([this, pageItems] {
+    selectedIndex = ButtonNavigator::previousPageIndex(static_cast<int>(selectedIndex), totalItems, pageItems);
+    requestUpdate();
+  });
 }
 
 void LanguageSelectActivity::handleSelection() {
diff --git a/src/activities/settings/LanguageSelectActivity.h b/src/activities/settings/LanguageSelectActivity.h
index b8662554..aa2a68bb 100644
--- a/src/activities/settings/LanguageSelectActivity.h
+++ b/src/activities/settings/LanguageSelectActivity.h
@@ -5,7 +5,7 @@
 
 #include <functional>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "components/UITheme.h"
 #include "util/ButtonNavigator.h"
 
diff --git a/src/activities/settings/OtaUpdateActivity.cpp b/src/activities/settings/OtaUpdateActivity.cpp
index c1b4e23f..1b650cd3 100644
--- a/src/activities/settings/OtaUpdateActivity.cpp
+++ b/src/activities/settings/OtaUpdateActivity.cpp
@@ -24,7 +24,15 @@ void OtaUpdateActivity::onWifiSelectionComplete(const bool success) {
     RenderLock lock(*this);
     state = CHECKING_FOR_UPDATE;
   }
-  requestUpdateAndWait();
+  if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+    LOG_ERR("OTA", "Checking update screen could not be rendered synchronously; aborting update check");
+    {
+      RenderLock lock(*this);
+      state = FAILED;
+    }
+    requestUpdate(true);
+    return;
+  }
 
   const auto res = updater.checkForUpdate();
   if (res != OtaUpdater::OK) {
@@ -33,6 +41,7 @@ void OtaUpdateActivity::onWifiSelectionComplete(const bool success) {
       RenderLock lock(*this);
       state = FAILED;
     }
+    requestUpdate(true);
     return;
   }
 
@@ -42,6 +51,7 @@ void OtaUpdateActivity::onWifiSelectionComplete(const bool success) {
       RenderLock lock(*this);
       state = NO_UPDATE;
     }
+    requestUpdate(true);
     return;
   }
 
@@ -49,6 +59,7 @@ void OtaUpdateActivity::onWifiSelectionComplete(const bool success) {
     RenderLock lock(*this);
     state = WAITING_CONFIRMATION;
   }
+  requestUpdate(true);
 }
 
 void OtaUpdateActivity::onEnter() {
@@ -117,8 +128,8 @@ void OtaUpdateActivity::render(RenderLock&&) {
         static_cast<int>(updaterProgress * 100), 100);
 
     y += metrics.progressBarHeight + metrics.verticalSpacing;
-    renderer.drawCenteredText(UI_10_FONT_ID, y,
-                              (std::to_string(static_cast<int>(updaterProgress * 100)) + "%").c_str());
+    // Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty
+    // so the bytes line below stays at the same Y it was at when the activity drew its own percent.
     y += height + metrics.verticalSpacing;
     renderer.drawCenteredText(
         UI_10_FONT_ID, y,
@@ -147,7 +158,15 @@ void OtaUpdateActivity::loop() {
         RenderLock lock(*this);
         state = UPDATE_IN_PROGRESS;
       }
-      requestUpdateAndWait();
+      if (requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+        LOG_ERR("OTA", "Update progress screen could not be rendered synchronously; aborting OTA install");
+        {
+          RenderLock lock(*this);
+          state = FAILED;
+        }
+        requestUpdate(true);
+        return;
+      }
       const auto res = updater.installUpdate(
           [](void* ctx) {
             // immediate=true notifies the render task directly. The default deferred path only
@@ -171,9 +190,13 @@ void OtaUpdateActivity::loop() {
         RenderLock lock(*this);
         state = FINISHED;
       }
-      requestUpdateAndWait();
-      // Hold the completion screen briefly so the user sees it, then restart.
-      delay(3000);
+      const auto renderResult = requestUpdateAndWait();
+      if (renderResult == RequestUpdateResult::Rendered) {
+        // Hold the completion screen briefly so the user sees it, then restart.
+        delay(3000);
+      } else {
+        LOG_ERR("OTA", "Completion screen could not be rendered synchronously; restarting without sync confirmation");
+      }
       {
         RenderLock lock(*this);
         state = SHUTTING_DOWN;
diff --git a/src/activities/settings/SdFirmwareUpdateActivity.cpp b/src/activities/settings/SdFirmwareUpdateActivity.cpp
new file mode 100644
index 00000000..b0ca1f63
--- /dev/null
+++ b/src/activities/settings/SdFirmwareUpdateActivity.cpp
@@ -0,0 +1,255 @@
+#include "SdFirmwareUpdateActivity.h"
+
+#include <Arduino.h>
+#include <GfxRenderer.h>
+#include <HalStorage.h>
+#include <I18n.h>
+#include <Logging.h>
+#include <esp_ota_ops.h>
+
+#include "MappedInputManager.h"
+#include "activities/home/FileBrowserActivity.h"
+#include "activities/util/ConfirmationActivity.h"
+#include "components/UITheme.h"
+#include "fontIds.h"
+#include "network/FirmwareFlasher.h"
+
+void SdFirmwareUpdateActivity::onEnter() {
+  Activity::onEnter();
+  // Build-identity marker — confirms which firmware build owns the SD update flow.
+  LOG_INF("FW", "SdFirmwareUpdateActivity build=%s %s recovery=%d", __DATE__, __TIME__, recoveryMode ? 1 : 0);
+  state = State::PICKING;
+  launchPicker();
+}
+
+void SdFirmwareUpdateActivity::launchPicker() {
+  // Reuse the standard file browser, restricted to .bin files only.
+  startActivityForResult(
+      std::make_unique<FileBrowserActivity>(renderer, mappedInput, "/", FileBrowserActivity::Mode::PickFirmware),
+      [this](const ActivityResult& result) { onPickerResult(result); });
+}
+
+void SdFirmwareUpdateActivity::onPickerResult(const ActivityResult& result) {
+  if (result.isCancelled) {
+    if (recoveryMode) {
+      // Recovery mode: re-launch the picker so the user cannot escape into a half-initialised UI.
+      launchPicker();
+      return;
+    }
+    finish();
+    return;
+  }
+
+  const auto* path = std::get_if<FilePathResult>(&result.data);
+  if (!path) {
+    LOG_ERR("FW", "Picker returned no path");
+    finish();
+    return;
+  }
+  firmwarePath = path->path;
+  LOG_DBG("FW", "Selected: %s", firmwarePath.c_str());
+
+  {
+    RenderLock lock(*this);
+    state = State::VALIDATING;
+  }
+  requestUpdateAndWait();
+
+  if (!validateFirmware()) {
+    RenderLock lock(*this);
+    state = State::FAILED;
+    requestUpdate();
+    return;
+  }
+
+  promptConfirmation();
+}
+
+bool SdFirmwareUpdateActivity::validateFirmware() {
+  HalFile file;
+  if (!Storage.openFileForRead("FW", firmwarePath.c_str(), file) || !file) {
+    errorMessage = tr(STR_FIRMWARE_FILE_OPEN_FAILED);
+    return false;
+  }
+  firmwareSize = file.fileSize();
+  file.close();
+
+  // Resolve the next-update partition directly via the OTA API. Previously this
+  // probed via Update.begin(firmwareSize)/Update.abort() to learn the partition
+  // size, which had the side effect of erasing partition state and was wasted
+  // work since we only need the size bound for validation here.
+  const esp_partition_t* dest = esp_ota_get_next_update_partition(nullptr);
+  if (!dest) {
+    LOG_ERR("FW", "no next-update partition available");
+    errorMessage = tr(STR_INVALID_FIRMWARE);
+    return false;
+  }
+  const size_t partitionLimit = dest->size;
+  if (firmwareSize > partitionLimit) {
+    LOG_ERR("FW", "firmware (%u bytes) exceeds partition (%u bytes)", static_cast<unsigned>(firmwareSize),
+            static_cast<unsigned>(partitionLimit));
+    errorMessage = tr(STR_FIRMWARE_TOO_LARGE);
+    return false;
+  }
+
+  // Run the same end-to-end integrity check (header / segment table / XOR checksum / SHA256
+  // trailer) that the shared firmware-flasher applies right before raw-writing otadata. This
+  // catches truncated or corrupted .bin files at confirmation time, before the user ever sees
+  // the "Updating…" progress bar.
+  const auto vr = firmware_flash::validateImageFile(firmwarePath.c_str(), partitionLimit);
+  if (vr != firmware_flash::Result::OK) {
+    LOG_ERR("FW", "image validation failed: %s", firmware_flash::resultName(vr));
+    if (vr == firmware_flash::Result::TOO_LARGE) {
+      errorMessage = tr(STR_FIRMWARE_TOO_LARGE);
+    } else if (vr == firmware_flash::Result::TOO_SMALL) {
+      errorMessage = tr(STR_FIRMWARE_TOO_SMALL);
+    } else {
+      errorMessage = tr(STR_INVALID_FIRMWARE);
+    }
+    return false;
+  }
+  return true;
+}
+
+void SdFirmwareUpdateActivity::promptConfirmation() {
+  {
+    RenderLock lock(*this);
+    state = State::CONFIRMING;
+  }
+  // Show "Update firmware?" with the file path as the body line.
+  std::string heading = tr(STR_FIRMWARE_UPDATE_PROMPT);
+  // Use the basename only to keep the body short.
+  std::string body = firmwarePath;
+  const auto pos = body.find_last_of('/');
+  if (pos != std::string::npos) body = body.substr(pos + 1);
+
+  startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, body),
+                         [this](const ActivityResult& result) { onConfirmationResult(result); });
+}
+
+void SdFirmwareUpdateActivity::onConfirmationResult(const ActivityResult& result) {
+  if (result.isCancelled) {
+    if (recoveryMode) {
+      // Go back to the picker rather than exiting recovery.
+      launchPicker();
+      return;
+    }
+    finish();
+    return;
+  }
+
+  {
+    RenderLock lock(*this);
+    state = State::UPDATING;
+    writtenBytes = 0;
+    lastRenderedPercent = 101;
+  }
+  requestUpdateAndWait();
+  performUpdate();
+}
+
+void SdFirmwareUpdateActivity::performUpdate() {
+  LOG_INF("FW", "SD update: %s (%u bytes)", firmwarePath.c_str(), static_cast<unsigned>(firmwareSize));
+
+  auto progressCb = +[](size_t written, size_t total, void* ctx) {
+    auto* self = static_cast<SdFirmwareUpdateActivity*>(ctx);
+    self->writtenBytes = written;
+    self->firmwareSize = total;
+    // immediate=true: wake the render task directly. We're in a tight sync
+    // loop so the main loop won't drain the requestedUpdate flag for us.
+    self->requestUpdate(true);
+  };
+
+  // Re-validate at flash time (TOCTOU): SD is removable, so don't trust the
+  // pre-confirmation pass. The alreadyValidated parameter on the API stays
+  // for callers (e.g. an OTA staging path) where the same byte stream was
+  // just hashed and there's no removable-media gap.
+  const auto result = firmware_flash::flashFromSdPath(firmwarePath.c_str(), progressCb, this);
+  if (result != firmware_flash::Result::OK) {
+    LOG_ERR("FW", "flash failed: %s", firmware_flash::resultName(result));
+    errorMessage = tr(STR_FIRMWARE_WRITE_FAILED);
+    RenderLock lock(*this);
+    state = State::FAILED;
+    requestUpdate();
+    return;
+  }
+
+  LOG_INF("FW", "SD firmware update complete, restarting");
+  {
+    RenderLock lock(*this);
+    state = State::SUCCESS;
+  }
+  requestUpdateAndWait();
+  delay(1500);
+  ESP.restart();
+}
+
+void SdFirmwareUpdateActivity::loop() {
+  if (state == State::FAILED) {
+    if (mappedInput.wasPressed(MappedInputManager::Button::Back) ||
+        mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+      if (recoveryMode) {
+        // Go back to picker so user can try a different .bin
+        state = State::PICKING;
+        launchPicker();
+        return;
+      }
+      finish();
+    }
+  }
+}
+
+void SdFirmwareUpdateActivity::render(RenderLock&&) {
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  const auto pageWidth = renderer.getScreenWidth();
+  const auto pageHeight = renderer.getScreenHeight();
+
+  renderer.clearScreen();
+
+  const char* headerText = recoveryMode ? tr(STR_RECOVERY_MODE) : tr(STR_SD_FIRMWARE_UPDATE);
+  GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, headerText);
+
+  const auto lineHeight = renderer.getLineHeight(UI_10_FONT_ID);
+  const auto top = (pageHeight - lineHeight) / 2;
+
+  if (state == State::VALIDATING) {
+    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_VALIDATING_FIRMWARE));
+  } else if (state == State::UPDATING) {
+    // Throttle redraws to once per percent.
+    const unsigned int pct = firmwareSize > 0 ? static_cast<unsigned int>((writtenBytes * 100) / firmwareSize) : 0;
+    if (pct == lastRenderedPercent) {
+      return;
+    }
+    lastRenderedPercent = pct;
+
+    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_UPDATING), true, EpdFontFamily::BOLD);
+
+    int y = top + lineHeight + metrics.verticalSpacing;
+    GUI.drawProgressBar(
+        renderer,
+        Rect{metrics.contentSidePadding, y, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
+        static_cast<int>(pct), 100);
+    y += metrics.progressBarHeight + metrics.verticalSpacing;
+    // Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty
+    // so the do-not-power-off line below stays at the same Y as before.
+    y += lineHeight + metrics.verticalSpacing;
+    renderer.drawCenteredText(UI_10_FONT_ID, y, tr(STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF));
+  } else if (state == State::SUCCESS) {
+    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_UPDATE_COMPLETE), true, EpdFontFamily::BOLD);
+    renderer.drawCenteredText(UI_10_FONT_ID, top + lineHeight + metrics.verticalSpacing, tr(STR_RESTARTING_HINT));
+  } else if (state == State::FAILED) {
+    renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_UPDATE_FAILED), true, EpdFontFamily::BOLD);
+    if (!errorMessage.empty()) {
+      renderer.drawCenteredText(UI_10_FONT_ID, top + lineHeight + metrics.verticalSpacing, errorMessage.c_str());
+    }
+    const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+    GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+  } else {
+    // PICKING / CONFIRMING: a sub-activity is on top, nothing to draw.
+    if (recoveryMode) {
+      renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_RECOVERY_MODE_HINT));
+    }
+  }
+
+  renderer.displayBuffer();
+}
diff --git a/src/activities/settings/SdFirmwareUpdateActivity.h b/src/activities/settings/SdFirmwareUpdateActivity.h
new file mode 100644
index 00000000..c6cec2c2
--- /dev/null
+++ b/src/activities/settings/SdFirmwareUpdateActivity.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <string>
+
+#include "activities/Activity.h"
+
+/**
+ * SD-card based firmware update activity.
+ *
+ * Flow:
+ *  1) onEnter -> push FileBrowserActivity in PickFirmware mode (only .bin files visible).
+ *  2) On result: validate the .bin (header magic, size fits OTA partition).
+ *  3) Push ConfirmationActivity ("Update firmware?").
+ *  4) On confirm: stream the file into the OTA partition via the Arduino Update API,
+ *     drawing a progress bar; on success ESP.restart().
+ *
+ * Used both from Settings -> System -> "SD Card Firmware Update", and as the only
+ * activity launched in boot recovery mode (left side button + power on X3).
+ */
+class SdFirmwareUpdateActivity : public Activity {
+ public:
+  enum class State {
+    PICKING,
+    VALIDATING,
+    CONFIRMING,
+    UPDATING,
+    SUCCESS,
+    FAILED,
+  };
+
+  explicit SdFirmwareUpdateActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, bool recoveryMode = false)
+      : Activity("SdFirmwareUpdate", renderer, mappedInput), recoveryMode(recoveryMode) {}
+
+  void onEnter() override;
+  void loop() override;
+  void render(RenderLock&&) override;
+  bool preventAutoSleep() override { return state == State::UPDATING || state == State::VALIDATING; }
+  bool skipLoopDelay() override { return state == State::UPDATING; }
+
+ private:
+  State state = State::PICKING;
+  bool recoveryMode = false;
+
+  std::string firmwarePath;
+  size_t firmwareSize = 0;
+  size_t writtenBytes = 0;
+  unsigned int lastRenderedPercent = 101;
+  std::string errorMessage;
+
+  void launchPicker();
+  void onPickerResult(const ActivityResult& result);
+  bool validateFirmware();
+  void promptConfirmation();
+  void onConfirmationResult(const ActivityResult& result);
+  void performUpdate();
+};
diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp
index 2fd90736..b5adb784 100644
--- a/src/activities/settings/SettingsActivity.cpp
+++ b/src/activities/settings/SettingsActivity.cpp
@@ -4,35 +4,68 @@
 #include <Logging.h>
 
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
+#include <iterator>
 
 #include "AppVersion.h"
 #include "ButtonRemapActivity.h"
 #include "ClearCacheActivity.h"
 #include "CrossPointSettings.h"
+#include "FontDownloadActivity.h"
+#include "FontSelectionActivity.h"
 #include "KOReaderSettingsActivity.h"
 #include "LanguageSelectActivity.h"
 #include "MappedInputManager.h"
 #include "OpdsServerListActivity.h"
 #include "OtaUpdateActivity.h"
+#include "SdCardFontSystem.h"
+#include "SdFirmwareUpdateActivity.h"
 #include "SettingsList.h"
 #include "StatusBarSettingsActivity.h"
 #include "activities/network/WifiSelectionActivity.h"
+#include "activities/util/IntervalSelectionActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
 const StrId SettingsActivity::categoryNames[categoryCount] = {StrId::STR_CAT_DISPLAY, StrId::STR_CAT_READER,
                                                               StrId::STR_CAT_CONTROLS, StrId::STR_CAT_SYSTEM};
 
-void SettingsActivity::onEnter() {
-  Activity::onEnter();
+namespace {
+uint8_t enumDisplayIndexForRawValue(const SettingInfo& setting, uint8_t rawValue) {
+  if (setting.enumRawValues.empty()) {
+    return rawValue;
+  }
+
+  auto it = std::find(setting.enumRawValues.begin(), setting.enumRawValues.end(), rawValue);
+  if (it == setting.enumRawValues.end()) {
+    return 0;
+  }
+  return static_cast<uint8_t>(std::distance(setting.enumRawValues.begin(), it));
+}
+
+uint8_t enumRawValueForDisplayIndex(const SettingInfo& setting, uint8_t displayIndex) {
+  if (setting.enumRawValues.empty()) {
+    return displayIndex;
+  }
+  if (displayIndex >= setting.enumRawValues.size()) {
+    return setting.enumRawValues.front();
+  }
+  return setting.enumRawValues[displayIndex];
+}
+}  // namespace
 
-  // Build per-category vectors from the shared settings list
+void SettingsActivity::rebuildSettingsLists() {
   displaySettings.clear();
   readerSettings.clear();
   controlsSettings.clear();
   systemSettings.clear();
 
-  const auto& allSettings = getSettingsList();
+  // Pick up any fonts uploaded/deleted over the web server since the last
+  // reader activity ran — otherwise the font-family picker shows stale list.
+  sdFontSystem.refreshIfDirty();
+
+  const auto allSettings = getSettingsList(&sdFontSystem.registry());
   auto addControlSetting = [&](StrId nameId) {
     const auto it = std::find_if(allSettings.begin(), allSettings.end(),
                                  [nameId](const auto& setting) { return setting.nameId == nameId; });
@@ -42,6 +75,16 @@ void SettingsActivity::onEnter() {
     }
     LOG_ERR("SET", "Missing control setting definition for nameId=%d", static_cast<int>(nameId));
   };
+  auto addControlSettingByKey = [&](const char* key) {
+    const auto it = std::find_if(allSettings.begin(), allSettings.end(), [key](const auto& setting) {
+      return setting.key && std::strcmp(setting.key, key) == 0;
+    });
+    if (it != allSettings.end()) {
+      controlsSettings.push_back(*it);
+      return;
+    }
+    LOG_ERR("SET", "Missing control setting definition for key=%s", key);
+  };
 
   for (const auto& setting : allSettings) {
     if (setting.category == StrId::STR_NONE_OPT || setting.category == StrId::STR_CAT_CONTROLS) continue;
@@ -52,7 +95,6 @@ void SettingsActivity::onEnter() {
     } else if (setting.category == StrId::STR_CAT_SYSTEM) {
       systemSettings.push_back(setting);
     }
-    // Web-only categories (KOReader Sync, OPDS Browser) are skipped for device UI
   }
 
   // Append device-only ACTION items
@@ -61,7 +103,13 @@ void SettingsActivity::onEnter() {
   systemSettings.push_back(SettingInfo::Action(StrId::STR_OPDS_SERVERS, SettingAction::OPDSBrowser));
   systemSettings.push_back(SettingInfo::Action(StrId::STR_CLEAR_READING_CACHE, SettingAction::ClearCache));
   systemSettings.push_back(SettingInfo::Action(StrId::STR_CHECK_UPDATES, SettingAction::CheckForUpdates));
+  systemSettings.push_back(SettingInfo::Action(StrId::STR_SD_FIRMWARE_UPDATE, SettingAction::SdFirmwareUpdate));
   systemSettings.push_back(SettingInfo::Action(StrId::STR_LANGUAGE, SettingAction::Language));
+  const auto fontSizeSetting = std::find_if(readerSettings.begin(), readerSettings.end(),
+                                            [](const auto& setting) { return setting.nameId == StrId::STR_FONT_SIZE; });
+  const auto manageFontsSetting = SettingInfo::Action(StrId::STR_MANAGE_FONTS, SettingAction::DownloadFonts);
+  readerSettings.insert(fontSizeSetting == readerSettings.end() ? readerSettings.end() : fontSizeSetting + 1,
+                        manageFontsSetting);
   readerSettings.push_back(SettingInfo::Action(StrId::STR_CUSTOMISE_STATUS_BAR, SettingAction::CustomiseStatusBar));
 
   const bool hasTiltPageTurnSetting = std::any_of(allSettings.begin(), allSettings.end(), [](const auto& setting) {
@@ -69,7 +117,7 @@ void SettingsActivity::onEnter() {
   });
 
   // Build controls settings with section headers in desired display order
-  const size_t expectedControlsSettingsCount = hasTiltPageTurnSetting ? 13 : 11;
+  const size_t expectedControlsSettingsCount = hasTiltPageTurnSetting ? 15 : 13;
   controlsSettings.reserve(expectedControlsSettingsCount);
   controlsSettings.push_back(SettingInfo::SectionHeader(StrId::STR_POWER_BUTTON));
   addControlSetting(StrId::STR_SHORT_PWR_BTN);
@@ -78,10 +126,12 @@ void SettingsActivity::onEnter() {
   controlsSettings.push_back(SettingInfo::Action(StrId::STR_REMAP_FRONT_BUTTONS, SettingAction::RemapFrontButtons));
   controlsSettings.push_back(
       SettingInfo::Action(StrId::STR_REMAP_FRONT_BUTTONS_READER, SettingAction::RemapFrontButtonsReader));
+  addControlSettingByKey("frontButtonOrientationAware");
+  addControlSetting(StrId::STR_LONG_PRESS_BEHAVIOR);
   addControlSetting(StrId::STR_LONG_PRESS_MENU_ACTION);
   controlsSettings.push_back(SettingInfo::SectionHeader(StrId::STR_SIDE_BUTTONS));
   addControlSetting(StrId::STR_SIDE_BTN_LAYOUT);
-  addControlSetting(StrId::STR_LONG_PRESS_SKIP);
+  addControlSettingByKey("sideButtonOrientationAware");
   addControlSetting(StrId::STR_SIDE_BTN_LONG_PRESS);
   if (hasTiltPageTurnSetting) {
     controlsSettings.push_back(SettingInfo::SectionHeader(StrId::STR_OTHER));
@@ -93,13 +143,32 @@ void SettingsActivity::onEnter() {
             static_cast<uint32_t>(controlsSettings.size()), static_cast<uint32_t>(expectedControlsSettingsCount));
   }
 
+  // Update currentSettings pointer and count for the active category
+  switch (selectedCategoryIndex) {
+    case 0:
+      currentSettings = &displaySettings;
+      break;
+    case 1:
+      currentSettings = &readerSettings;
+      break;
+    case 2:
+      currentSettings = &controlsSettings;
+      break;
+    case 3:
+      currentSettings = &systemSettings;
+      break;
+  }
+  settingsCount = static_cast<int>(currentSettings->size());
+}
+
+void SettingsActivity::onEnter() {
+  Activity::onEnter();
+
   // Reset selection to first category
   selectedCategoryIndex = 0;
   selectedSettingIndex = 0;
 
-  // Initialize with first category (Display)
-  currentSettings = &displaySettings;
-  settingsCount = static_cast<int>(displaySettings.size());
+  rebuildSettingsLists();
 
   // Trigger first update
   requestUpdate();
@@ -207,13 +276,35 @@ void SettingsActivity::toggleCurrentSetting() {
 
   const auto& setting = (*currentSettings)[selectedSetting];
 
+  if (setting.nameId == StrId::STR_TIME_TO_SLEEP) {
+    openSleepTimeoutPicker();
+    return;
+  }
+
   if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
     // Toggle the boolean value using the member pointer
     const bool currentValue = SETTINGS.*(setting.valuePtr);
     SETTINGS.*(setting.valuePtr) = !currentValue;
   } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
     const uint8_t currentValue = SETTINGS.*(setting.valuePtr);
-    SETTINGS.*(setting.valuePtr) = (currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size());
+    const uint8_t currentIndex = enumDisplayIndexForRawValue(setting, currentValue);
+    const uint8_t nextIndex = (currentIndex + 1) % static_cast<uint8_t>(setting.enumValues.size());
+    SETTINGS.*(setting.valuePtr) = enumRawValueForDisplayIndex(setting, nextIndex);
+  } else if (setting.type == SettingType::ENUM && setting.valueGetter && setting.valueSetter) {
+    if (setting.nameId == StrId::STR_FONT_FAMILY) {
+      // Launch font selection submenu instead of cycling
+      startActivityForResult(std::make_unique<FontSelectionActivity>(renderer, mappedInput, &sdFontSystem.registry()),
+                             [this](const ActivityResult&) {
+                               SETTINGS.saveToFile();
+                               rebuildSettingsLists();
+                             });
+      return;
+    }
+    const uint8_t totalValues = setting.enumStringValues.empty()
+                                    ? static_cast<uint8_t>(setting.enumValues.size())
+                                    : static_cast<uint8_t>(setting.enumStringValues.size());
+    const uint8_t cur = setting.valueGetter();
+    setting.valueSetter((cur + 1) % totalValues);
   } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
     const int8_t currentValue = SETTINGS.*(setting.valuePtr);
     if (currentValue + setting.valueRange.step > setting.valueRange.max) {
@@ -249,6 +340,16 @@ void SettingsActivity::toggleCurrentSetting() {
       case SettingAction::CheckForUpdates:
         startActivityForResult(std::make_unique<OtaUpdateActivity>(renderer, mappedInput), resultHandler);
         break;
+      case SettingAction::SdFirmwareUpdate:
+        startActivityForResult(std::make_unique<SdFirmwareUpdateActivity>(renderer, mappedInput), resultHandler);
+        break;
+      case SettingAction::DownloadFonts:
+        startActivityForResult(std::make_unique<FontDownloadActivity>(renderer, mappedInput),
+                               [this](const ActivityResult&) {
+                                 SETTINGS.saveToFile();
+                                 rebuildSettingsLists();
+                               });
+        break;
       case SettingAction::Language:
         startActivityForResult(std::make_unique<LanguageSelectActivity>(renderer, mappedInput), resultHandler);
         break;
@@ -264,6 +365,21 @@ void SettingsActivity::toggleCurrentSetting() {
   SETTINGS.saveToFile();
 }
 
+void SettingsActivity::openSleepTimeoutPicker() {
+  startActivityForResult(
+      std::make_unique<IntervalSelectionActivity>(
+          renderer, mappedInput, "SleepTimeoutInterval", StrId::STR_TIME_TO_SLEEP, StrId::STR_SLEEP_TIMER_STEP_HINT,
+          SETTINGS.sleepTimeoutMinutes, CrossPointSettings::MIN_SLEEP_TIMEOUT_MINUTES,
+          CrossPointSettings::MAX_SLEEP_TIMEOUT_MINUTES, 1, 5, StrId::STR_SLEEP_TIMER_VALUE_FORMAT),
+      [this](const ActivityResult& result) {
+        if (!result.isCancelled) {
+          SETTINGS.sleepTimeoutMinutes = static_cast<uint8_t>(std::get<IntervalResult>(result.data).value);
+          SETTINGS.saveToFile();
+        }
+        requestUpdate();
+      });
+}
+
 void SettingsActivity::render(RenderLock&&) {
   renderer.clearScreen();
 
@@ -298,28 +414,49 @@ void SettingsActivity::render(RenderLock&&) {
           valueText = value ? tr(STR_STATE_ON) : tr(STR_STATE_OFF);
         } else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
           const uint8_t value = SETTINGS.*(setting.valuePtr);
-          const uint8_t safeValue = value < setting.enumValues.size() ? value : 0;
+          const uint8_t displayValue = enumDisplayIndexForRawValue(setting, value);
+          const uint8_t safeValue = displayValue < setting.enumValues.size() ? displayValue : 0;
           valueText = I18N.get(setting.enumValues[safeValue]);
+        } else if (setting.type == SettingType::ENUM && setting.valueGetter) {
+          const uint8_t value = setting.valueGetter();
+          if (!setting.enumStringValues.empty() && value < setting.enumStringValues.size()) {
+            valueText = setting.enumStringValues[value];
+          } else if (value < setting.enumValues.size()) {
+            valueText = I18N.get(setting.enumValues[value]);
+          }
         } else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
-          valueText = std::to_string(SETTINGS.*(setting.valuePtr));
+          if (setting.nameId == StrId::STR_TIME_TO_SLEEP) {
+            char valueBuffer[32];
+            snprintf(valueBuffer, sizeof(valueBuffer), tr(STR_SLEEP_TIMER_VALUE_FORMAT),
+                     static_cast<unsigned int>(SETTINGS.*(setting.valuePtr)));
+            valueText = valueBuffer;
+          } else {
+            valueText = std::to_string(SETTINGS.*(setting.valuePtr));
+          }
         }
         return valueText;
       },
-      true, [&settings](int i) { return settings[i].type == SettingType::SECTION_HEADER; });
+      true, nullptr, [&settings](int i) { return settings[i].type == SettingType::SECTION_HEADER; });
 
-  // Draw CrossInk version label at the bottom of the System tab
+  // Draw FlexBLE + upstream CrossInk version labels at the bottom of the
+  // System tab. FlexBLE's own semver is the primary identity; CrossInk's
+  // version reads as the upstream sync point in smaller secondary text.
   if (selectedCategoryIndex == 3) {
-    const int labelWidth = renderer.getTextWidth(SMALL_FONT_ID, "CrossInk " CROSSINK_VERSION);
+    static constexpr const char* versionLabel = "FlexBLE " FLEXBLE_VERSION " (CrossInk " CROSSINK_VERSION ")";
+    const int labelWidth = renderer.getTextWidth(SMALL_FONT_ID, versionLabel);
     const int labelX = (pageWidth - labelWidth) / 2;
     const int labelY =
         pageHeight - metrics.buttonHintsHeight - metrics.verticalSpacing - 15;  // 15px above the button hints
-    renderer.drawText(SMALL_FONT_ID, labelX, labelY, "CrossInk " CROSSINK_VERSION);
+    renderer.drawText(SMALL_FONT_ID, labelX, labelY, versionLabel);
   }
 
   // Draw help text
-  const auto confirmLabel = (selectedSettingIndex == 0)
-                                ? I18N.get(categoryNames[(selectedCategoryIndex + 1) % categoryCount])
-                                : tr(STR_TOGGLE);
+  const auto confirmLabel =
+      (selectedSettingIndex == 0)
+          ? I18N.get(categoryNames[(selectedCategoryIndex + 1) % categoryCount])
+          : (selectedSettingIndex > 0 && (*currentSettings)[selectedSettingIndex - 1].nameId == StrId::STR_TIME_TO_SLEEP
+                 ? tr(STR_SELECT)
+                 : tr(STR_TOGGLE));
   const auto labels = mappedInput.mapLabels(tr(STR_BACK), confirmLabel, tr(STR_DIR_UP), tr(STR_DIR_DOWN));
   GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
 
diff --git a/src/activities/settings/SettingsActivity.h b/src/activities/settings/SettingsActivity.h
index f42cffd6..4b8d5ee8 100644
--- a/src/activities/settings/SettingsActivity.h
+++ b/src/activities/settings/SettingsActivity.h
@@ -21,7 +21,9 @@ enum class SettingAction {
   Network,
   ClearCache,
   CheckForUpdates,
+  SdFirmwareUpdate,
   Language,
+  DownloadFonts,
 };
 
 struct SettingInfo {
@@ -29,6 +31,8 @@ struct SettingInfo {
   SettingType type;
   uint8_t CrossPointSettings::* valuePtr = nullptr;
   std::vector<StrId> enumValues;
+  std::vector<uint8_t> enumRawValues;
+  std::vector<std::string> enumStringValues;  // runtime alternative to StrId enumValues (for SD card fonts etc.)
   SettingAction action = SettingAction::None;
 
   struct ValueRange {
@@ -80,6 +84,11 @@ struct SettingInfo {
     return s;
   }
 
+  SettingInfo& withEnumRawValues(std::vector<uint8_t> values) {
+    enumRawValues = std::move(values);
+    return *this;
+  }
+
   static SettingInfo Action(StrId nameId, SettingAction action) {
     SettingInfo s;
     s.nameId = nameId;
@@ -166,6 +175,8 @@ class SettingsActivity final : public Activity {
 
   void enterCategory(int categoryIndex);
   void toggleCurrentSetting();
+  void openSleepTimeoutPicker();
+  void rebuildSettingsLists();
 
  public:
   explicit SettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
diff --git a/src/activities/settings/StatusBarSettingsActivity.cpp b/src/activities/settings/StatusBarSettingsActivity.cpp
index 541eddf6..5572bcc2 100644
--- a/src/activities/settings/StatusBarSettingsActivity.cpp
+++ b/src/activities/settings/StatusBarSettingsActivity.cpp
@@ -11,13 +11,14 @@
 #include "fontIds.h"
 
 namespace {
-constexpr int MENU_ITEMS = 6;
+constexpr int MENU_ITEMS = 7;
 const StrId menuNames[MENU_ITEMS] = {StrId::STR_CHAPTER_PAGE_COUNT,
                                      StrId::STR_BOOK_PROGRESS_PERCENTAGE,
                                      StrId::STR_PROGRESS_BAR,
                                      StrId::STR_PROGRESS_BAR_THICKNESS,
                                      StrId::STR_TITLE,
-                                     StrId::STR_BATTERY};
+                                     StrId::STR_BATTERY,
+                                     StrId::STR_XTC_STATUS_BAR};
 constexpr int PROGRESS_BAR_ITEMS = 3;
 const StrId progressBarNames[PROGRESS_BAR_ITEMS] = {StrId::STR_BOOK, StrId::STR_CHAPTER, StrId::STR_HIDE};
 
@@ -28,6 +29,9 @@ const StrId progressBarThicknessNames[PROGRESS_BAR_THICKNESS_ITEMS] = {
 constexpr int TITLE_ITEMS = 3;
 const StrId titleNames[TITLE_ITEMS] = {StrId::STR_BOOK, StrId::STR_CHAPTER, StrId::STR_HIDE};
 
+constexpr int XTC_STATUS_BAR_ITEMS = 3;
+const StrId xtcStatusBarNames[XTC_STATUS_BAR_ITEMS] = {StrId::STR_HIDE, StrId::STR_BOTTOM, StrId::STR_TOP};
+
 const int widthMargin = 10;
 const int verticalPreviewPadding = 50;
 const int verticalPreviewTextPadding = 40;
@@ -51,6 +55,10 @@ void StatusBarSettingsActivity::onEnter() {
     SETTINGS.statusBarTitle = CrossPointSettings::STATUS_BAR_TITLE::HIDE_TITLE;
   }
 
+  if (SETTINGS.xtcStatusBarMode >= XTC_STATUS_BAR_ITEMS) {
+    SETTINGS.xtcStatusBarMode = CrossPointSettings::XTC_STATUS_BAR_MODE::XTC_STATUS_BAR_HIDE;
+  }
+
   requestUpdate();
 }
 
@@ -110,6 +118,9 @@ void StatusBarSettingsActivity::handleSelection() {
   } else if (selectedIndex == 5) {
     // Show Battery
     SETTINGS.statusBarBattery = (SETTINGS.statusBarBattery + 1) % 2;
+  } else if (selectedIndex == 6) {
+    // XTC Status Bar
+    SETTINGS.xtcStatusBarMode = (SETTINGS.xtcStatusBarMode + 1) % XTC_STATUS_BAR_ITEMS;
   }
   SETTINGS.saveToFile();
 }
@@ -143,6 +154,8 @@ void StatusBarSettingsActivity::render(RenderLock&&) {
           return I18N.get(titleNames[SETTINGS.statusBarTitle]);
         } else if (index == 5) {
           return SETTINGS.statusBarBattery ? tr(STR_SHOW) : tr(STR_HIDE);
+        } else if (index == 6) {
+          return I18N.get(xtcStatusBarNames[SETTINGS.xtcStatusBarMode]);
         } else {
           return tr(STR_HIDE);
         }
diff --git a/src/activities/util/BmpViewerActivity.cpp b/src/activities/util/BmpViewerActivity.cpp
index 37fa8fe1..0387bc55 100644
--- a/src/activities/util/BmpViewerActivity.cpp
+++ b/src/activities/util/BmpViewerActivity.cpp
@@ -1,19 +1,67 @@
 #include "BmpViewerActivity.h"
 
 #include <Bitmap.h>
+#include <FsHelpers.h>
 #include <GfxRenderer.h>
 #include <HalStorage.h>
 #include <I18n.h>
 
+#include <algorithm>
+
+#include "CrossPointSettings.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
 
 BmpViewerActivity::BmpViewerActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::string path)
     : Activity("BmpViewer", renderer, mappedInput), filePath(std::move(path)) {}
 
+void BmpViewerActivity::loadSiblingImages() {
+  siblingImages.clear();
+  currentImageIndex = -1;
+
+  if (filePath.empty()) return;
+
+  std::string dirPath = FsHelpers::extractFolderPath(filePath);
+  size_t lastSlash = filePath.find_last_of('/');
+  std::string fileName = (lastSlash != std::string::npos) ? filePath.substr(lastSlash + 1) : filePath;
+
+  auto dir = Storage.open(dirPath.c_str());
+  if (!dir || !dir.isDirectory()) {
+    if (dir) dir.close();
+    return;
+  }
+
+  char name[500];
+  for (auto file = dir.openNextFile(); file; file = dir.openNextFile()) {
+    if (!file.isDirectory()) {
+      file.getName(name, sizeof(name));
+      if (name[0] != '.') {
+        std::string fname(name);
+        if (fname.length() >= 4 && fname.substr(fname.length() - 4) == ".bmp") {
+          siblingImages.push_back(fname);
+        }
+      }
+    }
+    file.close();
+  }
+  dir.close();
+
+  FsHelpers::sortFileList(siblingImages);
+
+  for (size_t i = 0; i < siblingImages.size(); ++i) {
+    if (siblingImages[i] == fileName) {
+      currentImageIndex = static_cast<int>(i);
+      break;
+    }
+  }
+}
+
 void BmpViewerActivity::onEnter() {
   Activity::onEnter();
-  // Removed the redundant initial renderer.clearScreen()
+
+  if (siblingImages.empty() && !filePath.empty()) {
+    loadSiblingImages();
+  }
 
   FsFile file;
 
@@ -49,7 +97,13 @@ void BmpViewerActivity::onEnter() {
       }
 
       // 4. Prepare Rendering
-      const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
+      bool hasPrevious = (siblingImages.size() > 1 && currentImageIndex > 0);
+      bool hasNext = (siblingImages.size() > 1 && currentImageIndex != -1 &&
+                      currentImageIndex < static_cast<int>(siblingImages.size()) - 1);
+
+      const auto labels =
+          mappedInput.mapLabels(tr(STR_BACK), tr(STR_SET_SLEEP_COVER), (hasPrevious ? "<" : ""), (hasNext ? ">" : ""));
+
       GUI.fillPopupProgress(renderer, popupRect, 50);
 
       renderer.clearScreen();
@@ -61,7 +115,7 @@ void BmpViewerActivity::onEnter() {
       GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
       // Single pass for non-grayscale images
 
-      renderer.displayBuffer(HalDisplay::HALF_REFRESH);
+      renderer.displayBuffer(HalDisplay::FAST_REFRESH);
 
     } else {
       // Handle file parsing error
@@ -89,6 +143,39 @@ void BmpViewerActivity::onExit() {
   renderer.displayBuffer(HalDisplay::HALF_REFRESH);
 }
 
+void BmpViewerActivity::doSetSleepCover() {
+  GUI.drawPopup(renderer, tr(STR_LOADING_POPUP));
+
+  bool success = false;
+  FsFile inFile, outFile;
+  if (Storage.openFileForRead("BMP", filePath, inFile)) {
+    if (Storage.openFileForWrite("BMP", "/sleep.bmp", outFile)) {
+      char buffer[2048];
+      int bytesRead;
+      success = true;
+      while ((bytesRead = inFile.read(buffer, sizeof(buffer))) > 0) {
+        if (outFile.write(buffer, bytesRead) != bytesRead) {
+          success = false;
+          break;
+        }
+      }
+      outFile.close();
+    }
+    inFile.close();
+  }
+
+  if (success) {
+    SETTINGS.sleepScreen = CrossPointSettings::SLEEP_SCREEN_MODE::CUSTOM;
+    SETTINGS.saveToFile();
+    GUI.drawPopup(renderer, tr(STR_DONE));
+  } else {
+    GUI.drawPopup(renderer, tr(STR_FAILED_LOWER));
+  }
+
+  delay(1000);
+  onEnter();
+}
+
 void BmpViewerActivity::loop() {
   // Keep CPU awake/polling so 1st click works
   Activity::loop();
@@ -97,4 +184,34 @@ void BmpViewerActivity::loop() {
     activityManager.goToFileBrowser(filePath);
     return;
   }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    doSetSleepCover();
+    return;
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Left) ||
+      mappedInput.wasReleased(MappedInputManager::Button::Up)) {
+    if (siblingImages.size() > 1 && currentImageIndex > 0) {
+      currentImageIndex--;
+      std::string dirPath = FsHelpers::extractFolderPath(filePath);
+      if (dirPath.back() != '/') dirPath += "/";
+      filePath = dirPath + siblingImages[currentImageIndex];
+      onEnter();
+    }
+    return;
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Right) ||
+      mappedInput.wasReleased(MappedInputManager::Button::Down)) {
+    if (siblingImages.size() > 1 && currentImageIndex != -1 &&
+        currentImageIndex < static_cast<int>(siblingImages.size()) - 1) {
+      currentImageIndex++;
+      std::string dirPath = FsHelpers::extractFolderPath(filePath);
+      if (dirPath.back() != '/') dirPath += "/";
+      filePath = dirPath + siblingImages[currentImageIndex];
+      onEnter();
+    }
+    return;
+  }
 }
\ No newline at end of file
diff --git a/src/activities/util/BmpViewerActivity.h b/src/activities/util/BmpViewerActivity.h
index feac448e..24c084db 100644
--- a/src/activities/util/BmpViewerActivity.h
+++ b/src/activities/util/BmpViewerActivity.h
@@ -3,8 +3,8 @@
 #include <functional>
 #include <string>
 
-#include "../Activity.h"
 #include "MappedInputManager.h"
+#include "activities/Activity.h"
 
 class BmpViewerActivity final : public Activity {
  public:
@@ -15,5 +15,10 @@ class BmpViewerActivity final : public Activity {
   void loop() override;
 
  private:
+  void loadSiblingImages();
+  void doSetSleepCover();
+
   std::string filePath;
+  std::vector<std::string> siblingImages;
+  int currentImageIndex = -1;
 };
\ No newline at end of file
diff --git a/src/activities/util/ConfirmationActivity.cpp b/src/activities/util/ConfirmationActivity.cpp
index 774ad989..dfcd2649 100644
--- a/src/activities/util/ConfirmationActivity.cpp
+++ b/src/activities/util/ConfirmationActivity.cpp
@@ -4,12 +4,16 @@
 
 #include <algorithm>
 
-#include "../../components/UITheme.h"
 #include "HalDisplay.h"
+#include "components/UITheme.h"
 
 ConfirmationActivity::ConfirmationActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
-                                           const std::string& heading, const std::string& body)
-    : Activity("Confirmation", renderer, mappedInput), heading(heading), body(body) {}
+                                           const std::string& heading, const std::string& body,
+                                           bool ignoreInitialConfirmRelease)
+    : Activity("Confirmation", renderer, mappedInput),
+      heading(heading),
+      body(body),
+      ignoreConfirmRelease(ignoreInitialConfirmRelease) {}
 
 void ConfirmationActivity::onEnter() {
   Activity::onEnter();
@@ -70,6 +74,16 @@ void ConfirmationActivity::render(RenderLock&& lock) {
 }
 
 void ConfirmationActivity::loop() {
+  if (ignoreConfirmRelease) {
+    if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+      ignoreConfirmRelease = false;
+      return;
+    }
+    if (!mappedInput.isPressed(MappedInputManager::Button::Confirm)) {
+      ignoreConfirmRelease = false;
+    }
+  }
+
   if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
     ActivityResult res;
     res.isCancelled = false;
diff --git a/src/activities/util/ConfirmationActivity.h b/src/activities/util/ConfirmationActivity.h
index 72aa4c8f..99e1c423 100644
--- a/src/activities/util/ConfirmationActivity.h
+++ b/src/activities/util/ConfirmationActivity.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 
-#include "../../fontIds.h"
-#include "../Activity.h"
+#include "activities/Activity.h"
+#include "fontIds.h"
 
 class ConfirmationActivity : public Activity {
  private:
@@ -20,10 +20,11 @@ class ConfirmationActivity : public Activity {
   std::vector<std::string> bodyLines;
   int startY = 0;
   int lineHeight = 0;
+  bool ignoreConfirmRelease = false;
 
  public:
   ConfirmationActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::string& heading,
-                       const std::string& body);
+                       const std::string& body, bool ignoreInitialConfirmRelease = false);
 
   void onEnter() override;
   void loop() override;
diff --git a/src/activities/util/FullScreenMessageActivity.h b/src/activities/util/FullScreenMessageActivity.h
index 93909503..c8660208 100644
--- a/src/activities/util/FullScreenMessageActivity.h
+++ b/src/activities/util/FullScreenMessageActivity.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <utility>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 
 class FullScreenMessageActivity final : public Activity {
   std::string text;
diff --git a/src/activities/util/IntervalSelectionActivity.cpp b/src/activities/util/IntervalSelectionActivity.cpp
new file mode 100644
index 00000000..9a1bf81b
--- /dev/null
+++ b/src/activities/util/IntervalSelectionActivity.cpp
@@ -0,0 +1,95 @@
+#include "IntervalSelectionActivity.h"
+
+#include <GfxRenderer.h>
+#include <I18n.h>
+
+#include <algorithm>
+#include <cstdio>
+#include <utility>
+
+#include "components/UITheme.h"
+#include "fontIds.h"
+
+int IntervalSelectionActivity::clampedValue(const int candidate) const {
+  return std::clamp(candidate, minValue, maxValue);
+}
+
+void IntervalSelectionActivity::onEnter() {
+  Activity::onEnter();
+  value = clampedValue(value);
+  requestUpdate();
+}
+
+void IntervalSelectionActivity::adjustValue(const int delta) {
+  value = clampedValue(value + delta);
+  requestUpdate();
+}
+
+void IntervalSelectionActivity::loop() {
+  if (ignoreConfirmRelease) {
+    if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+      ignoreConfirmRelease = false;
+      return;
+    }
+    if (!mappedInput.isPressed(MappedInputManager::Button::Confirm)) {
+      ignoreConfirmRelease = false;
+    }
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
+    ActivityResult result;
+    result.isCancelled = true;
+    setResult(std::move(result));
+    finish();
+    return;
+  }
+
+  if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
+    setResult(IntervalResult{static_cast<uint32_t>(value)});
+    finish();
+    return;
+  }
+
+  buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Left}, [this] { adjustValue(-smallStep); });
+  buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Right}, [this] { adjustValue(smallStep); });
+  buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Up}, [this] { adjustValue(largeStep); });
+  buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Down}, [this] { adjustValue(-largeStep); });
+}
+
+void IntervalSelectionActivity::render(RenderLock&&) {
+  renderer.clearScreen();
+
+  renderer.drawCenteredText(UI_12_FONT_ID, 15, I18N.get(titleId), true, EpdFontFamily::BOLD);
+
+  char formattedValue[32];
+  if (valueFormatId != StrId::STR_NONE_OPT) {
+    snprintf(formattedValue, sizeof(formattedValue), I18N.get(valueFormatId), static_cast<unsigned int>(value));
+  } else {
+    snprintf(formattedValue, sizeof(formattedValue), "%d", value);
+  }
+  renderer.drawCenteredText(UI_12_FONT_ID, 90, formattedValue, true, EpdFontFamily::BOLD);
+
+  const int screenWidth = renderer.getScreenWidth();
+  const int barWidth = std::min(360, std::max(0, screenWidth - 40));
+  constexpr int barHeight = 16;
+  const int barX = std::max(0, (screenWidth - barWidth) / 2);
+  const int barY = 140;
+
+  renderer.drawRect(barX, barY, barWidth, barHeight);
+
+  const int range = std::max(1, maxValue - minValue);
+  const int fillWidth = (barWidth - 4) * (value - minValue) / range;
+  if (fillWidth > 0) {
+    renderer.fillRect(barX + 2, barY + 2, fillWidth, barHeight - 4);
+  }
+
+  const int knobX = std::max(barX + 2, barX + 2 + fillWidth - 2);
+  renderer.fillRect(knobX, barY - 4, 4, barHeight + 8, true);
+
+  renderer.drawCenteredText(SMALL_FONT_ID, barY + 30, I18N.get(stepHintId), true);
+
+  const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "-", "+");
+  GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4, true);
+
+  renderer.displayBuffer();
+}
diff --git a/src/activities/util/IntervalSelectionActivity.h b/src/activities/util/IntervalSelectionActivity.h
new file mode 100644
index 00000000..1e7bbeec
--- /dev/null
+++ b/src/activities/util/IntervalSelectionActivity.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <I18n.h>
+
+#include "MappedInputManager.h"
+#include "activities/Activity.h"
+#include "util/ButtonNavigator.h"
+
+class GfxRenderer;
+
+class IntervalSelectionActivity final : public Activity {
+ public:
+  explicit IntervalSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const char* activityName,
+                                     StrId titleId, StrId stepHintId, int initialValue, int minValue, int maxValue,
+                                     int smallStep, int largeStep, StrId valueFormatId = StrId::STR_NONE_OPT,
+                                     bool readerActivity = false, bool allowPowerAsConfirm = false,
+                                     bool ignoreInitialConfirmRelease = false)
+      : Activity(activityName, renderer, mappedInput),
+        titleId(titleId),
+        stepHintId(stepHintId),
+        valueFormatId(valueFormatId),
+        value(initialValue),
+        minValue(minValue),
+        maxValue(maxValue),
+        smallStep(smallStep),
+        largeStep(largeStep),
+        readerActivity(readerActivity),
+        allowPowerAsConfirm(allowPowerAsConfirm),
+        ignoreConfirmRelease(ignoreInitialConfirmRelease) {}
+
+  void onEnter() override;
+  void loop() override;
+  void render(RenderLock&&) override;
+  bool isReaderActivity() const override { return readerActivity; }
+  bool allowPowerAsConfirmInReaderMode() const override { return allowPowerAsConfirm; }
+
+ private:
+  StrId titleId;
+  StrId stepHintId;
+  StrId valueFormatId;
+  int value;
+  int minValue;
+  int maxValue;
+  int smallStep;
+  int largeStep;
+  bool readerActivity;
+  bool allowPowerAsConfirm;
+  bool ignoreConfirmRelease;
+  ButtonNavigator buttonNavigator;
+
+  void adjustValue(int delta);
+  int clampedValue(int candidate) const;
+};
diff --git a/src/activities/util/KeyboardEntryActivity.h b/src/activities/util/KeyboardEntryActivity.h
index 0a86febf..128808ac 100644
--- a/src/activities/util/KeyboardEntryActivity.h
+++ b/src/activities/util/KeyboardEntryActivity.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <utility>
 
-#include "../Activity.h"
+#include "activities/Activity.h"
 #include "util/ButtonNavigator.h"
 
 struct KeyDef {
diff --git a/src/components/UITheme.cpp b/src/components/UITheme.cpp
index 4c9b9cbb..a0fd1ad0 100644
--- a/src/components/UITheme.cpp
+++ b/src/components/UITheme.cpp
@@ -2,20 +2,38 @@
 
 #include <FsHelpers.h>
 #include <GfxRenderer.h>
+#include <HalStorage.h>
 #include <Logging.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 #include "MappedInputManager.h"
 #include "RecentBooksStore.h"
 #include "components/themes/BaseTheme.h"
 #include "components/themes/lyra/Lyra3CoversTheme.h"
+#include "components/themes/lyra/LyraCarouselTheme.h"
 #include "components/themes/lyra/LyraFlowTheme.h"
 #include "components/themes/lyra/LyraTheme.h"
+#include "components/themes/minimal/MinimalTheme.h"
 #include "components/themes/roundedraff/RoundedRaffTheme.h"
 
 namespace {
-constexpr int SKIP_PAGE_MS = 700;
+constexpr char kWidthPlaceholder[] = "[WIDTH]";
+constexpr char kHeightPlaceholder[] = "[HEIGHT]";
+constexpr size_t kWidthPlaceholderLength = sizeof(kWidthPlaceholder) - 1;
+constexpr size_t kHeightPlaceholderLength = sizeof(kHeightPlaceholder) - 1;
+
+std::string addBmpSuffix(const std::string& path, const char* suffix) {
+  const size_t extPos = path.rfind(".bmp");
+  if (extPos == std::string::npos) {
+    return path + suffix;
+  }
+  std::string suffixedPath = path;
+  suffixedPath.insert(extPos, suffix);
+  return suffixedPath;
+}
 }  // namespace
 
 UITheme UITheme::instance;
@@ -57,6 +75,28 @@ void UITheme::setTheme(CrossPointSettings::UI_THEME type) {
       currentTheme = std::make_unique<LyraFlowTheme>();
       currentMetrics = &LyraFlowMetrics::values;
       break;
+    case CrossPointSettings::UI_THEME::LYRA_CAROUSEL:
+#if defined(CROSSINK_ENABLE_LYRA_CAROUSEL) && CROSSINK_ENABLE_LYRA_CAROUSEL
+      LOG_DBG("UI", "Using Lyra Carousel theme");
+      currentTheme = std::make_unique<LyraCarouselTheme>();
+      currentMetrics = &LyraCarouselMetrics::values;
+#else
+      LOG_DBG("UI", "Lyra Carousel theme is disabled; using Lyra theme");
+      SETTINGS.uiTheme = static_cast<uint8_t>(CrossPointSettings::UI_THEME::LYRA);
+      currentTheme = std::make_unique<LyraTheme>();
+      currentMetrics = &LyraMetrics::values;
+#endif
+      break;
+    case CrossPointSettings::UI_THEME::MINIMAL:
+      LOG_DBG("UI", "Using Minimal theme");
+      currentTheme = std::make_unique<MinimalTheme>();
+      currentMetrics = &MinimalMetrics::values;
+      break;
+    default:
+      LOG_ERR("UI", "Unknown theme %d, falling back to Classic", static_cast<int>(type));
+      currentTheme = std::make_unique<BaseTheme>();
+      currentMetrics = &BaseMetrics::values;
+      break;
   }
 }
 
@@ -78,12 +118,56 @@ int UITheme::getNumberOfItemsPerPage(const GfxRenderer& renderer, bool hasHeader
   return availableHeight / rowHeight;
 }
 
-std::string UITheme::getCoverThumbPath(std::string coverBmpPath, int coverHeight) {
-  size_t pos = coverBmpPath.find("[HEIGHT]", 0);
+std::string UITheme::getCoverThumbPath(const std::string& coverBmpPath, int coverHeight) {
+  if (coverHeight <= 0) {
+    return "";
+  }
+  // Use int64_t so large heights cannot overflow before division.
+  const int coverWidth = static_cast<int>((static_cast<int64_t>(coverHeight) * 3 + 2) / 5);
+  return getCoverThumbPath(coverBmpPath, coverWidth, coverHeight);
+}
+
+std::string UITheme::getCoverThumbPath(const std::string& coverBmpPath, int width, int height) {
+  if (width <= 0 || height <= 0) {
+    return "";
+  }
+  const size_t initialWidthPos = coverBmpPath.find(kWidthPlaceholder, 0);
+  const size_t initialHeightPos = coverBmpPath.find(kHeightPlaceholder, 0);
+  const bool hasWidthPlaceholder = initialWidthPos != std::string::npos;
+  const bool hasHeightPlaceholder = initialHeightPos != std::string::npos;
+
+  if (!hasWidthPlaceholder && !hasHeightPlaceholder) {
+    return coverBmpPath;
+  }
+  if ((hasWidthPlaceholder &&
+       coverBmpPath.find(kWidthPlaceholder, initialWidthPos + kWidthPlaceholderLength) != std::string::npos) ||
+      (hasHeightPlaceholder &&
+       coverBmpPath.find(kHeightPlaceholder, initialHeightPos + kHeightPlaceholderLength) != std::string::npos)) {
+    return "";
+  }
+  if (!hasHeightPlaceholder) {
+    return "";
+  }
+
+  std::string thumbPath = coverBmpPath;
+  size_t widthPos = thumbPath.find(kWidthPlaceholder, 0);
+  if (widthPos != std::string::npos) {
+    thumbPath.replace(widthPos, kWidthPlaceholderLength, std::to_string(width));
+  }
+  size_t pos = thumbPath.find(kHeightPlaceholder, 0);
   if (pos != std::string::npos) {
-    coverBmpPath.replace(pos, 8, std::to_string(coverHeight));
+    if (hasWidthPlaceholder) {
+      thumbPath.replace(pos, kHeightPlaceholderLength, std::to_string(height));
+    } else {
+      std::string legacyPath = thumbPath;
+      legacyPath.replace(pos, kHeightPlaceholderLength, std::to_string(height));
+      thumbPath.replace(pos, kHeightPlaceholderLength, std::to_string(width) + "x" + std::to_string(height));
+      if (!Storage.exists(thumbPath.c_str()) && Storage.exists(legacyPath.c_str())) {
+        return legacyPath;
+      }
+    }
   }
-  return coverBmpPath;
+  return thumbPath;
 }
 
 UIIcon UITheme::getFileIcon(const std::string& filename) {
diff --git a/src/components/UITheme.h b/src/components/UITheme.h
index c4c37235..2e689949 100644
--- a/src/components/UITheme.h
+++ b/src/components/UITheme.h
@@ -20,7 +20,18 @@ class UITheme {
   void setTheme(CrossPointSettings::UI_THEME type);
   static int getNumberOfItemsPerPage(const GfxRenderer& renderer, bool hasHeader, bool hasTabBar, bool hasButtonHints,
                                      bool hasSubtitle, int extraReservedHeight = 0);
-  static std::string getCoverThumbPath(std::string coverBmpPath, int coverHeight);
+  // Returns the cache path for a generated thumbnail using the default 3:5
+  // (width:height) aspect derived from coverHeight. Returns an empty string
+  // when coverHeight is invalid.
+  static std::string getCoverThumbPath(const std::string& coverBmpPath, int coverHeight);
+  // Returns the cache path for a generated thumbnail at the requested cache-key
+  // dimensions. coverBmpPath may be:
+  // - a concrete path with no placeholders, returned unchanged;
+  // - a dimensions template containing one [WIDTH] and one [HEIGHT] placeholder;
+  // - a legacy height-only template containing one [HEIGHT] placeholder.
+  // No scaling is done here. Returns an empty string for invalid dimensions or
+  // unsupported placeholder templates.
+  static std::string getCoverThumbPath(const std::string& coverBmpPath, int width, int height);
   static UIIcon getFileIcon(const std::string& filename);
   static int getStatusBarHeight();
   static int getProgressBarHeight();
diff --git a/src/components/icons/cog.h b/src/components/icons/cog.h
deleted file mode 100644
index 899d81a9..00000000
--- a/src/components/icons/cog.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <cstdint>
-
-// size: 32x32
-static const uint8_t CogIcon[] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xBE, 0x7D, 0xFF, 0xFF, 0x1C, 0x38,
-    0xFF, 0xFF, 0x80, 0x01, 0xFF, 0xFF, 0x82, 0x41, 0xFF, 0xFF, 0x0E, 0x70, 0xFF, 0xF6, 0x3E, 0x7C, 0x6F, 0xE0, 0x7E,
-    0x7E, 0x07, 0xF0, 0xFE, 0x7F, 0x0F, 0xF8, 0xFE, 0x7F, 0x1F, 0xF9, 0xFE, 0x7F, 0x9F, 0xF9, 0xF8, 0x1F, 0x9F, 0xF3,
-    0xF8, 0x1F, 0xCF, 0xC3, 0xF3, 0xCF, 0xC3, 0xC3, 0xF1, 0x8F, 0xC3, 0xF3, 0xE1, 0x87, 0xCF, 0xF9, 0xC0, 0x03, 0x9F,
-    0xF9, 0x0E, 0x70, 0x9F, 0xF8, 0x3F, 0xFC, 0x1F, 0xF0, 0x7F, 0xFE, 0x0F, 0xE0, 0x7F, 0xFE, 0x07, 0xF6, 0x3F, 0xFC,
-    0x6F, 0xFF, 0x0F, 0xF0, 0xFF, 0xFF, 0x83, 0xC1, 0xFF, 0xFF, 0x80, 0x01, 0xFF, 0xFF, 0x1C, 0x38, 0xFF, 0xFF, 0xBE,
-    0x7D, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
diff --git a/src/components/icons/settings.h b/src/components/icons/settings.h
deleted file mode 100644
index 3c924be2..00000000
--- a/src/components/icons/settings.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include <cstdint>
-
-// size: 32x32
-static const uint8_t SettingsIcon[] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x87, 0xE1, 0xFF, 0xFF, 0x03, 0xC0,
-    0xFF, 0xFE, 0x30, 0x8C, 0x7F, 0xFE, 0x78, 0x1E, 0x7F, 0xFE, 0x7C, 0x7E, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F,
-    0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFC, 0x7C, 0x3E, 0x3F, 0xF0, 0xF0, 0x0F, 0x07, 0xC1, 0xF3, 0xCF, 0x83, 0xC7,
-    0xE7, 0xE7, 0xE3, 0xCF, 0xE7, 0xE7, 0xF3, 0xCF, 0xE7, 0xE7, 0xF3, 0xC7, 0xE7, 0xE7, 0xE3, 0xC1, 0xF3, 0xCF, 0x83,
-    0xE0, 0xF0, 0x0F, 0x0F, 0xFC, 0x7C, 0x3E, 0x3F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE,
-    0x7F, 0xFE, 0x7E, 0x3E, 0x7F, 0xFE, 0x78, 0x1E, 0x7F, 0xFE, 0x31, 0x0C, 0x7F, 0xFF, 0x03, 0xC0, 0xFF, 0xFF, 0x87,
-    0xE1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
diff --git a/src/components/themes/BaseTheme.cpp b/src/components/themes/BaseTheme.cpp
index 81bc8d14..6870bad4 100644
--- a/src/components/themes/BaseTheme.cpp
+++ b/src/components/themes/BaseTheme.cpp
@@ -22,37 +22,6 @@ constexpr int homeMenuMargin = 20;
 constexpr int homeMarginTop = 30;
 constexpr int subtitleY = 738;
 
-// Helper: draw battery icon at given position
-void drawBatteryIcon(const GfxRenderer& renderer, int x, int y, int battWidth, int rectHeight, uint16_t percentage) {
-  // Draw battery outline (shared code)
-  BaseTheme::drawBatteryOutline(renderer, x, y, battWidth, rectHeight);
-
-  const bool charging = gpio.isUsbConnected();
-
-  // The +1 is to round up, so that we always fill at least one pixel
-  const int maxFillWidth = battWidth - 5;
-  const int fillHeight = rectHeight - 4;
-  if (maxFillWidth <= 0 || fillHeight <= 0) {
-    return;
-  }
-  int filledWidth = percentage * maxFillWidth / 100 + 1;
-  if (filledWidth > maxFillWidth) {
-    filledWidth = maxFillWidth;
-  }
-
-  // When charging, ensure minimum fill so lightning bolt is fully visible
-  constexpr int minFillForBolt = 8;
-  if (charging && filledWidth < minFillForBolt) {
-    filledWidth = std::min(minFillForBolt, maxFillWidth);
-  }
-
-  renderer.fillRect(x + 2, y + 2, filledWidth, fillHeight);
-
-  // Draw lightning bolt when charging (white/inverted on black fill for visibility)
-  if (charging) {
-    BaseTheme::drawBatteryLightningBolt(renderer, x + 4, y + 2);
-  }
-}
 }  // namespace
 
 void BaseTheme::drawBatteryOutline(const GfxRenderer& renderer, int x, int y, int battWidth, int rectHeight) {
@@ -81,6 +50,33 @@ void BaseTheme::drawBatteryLightningBolt(const GfxRenderer& renderer, int boltX,
   renderer.drawLine(boltX + 1, boltY + 7, boltX + 2, boltY + 7, false);
 }
 
+void BaseTheme::fillBatteryIcon(const GfxRenderer& renderer, Rect rect, uint16_t percentage) const {
+  const bool charging = gpio.isUsbConnected();
+
+  const int maxFillWidth = rect.width - 5;
+  const int fillHeight = rect.height - 4;
+  if (maxFillWidth <= 0 || fillHeight <= 0) {
+    return;
+  }
+  // +1 to round up so we always fill at least one pixel
+  int filledWidth = percentage * maxFillWidth / 100 + 1;
+  if (filledWidth > maxFillWidth) {
+    filledWidth = maxFillWidth;
+  }
+
+  // When charging, ensure minimum fill so lightning bolt is fully visible
+  constexpr int minFillForBolt = 8;
+  if (charging && filledWidth < minFillForBolt) {
+    filledWidth = std::min(minFillForBolt, maxFillWidth);
+  }
+
+  renderer.fillRect(rect.x + 2, rect.y + 2, filledWidth, fillHeight);
+
+  if (charging) {
+    drawBatteryLightningBolt(renderer, rect.x + 4, rect.y + 2);
+  }
+}
+
 void BaseTheme::drawBatteryLeft(const GfxRenderer& renderer, Rect rect, const bool showPercentage) const {
   // Left aligned: icon on left, percentage on right (reader mode)
   const uint16_t percentage = powerManager.getBatteryPercentage();
@@ -88,11 +84,12 @@ void BaseTheme::drawBatteryLeft(const GfxRenderer& renderer, Rect rect, const bo
 
   if (showPercentage) {
     const auto percentageText = std::to_string(percentage) + "%";
-    renderer.drawText(SMALL_FONT_ID, rect.x + BaseTheme::batteryPercentSpacing + BaseMetrics::values.batteryWidth,
-                      rect.y, percentageText.c_str());
+    renderer.drawText(SMALL_FONT_ID, rect.x + batteryPercentSpacing + rect.width, rect.y, percentageText.c_str());
   }
 
-  drawBatteryIcon(renderer, rect.x, y, BaseMetrics::values.batteryWidth, rect.height, percentage);
+  const Rect iconRect{rect.x, y, rect.width, rect.height};
+  drawBatteryOutline(renderer, rect.x, y, rect.width, rect.height);
+  fillBatteryIcon(renderer, iconRect, percentage);
 }
 
 void BaseTheme::drawBatteryRight(const GfxRenderer& renderer, Rect rect, const bool showPercentage) const {
@@ -104,16 +101,12 @@ void BaseTheme::drawBatteryRight(const GfxRenderer& renderer, Rect rect, const b
   if (showPercentage) {
     const auto percentageText = std::to_string(percentage) + "%";
     const int textWidth = renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str());
-    // Clear the area where we're going to draw the text to prevent ghosting
-    const auto textHeight = renderer.getTextHeight(SMALL_FONT_ID);
-    renderer.fillRect(rect.x - textWidth - BaseTheme::batteryPercentSpacing, rect.y, textWidth, textHeight, false);
-    // Draw text to the left of the icon
-    renderer.drawText(SMALL_FONT_ID, rect.x - textWidth - BaseTheme::batteryPercentSpacing, rect.y,
-                      percentageText.c_str());
+    renderer.drawText(SMALL_FONT_ID, rect.x - textWidth - batteryPercentSpacing, rect.y, percentageText.c_str());
   }
 
-  // Icon is already at correct position from rect.x
-  drawBatteryIcon(renderer, rect.x, y, BaseMetrics::values.batteryWidth, rect.height, percentage);
+  const Rect iconRect{rect.x, y, rect.width, rect.height};
+  drawBatteryOutline(renderer, rect.x, y, rect.width, rect.height);
+  fillBatteryIcon(renderer, iconRect, percentage);
 }
 
 void BaseTheme::drawProgressBar(const GfxRenderer& renderer, Rect rect, const size_t current,
@@ -141,15 +134,16 @@ void BaseTheme::drawProgressBar(const GfxRenderer& renderer, Rect rect, const si
 }
 
 void BaseTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                                const char* btn4) const {
+                                const char* btn4, const bool allowInvertedText) const {
   const GfxRenderer::Orientation orig_orientation = renderer.getOrientation();
-  renderer.setOrientation(GfxRenderer::Orientation::Portrait);
+  const bool invertText = allowInvertedText && orig_orientation == GfxRenderer::Orientation::PortraitInverted;
+  renderer.setOrientation(invertText ? GfxRenderer::Orientation::PortraitInverted : GfxRenderer::Orientation::Portrait);
 
   const int pageHeight = renderer.getScreenHeight();
   constexpr int buttonWidth = 106;
   constexpr int buttonHeight = BaseMetrics::values.buttonHintsHeight;
-  constexpr int buttonY = BaseMetrics::values.buttonHintsHeight;  // Distance from bottom
-  constexpr int textYOffset = 7;                                  // Distance from top of button to text baseline
+  const int buttonY = invertText ? pageHeight : BaseMetrics::values.buttonHintsHeight;
+  constexpr int textYOffset = 7;  // Distance from top of button to text baseline
   // X3 has wider screen in portrait (528 vs 480), use more spacing
   constexpr int x4ButtonPositions[] = {25, 130, 245, 350};
   constexpr int x3ButtonPositions[] = {38, 154, 268, 384};
@@ -159,7 +153,7 @@ void BaseTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const c
   for (int i = 0; i < 4; i++) {
     // Only draw if the label is non-empty
     if (labels[i] != nullptr && labels[i][0] != '\0') {
-      const int x = buttonPositions[i];
+      const int x = buttonPositions[invertText ? 3 - i : i];
       renderer.fillRect(x, pageHeight - buttonY, buttonWidth, buttonHeight, false);
       renderer.drawRect(x, pageHeight - buttonY, buttonWidth, buttonHeight);
       const int textWidth = renderer.getTextWidth(UI_10_FONT_ID, labels[i]);
@@ -241,11 +235,12 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
                          const std::function<std::string(int index)>& rowSubtitle,
                          const std::function<UIIcon(int index)>& rowIcon,
                          const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                         const std::function<bool(int index)>& rowDimmed,
                          const std::function<bool(int index)>& isHeader) const {
   int rowHeight =
       (rowSubtitle != nullptr) ? BaseMetrics::values.listWithSubtitleRowHeight : BaseMetrics::values.listRowHeight;
   int pageItems = rect.height / rowHeight;
-  constexpr int sectionHeaderTopPadding = 20;
+  constexpr int sectionHeaderTopPadding = 15;
 
   const int totalPages = (itemCount + pageItems - 1) / pageItems;
   if (totalPages > 1) {
@@ -275,6 +270,13 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
 
   // Draw selection (skip header rows)
   int contentWidth = rect.width - 5;
+  if (selectedIndex >= 0) {
+    renderer.fillRect(0, rect.y + selectedIndex % pageItems * rowHeight - 2, rect.width, rowHeight);
+  }
+  constexpr int maxValueWidth = 200;
+  constexpr int minValueGap = 10;
+
+  // Draw all items
   const auto pageStartIndex = selectedIndex / pageItems * pageItems;
   const int rectBottom = rect.y + rect.height;
   if (selectedIndex >= 0 && !(isHeader && isHeader(selectedIndex))) {
@@ -288,53 +290,59 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
     }
   }
 
-  // Draw all items using a running Y to accommodate variable-height section headers
-  int currentY = rect.y;
+  // Draw all visible page items
   for (int i = pageStartIndex; i < itemCount && i < pageStartIndex + pageItems; i++) {
-    const bool headerRow = isHeader && isHeader(i);
-    const int rowPadding = (i > pageStartIndex && headerRow) ? sectionHeaderTopPadding : 0;
-    if (currentY + rowPadding + rowHeight > rectBottom) {
-      break;
-    }
-    currentY += rowPadding;
-    const int itemY = currentY;
-    currentY += rowHeight;
-
-    if (headerRow) {
-      // Section header: bold uppercase label + divider line below
-      std::string label = rowTitle(i);
-      std::transform(label.begin(), label.end(), label.begin(),
-                     [](unsigned char c) { return static_cast<char>(std::toupper(c)); });
-      auto truncated = renderer.truncatedText(
-          UI_10_FONT_ID, label.c_str(), contentWidth - BaseMetrics::values.contentSidePadding * 2, EpdFontFamily::BOLD);
-      renderer.drawText(UI_10_FONT_ID, rect.x + BaseMetrics::values.contentSidePadding, itemY + 5, truncated.c_str(),
-                        true, EpdFontFamily::BOLD);
-      renderer.drawLine(rect.x, itemY + rowHeight - 1, rect.x + contentWidth, itemY + rowHeight - 1, true);
-      continue;
-    }
+    const int itemY = rect.y + (i % pageItems) * rowHeight;
 
-    int textWidth = contentWidth - BaseMetrics::values.contentSidePadding * 2 - (rowValue != nullptr ? 60 : 0);
+    int rowTextWidth = contentWidth - BaseMetrics::values.contentSidePadding * 2;
+    std::string valueText;
+    if (rowValue != nullptr) {
+      valueText = rowValue(i);
+      if (!valueText.empty()) {
+        int maxValW = std::max(0, rowTextWidth - 40 - minValueGap);
+        valueText = renderer.truncatedText(UI_10_FONT_ID, valueText.c_str(), maxValW);
+        int valueWidth = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str()) + minValueGap;
+        rowTextWidth -= valueWidth;
+      }
+    }
 
-    // Draw name
     auto itemName = rowTitle(i);
-    auto font = (rowSubtitle != nullptr) ? UI_12_FONT_ID : UI_10_FONT_ID;
-    auto item = renderer.truncatedText(font, itemName.c_str(), textWidth);
+    auto font = UI_10_FONT_ID;
+    auto item = renderer.truncatedText(font, itemName.c_str(), rowTextWidth);
+    if (isHeader && isHeader(i)) {
+      renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true,
+                        EpdFontFamily::BOLD);
+      continue;
+    }
     renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), i != selectedIndex);
 
+    // Apply checkerboard dither to create gray text effect for dimmed items
+    if (rowDimmed && rowDimmed(i) && i != selectedIndex) {
+      const int titleWidth = renderer.getTextWidth(font, item.c_str());
+      const int lineH = renderer.getLineHeight(font);
+      const int tx = rect.x + BaseMetrics::values.contentSidePadding;
+      for (int py = itemY; py < itemY + lineH; py++)
+        for (int px = tx; px < tx + titleWidth; px++)
+          if ((px + py) % 2 == 0) renderer.drawPixel(px, py, false);
+    }
+
     if (rowSubtitle != nullptr) {
-      // Draw subtitle
       std::string subtitleText = rowSubtitle(i);
-      auto subtitle = renderer.truncatedText(UI_10_FONT_ID, subtitleText.c_str(), textWidth);
-      renderer.drawText(UI_10_FONT_ID, rect.x + BaseMetrics::values.contentSidePadding, itemY + 30, subtitle.c_str(),
-                        i != selectedIndex);
+      if (!subtitleText.empty()) {
+        auto subtitle = renderer.truncatedText(SMALL_FONT_ID, subtitleText.c_str(), rowTextWidth);
+        renderer.drawText(SMALL_FONT_ID, rect.x + BaseMetrics::values.contentSidePadding, itemY + 22, subtitle.c_str(),
+                          i != selectedIndex);
+      }
     }
 
-    if (rowValue != nullptr) {
-      // Draw value
-      std::string valueText = rowValue(i);
+    if (!valueText.empty()) {
       const auto valueTextWidth = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
+      int valueY = itemY;
+      if (rowSubtitle != nullptr) {
+        valueY = itemY + 10;
+      }
       renderer.drawText(UI_10_FONT_ID, rect.x + contentWidth - BaseMetrics::values.contentSidePadding - valueTextWidth,
-                        itemY, valueText.c_str(), i != selectedIndex);
+                        valueY, valueText.c_str(), i != selectedIndex);
     }
   }
 }
@@ -425,8 +433,8 @@ void BaseTheme::drawTabBar(const GfxRenderer& renderer, const Rect rect, const s
 // Draw the "Recent Book" cover card on the home screen
 // TODO: Refactor method to make it cleaner, split into smaller methods
 void BaseTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                    const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                    bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                    int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                    bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                     const BookReadingStats* /*stats*/, float /*progressPercent*/) const {
   const bool hasContinueReading = !recentBooks.empty();
   const bool bookSelected = hasContinueReading && selectorIndex == 0;
diff --git a/src/components/themes/BaseTheme.h b/src/components/themes/BaseTheme.h
index 6b9427ed..076e8db3 100644
--- a/src/components/themes/BaseTheme.h
+++ b/src/components/themes/BaseTheme.h
@@ -103,9 +103,9 @@ constexpr ThemeMetrics values = {.batteryWidth = 15,
                                  .verticalSpacing = 10,
                                  .contentSidePadding = 20,
                                  .listRowHeight = 30,
-                                 .listWithSubtitleRowHeight = 65,
-                                 .menuRowHeight = 38,
-                                 .menuSpacing = 6,
+                                 .listWithSubtitleRowHeight = 50,
+                                 .menuRowHeight = 45,
+                                 .menuSpacing = 8,
                                  .tabSpacing = 10,
                                  .tabBarHeight = 50,
                                  .scrollBarWidth = 4,
@@ -140,19 +140,21 @@ class BaseTheme {
   virtual ~BaseTheme() = default;
 
   // Component drawing methods
-  virtual void drawProgressBar(const GfxRenderer& renderer, Rect rect, size_t current, size_t total) const;
-  virtual void drawBatteryLeft(const GfxRenderer& renderer, Rect rect,
-                               bool showPercentage = true) const;  // Left aligned (reader mode)
-  virtual void drawBatteryRight(const GfxRenderer& renderer, Rect rect,
-                                bool showPercentage = true) const;  // Right aligned (UI headers)
+  void drawProgressBar(const GfxRenderer& renderer, Rect rect, size_t current, size_t total) const;
+  void drawBatteryLeft(const GfxRenderer& renderer, Rect rect,
+                       bool showPercentage = true) const;  // Left aligned (reader mode)
+  void drawBatteryRight(const GfxRenderer& renderer, Rect rect,
+                        bool showPercentage = true) const;  // Right aligned (UI headers)
+  virtual void fillBatteryIcon(const GfxRenderer& renderer, Rect rect, uint16_t percentage) const;
   virtual void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                               const char* btn4) const;
+                               const char* btn4, bool allowInvertedText = false) const;
   virtual void drawSideButtonHints(const GfxRenderer& renderer, const char* topBtn, const char* bottomBtn) const;
   virtual void drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
                         const std::function<std::string(int index)>& rowTitle,
                         const std::function<std::string(int index)>& rowSubtitle = nullptr,
                         const std::function<UIIcon(int index)>& rowIcon = nullptr,
                         const std::function<std::string(int index)>& rowValue = nullptr, bool highlightValue = false,
+                        const std::function<bool(int index)>& rowDimmed = nullptr,
                         const std::function<bool(int index)>& isHeader = nullptr) const;
   virtual void drawHeader(const GfxRenderer& renderer, Rect rect, const char* title,
                           const char* subtitle = nullptr) const;
@@ -161,8 +163,8 @@ class BaseTheme {
   virtual void drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
                           bool selected) const;
   virtual void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                   const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                   bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                   int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                   bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                    const BookReadingStats* stats = nullptr, float progressPercent = -1.0f) const;
   virtual void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
                               const std::function<std::string(int index)>& buttonLabel,
@@ -179,6 +181,10 @@ class BaseTheme {
                                const char* secondaryLabel = nullptr, KeyboardKeyType keyType = KeyboardKeyType::Normal,
                                bool inactiveSelection = false) const;
   virtual bool showsFileIcons() const { return false; }
+  virtual bool usesCompactFileBrowserRows() const { return false; }
+  virtual int compactFileBrowserRowHeight(const GfxRenderer&) const { return BaseMetrics::values.listRowHeight; }
+  virtual void drawCarouselBorder(GfxRenderer& renderer, Rect coverRect, const std::vector<RecentBook>& recentBooks,
+                                  int centerIdx, bool inCarouselRow) const {}
 
   // Shared constants and helpers for battery drawing (used by all themes)
   static constexpr int batteryPercentSpacing = 4;
diff --git a/src/components/themes/lyra/Lyra3CoversTheme.cpp b/src/components/themes/lyra/Lyra3CoversTheme.cpp
index 0530b54d..adf6831e 100644
--- a/src/components/themes/lyra/Lyra3CoversTheme.cpp
+++ b/src/components/themes/lyra/Lyra3CoversTheme.cpp
@@ -19,8 +19,8 @@ constexpr int cornerRadius = 6;
 }  // namespace
 
 void Lyra3CoversTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                           const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                           bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                           int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                           bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                            const BookReadingStats* /*stats*/, float /*progressPercent*/) const {
   const int tileWidth = (rect.width - 2 * Lyra3CoversMetrics::values.contentSidePadding) / 3;
   const int tileY = rect.y;
diff --git a/src/components/themes/lyra/Lyra3CoversTheme.h b/src/components/themes/lyra/Lyra3CoversTheme.h
index 884a392e..823e5a5a 100644
--- a/src/components/themes/lyra/Lyra3CoversTheme.h
+++ b/src/components/themes/lyra/Lyra3CoversTheme.h
@@ -21,7 +21,7 @@ constexpr ThemeMetrics values = [] {
 class Lyra3CoversTheme : public LyraTheme {
  public:
   void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                           const int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
-                           std::function<bool()> storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
                            float progressPercent = -1.0f) const override;
 };
diff --git a/src/components/themes/lyra/LyraCarouselTheme.cpp b/src/components/themes/lyra/LyraCarouselTheme.cpp
new file mode 100644
index 00000000..a1d14c15
--- /dev/null
+++ b/src/components/themes/lyra/LyraCarouselTheme.cpp
@@ -0,0 +1,552 @@
+#include "LyraCarouselTheme.h"
+
+#include <Bitmap.h>
+#include <GfxRenderer.h>
+#include <HalStorage.h>
+#include <I18n.h>
+
+#include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "RecentBooksStore.h"
+#include "activities/reader/BookReadingStats.h"
+#include "components/UITheme.h"
+#include "components/icons/cover.h"
+#include "fontIds.h"
+
+namespace {
+// Cover layout — keep Lyra Carousel's general geometry, but render the books
+// with the same visual treatment as Lyra Flow.
+constexpr int kCenterCoverMaxW = LyraCarouselTheme::kCenterCoverW;
+constexpr int kCenterCoverMaxH = LyraCarouselTheme::kCenterCoverH;
+constexpr int kSideCoverMaxW = LyraCarouselTheme::kSideCoverW;
+constexpr int kSideCoverMaxH = LyraCarouselTheme::kSideCoverH;
+constexpr int kCoverTopPad = 18;
+constexpr int kCenterCoverVisualInset = 10;
+constexpr int kCarouselVerticalLift = 8;
+constexpr int kBaseDisplayCenterW = (kCenterCoverMaxW * 86) / 100;
+constexpr int kBaseDisplayCenterH = (kCenterCoverMaxH * 86) / 100;
+constexpr int kDisplayCenterW = std::min(kCenterCoverMaxW, kBaseDisplayCenterW + 24);
+constexpr int kDisplayCenterH = std::min(kCenterCoverMaxH, kBaseDisplayCenterH + 24);
+constexpr int kNearSideW = (kBaseDisplayCenterW * 26) / 100;
+constexpr int kFarSideW = (kBaseDisplayCenterW * 21) / 100;
+constexpr int kNearSideInnerH = (kBaseDisplayCenterH * 90) / 100;
+constexpr int kNearSideOuterH = (kBaseDisplayCenterH * 82) / 100;
+constexpr int kFarSideInnerH = (kBaseDisplayCenterH * 84) / 100;
+constexpr int kFarSideOuterH = (kBaseDisplayCenterH * 74) / 100;
+constexpr int kSideOutlineW = 2;
+constexpr int kSideCornerRadius = 5;
+constexpr int kCoverStackLift = 15;
+constexpr int kCenterCoverTopInset = (((kCenterCoverMaxH - kDisplayCenterH) / 2) > kCoverStackLift)
+                                         ? ((kCenterCoverMaxH - kDisplayCenterH) / 2) - kCoverStackLift
+                                         : 0;
+
+constexpr int kTitleFontId = UI_12_FONT_ID;
+constexpr int kMenuLabelFontId = SMALL_FONT_ID;
+constexpr int kDotSize = 8;  // px square dot
+constexpr int kDotGap = 6;   // px between dots
+constexpr int kTitleTopClearance = 4;
+constexpr int kTitleDrawOffset = 5;
+constexpr int kTitleBottomGap = 8;
+constexpr int kMenuLabelTopGap = 3;
+constexpr int kMenuLabelBottomGap = 4;
+constexpr int kMenuRowDrop = 31;
+
+constexpr int kFooterTopGap = 10;
+constexpr int kFooterLabelToBarGap = 3;
+constexpr int kFooterProgressBarHeight = 5;
+constexpr int kFooterPercentTopGap = 2;
+
+constexpr int kCornerRadius = 6;
+constexpr int kThinOutlineW = 1;    // always-visible outline around centre cover
+constexpr int kSelectionLineW = 3;  // thicker outline when centre cover is selected
+constexpr int kCenterOutlineW = 4;  // white ring around centre cover
+
+// Icon row — icons are 32×32 bitmaps; drawIcon does NOT scale
+constexpr int kMenuIconSize = 32;  // must match actual bitmap dimensions
+constexpr int kMenuIconPad = 14;   // symmetric vertical padding → tile height = 60
+constexpr int kHighlightPad = 7;   // highlight padding around the selected icon
+// Row is anchored to the bottom of the screen, just above button hints
+constexpr int kButtonHintsH = LyraCarouselMetrics::values.buttonHintsHeight;
+
+struct MenuLayoutMetrics {
+  int tileH;
+  int tileW;
+  int labelLineHeight;
+  int rowY;
+  int labelY;
+};
+
+MenuLayoutMetrics computeMenuLayout(const GfxRenderer& renderer, int buttonCount) {
+  const int tileH = kMenuIconPad + kMenuIconSize + kMenuIconPad;
+  const int labelLineHeight = renderer.getLineHeight(kMenuLabelFontId);
+  const int rowY = renderer.getScreenHeight() - kButtonHintsH - tileH - kMenuLabelTopGap - labelLineHeight -
+                   kMenuLabelBottomGap + kMenuRowDrop;
+  return {
+      tileH, renderer.getScreenWidth() / buttonCount, labelLineHeight, rowY, rowY - kMenuLabelTopGap - labelLineHeight,
+  };
+}
+
+std::atomic<int> lastCarouselSelectorIndex{-1};
+Rect lastCenterCoverRect{0, 0, 0, 0};
+Rect cachedCenterCoverRects[LyraCarouselMetrics::values.homeRecentBooksCount];
+
+Rect shrinkCenterCoverRect(const Rect& rect) {
+  const int insetWidth = rect.width - kCenterCoverVisualInset * 2;
+  const int insetHeight = rect.height - kCenterCoverVisualInset * 2;
+  const int width = std::max(0, insetWidth);
+  const int height = std::max(0, insetHeight);
+  return Rect{rect.x + (rect.width - width) / 2, rect.y + (rect.height - height) / 2, width, height};
+}
+
+Rect computeCenterCoverSlotRect(const GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks) {
+  if (recentBooks.empty()) {
+    const int screenW = renderer.getScreenWidth();
+    const int fallbackX = (screenW - kDisplayCenterW) / 2;
+    const int fallbackY = rect.y + kCoverTopPad + kCenterCoverTopInset - kCarouselVerticalLift;
+    return Rect{fallbackX, fallbackY, kDisplayCenterW, kDisplayCenterH};
+  }
+
+  const int screenW = renderer.getScreenWidth();
+  const int titleLineHeight = renderer.getLineHeight(kTitleFontId);
+  const int reservedTitleBlockHeight = titleLineHeight * 2;
+  const int titleY = rect.y + kTitleTopClearance;
+  const int centerTileY = std::max(rect.y + kCoverTopPad, titleY + reservedTitleBlockHeight + kTitleBottomGap);
+  const int centerDrawY = centerTileY + kCenterCoverTopInset - kCarouselVerticalLift;
+  const int centerX = (screenW - kDisplayCenterW) / 2;
+  return Rect{centerX, centerDrawY, kDisplayCenterW, kDisplayCenterH};
+}
+
+void drawMenuBookmarkIcon(const GfxRenderer& renderer, int x, int y, bool selected) {
+  constexpr int ribbonWidth = 16;
+  constexpr int ribbonHeight = 22;
+  constexpr int notchSize = 6;
+  const int iconX = x + (kMenuIconSize - ribbonWidth) / 2;
+  const int iconY = y + 4;
+  const int centerX = iconX + ribbonWidth / 2;
+
+  const int polyX[5] = {iconX, iconX + ribbonWidth, iconX + ribbonWidth, centerX, iconX};
+  const int polyY[5] = {iconY, iconY, iconY + ribbonHeight, iconY + ribbonHeight - notchSize, iconY + ribbonHeight};
+  renderer.fillPolygon(polyX, polyY, 5, !selected);
+}
+
+void drawPerspectiveOutline(const GfxRenderer& renderer, int x, int y, int width, int leftHeight, int rightHeight) {
+  const int maxHeight = std::max(leftHeight, rightHeight);
+  const int topLeft = (maxHeight - leftHeight) / 2;
+  const int topRight = (maxHeight - rightHeight) / 2;
+  const int bottomLeft = topLeft + leftHeight - 1;
+  const int bottomRight = topRight + rightHeight - 1;
+  const int rightX = x + width - 1;
+
+  renderer.drawLine(x, y + topLeft, rightX, y + topRight, kSideOutlineW, true);
+  renderer.drawLine(x, y + bottomLeft, rightX, y + bottomRight, kSideOutlineW, true);
+  renderer.fillRect(x, y + topLeft, kSideOutlineW, leftHeight, true);
+  renderer.fillRect(rightX - kSideOutlineW + 1, y + topRight, kSideOutlineW, rightHeight, true);
+  renderer.fillRect(x, y + maxHeight + 1, width, 2, false);
+}
+
+void fillPerspectiveSilhouette(const GfxRenderer& renderer, int x, int y, int width, int leftHeight, int rightHeight) {
+  const int maxHeight = std::max(leftHeight, rightHeight);
+  renderer.fillRect(x, y, width, maxHeight, false);
+  for (int dx = 0; dx < width; ++dx) {
+    const int columnHeight = (width <= 1) ? leftHeight : (leftHeight + ((rightHeight - leftHeight) * dx) / (width - 1));
+    const int top = y + (maxHeight - columnHeight) / 2;
+    renderer.fillRect(x + dx, top, 1, columnHeight, true);
+  }
+}
+
+void formatCompactReadingTime(uint32_t seconds, char* buf, size_t len) {
+  if (seconds < 60) {
+    snprintf(buf, len, "%s", tr(STR_STATS_LESS_THAN_MIN));
+    return;
+  }
+
+  const uint32_t hours = seconds / 3600;
+  const uint32_t minutes = (seconds % 3600) / 60;
+  if (hours == 0) {
+    snprintf(buf, len, "%lum", static_cast<unsigned long>(minutes));
+  } else {
+    snprintf(buf, len, "%luh %lum", static_cast<unsigned long>(hours), static_cast<unsigned long>(minutes));
+  }
+}
+
+}  // namespace
+
+// ---------------------------------------------------------------------------
+// Static helpers
+// ---------------------------------------------------------------------------
+void LyraCarouselTheme::setPreRenderIndex(int idx) {
+  lastCarouselSelectorIndex.store(idx, std::memory_order_relaxed);
+  if (idx >= 0 && idx < LyraCarouselMetrics::values.homeRecentBooksCount) {
+    const Rect cachedRect = cachedCenterCoverRects[idx];
+    if (cachedRect.width > 0 && cachedRect.height > 0) lastCenterCoverRect = cachedRect;
+  }
+}
+
+void LyraCarouselTheme::drawCarouselBorder(GfxRenderer& renderer, Rect coverRect,
+                                           const std::vector<RecentBook>& recentBooks, int centerIdx,
+                                           bool inCarouselRow) const {
+  if (!inCarouselRow) return;
+  Rect borderRect = shrinkCenterCoverRect(computeCenterCoverSlotRect(renderer, coverRect, recentBooks));
+  renderer.drawRoundedRect(borderRect.x, borderRect.y, borderRect.width, borderRect.height, kSelectionLineW,
+                           kCornerRadius, true);
+}
+
+// ---------------------------------------------------------------------------
+// Carousel cover strip
+// ---------------------------------------------------------------------------
+void LyraCarouselTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect,
+                                            const std::vector<RecentBook>& recentBooks, int selectorIndex,
+                                            bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                                            const std::function<bool()>& storeCoverBuffer,
+                                            const BookReadingStats* stats, float progressPercent) const {
+  // Reserved for future use: tells the carousel whether Home restored a cached frame buffer.
+  (void)bufferRestored;
+  if (recentBooks.empty()) {
+    drawEmptyRecents(renderer, rect);
+    return;
+  }
+
+  const int bookCount = static_cast<int>(recentBooks.size());
+  // When navigating the icon row, keep showing the last carousel position —
+  // falling back to 0 on first use (lastCarouselSelectorIndex == -1).
+  const bool inCarouselRow = (selectorIndex < bookCount);
+  const int lastSelectorIndex = lastCarouselSelectorIndex.load(std::memory_order_relaxed);
+  int centerIdx = inCarouselRow ? selectorIndex : (lastSelectorIndex >= 0 ? lastSelectorIndex : 0);
+
+  if (centerIdx >= bookCount) {
+    centerIdx = bookCount - 1;
+    coverRendered = false;
+    coverBufferStored = false;
+  }
+
+  // cppcheck-suppress knownConditionTrueFalse
+  // Reachable as false when navigating the icon row with a previously-set
+  // lastCarouselSelectorIndex; cppcheck only models the inCarouselRow=true path.
+  if (centerIdx != lastSelectorIndex) {
+    coverRendered = false;
+    coverBufferStored = false;
+  }
+
+  const int screenW = renderer.getScreenWidth();
+  const int textMaxWidth = std::min(screenW - 40, kCenterCoverMaxW + 40);
+  const auto titleLines =
+      renderer.wrappedText(kTitleFontId, recentBooks[centerIdx].title.c_str(), textMaxWidth, 2, EpdFontFamily::BOLD);
+  const int titleLineHeight = renderer.getLineHeight(kTitleFontId);
+  const int titleBlockHeight = titleLineHeight * static_cast<int>(titleLines.size());
+  const int reservedTitleBlockHeight = titleLineHeight * 2;
+  const int titleY = rect.y + kTitleTopClearance;
+  const int centerTileY = std::max(rect.y + kCoverTopPad, titleY + reservedTitleBlockHeight + kTitleBottomGap);
+  const int sideMaxHeight = std::max(kNearSideInnerH, kNearSideOuterH);
+  const Rect centerCoverSlotRect = computeCenterCoverSlotRect(renderer, rect, recentBooks);
+  const int centerDrawY = centerCoverSlotRect.y;
+  const int sideTileY = centerDrawY + (kDisplayCenterH - sideMaxHeight) / 2;
+
+  const int centerX = centerCoverSlotRect.x;
+  const int nearOverlap = 4;
+  const int farOverlap = 2;
+  constexpr int nearCoverInset = 10;
+  const int baseLeftNearX = centerX - kNearSideW + nearOverlap;
+  const int baseRightNearX = centerX + kDisplayCenterW - nearOverlap;
+  const int leftNearX = baseLeftNearX + nearCoverInset;
+  const int rightNearX = baseRightNearX - nearCoverInset;
+  const int leftFarX = std::max(0, baseLeftNearX - kFarSideW + farOverlap);
+  const int rightFarX = std::min(screenW - kFarSideW, baseRightNearX + kNearSideW - farOverlap);
+
+  auto drawCenterCover = [&](int bookIdx, Rect& outRect) -> bool {
+    if (bookIdx < 0 || bookIdx >= bookCount) return false;
+    const RecentBook& book = recentBooks[bookIdx];
+    outRect = shrinkCenterCoverRect(centerCoverSlotRect);
+
+    if (!book.coverBmpPath.empty()) {
+      const std::string thumbPath = UITheme::getCoverThumbPath(book.coverBmpPath, kCenterCoverMaxW, kCenterCoverMaxH);
+      FsFile file;
+      if (Storage.openFileForRead("HOME", thumbPath, file)) {
+        Bitmap bitmap(file);
+        if (bitmap.parseHeaders() == BmpReaderError::Ok && bitmap.getWidth() > 0 && bitmap.getHeight() > 0) {
+          const float srcW = static_cast<float>(bitmap.getWidth());
+          const float srcH = static_cast<float>(bitmap.getHeight());
+          const float srcRatio = srcW / srcH;
+          const float safeTargetHeight = outRect.height == 0 ? 1.0f : static_cast<float>(outRect.height);
+          const float targetRatio = static_cast<float>(outRect.width) / safeTargetHeight;
+          float cropX = 0.0f;
+          float cropY = 0.0f;
+
+          if (srcRatio > targetRatio) {
+            cropX = std::max(0.0f, 1.0f - (targetRatio / srcRatio));
+          } else if (srcRatio < targetRatio) {
+            cropY = std::max(0.0f, 1.0f - (srcRatio / targetRatio));
+          }
+
+          renderer.fillRect(outRect.x - kCenterOutlineW, outRect.y - kCenterOutlineW,
+                            outRect.width + 2 * kCenterOutlineW, outRect.height + 2 * kCenterOutlineW, false);
+          renderer.drawBitmap(bitmap, outRect.x, outRect.y, outRect.width, outRect.height, cropX, cropY);
+          renderer.maskRoundedRectOutsideCorners(outRect.x, outRect.y, outRect.width, outRect.height, kCornerRadius,
+                                                 Color::White);
+          file.close();
+          return true;
+        }
+        file.close();
+      }
+    }
+
+    renderer.fillRect(outRect.x - kCenterOutlineW, outRect.y - kCenterOutlineW, outRect.width + 2 * kCenterOutlineW,
+                      outRect.height + 2 * kCenterOutlineW, false);
+    renderer.drawRoundedRect(outRect.x, outRect.y, outRect.width, outRect.height, 1, kCornerRadius, true);
+    renderer.fillRoundedRect(outRect.x, outRect.y + outRect.height / 3, outRect.width, 2 * outRect.height / 3,
+                             kCornerRadius, /*roundTopLeft=*/false, /*roundTopRight=*/false,
+                             /*roundBottomLeft=*/true, /*roundBottomRight=*/true, Color::Black);
+    constexpr int kFallbackTitlePadX = 14;
+    constexpr int kFallbackTitlePadBottom = 14;
+    constexpr int kFallbackIconGap = 10;
+    const int iconX = outRect.x + outRect.width / 2 - 16;
+    const int iconY = outRect.y + outRect.height / 3 + 14;
+    renderer.drawIcon(CoverIcon, iconX, iconY, 32, 32);
+
+    const int fallbackTitleX = outRect.x + kFallbackTitlePadX;
+    const int fallbackTitleY = iconY + 32 + kFallbackIconGap;
+    const int fallbackTitleW = outRect.width - kFallbackTitlePadX * 2;
+    const int fallbackTitleH = outRect.y + outRect.height - kFallbackTitlePadBottom - fallbackTitleY;
+    const int fallbackLineHeight = renderer.getLineHeight(UI_10_FONT_ID);
+    const int maxFallbackLines = std::clamp(fallbackTitleH / std::max(1, fallbackLineHeight), 1, 4);
+    const auto fallbackTitleLines =
+        renderer.wrappedText(UI_10_FONT_ID, book.title.c_str(), fallbackTitleW, maxFallbackLines, EpdFontFamily::BOLD);
+    const int fallbackBlockH = fallbackLineHeight * static_cast<int>(fallbackTitleLines.size());
+    int fallbackLineY = fallbackTitleY + std::max(0, (fallbackTitleH - fallbackBlockH) / 2);
+    for (const auto& line : fallbackTitleLines) {
+      const int lineW = renderer.getTextWidth(UI_10_FONT_ID, line.c_str(), EpdFontFamily::BOLD);
+      renderer.drawText(UI_10_FONT_ID, outRect.x + (outRect.width - lineW) / 2, fallbackLineY, line.c_str(), false,
+                        EpdFontFamily::BOLD);
+      fallbackLineY += fallbackLineHeight;
+    }
+    return false;
+  };
+
+  auto drawSideCover = [&](int bookIdx, int x, int width, int leftHeight, int rightHeight) -> bool {
+    if (bookIdx < 0 || bookIdx >= bookCount) return false;
+    const RecentBook& book = recentBooks[bookIdx];
+
+    if (!book.coverBmpPath.empty()) {
+      const std::string thumbPath = UITheme::getCoverThumbPath(book.coverBmpPath, kSideCoverMaxW, kSideCoverMaxH);
+      FsFile file;
+      if (Storage.openFileForRead("HOME", thumbPath, file)) {
+        Bitmap bitmap(file);
+        if (bitmap.parseHeaders() == BmpReaderError::Ok) {
+          const int sideHeight = std::max(leftHeight, rightHeight);
+          renderer.fillRect(x, sideTileY, width, sideHeight, false);
+          renderer.drawPerspectiveBitmap(bitmap, x, sideTileY, width, leftHeight, rightHeight);
+          renderer.maskRoundedRectOutsideCorners(x, sideTileY, width, sideHeight, kSideCornerRadius, Color::White);
+          file.close();
+          drawPerspectiveOutline(renderer, x, sideTileY, width, leftHeight, rightHeight);
+          return true;
+        }
+        file.close();
+      }
+    }
+
+    fillPerspectiveSilhouette(renderer, x, sideTileY, width, leftHeight, rightHeight);
+    renderer.maskRoundedRectOutsideCorners(x, sideTileY, width, std::max(leftHeight, rightHeight), kSideCornerRadius,
+                                           Color::White);
+    return false;
+  };
+
+  if (!coverRendered) {
+    lastCarouselSelectorIndex.store(centerIdx, std::memory_order_relaxed);
+
+    // Clear the entire cover tile to white so stale pixels from old positions
+    // don't persist (drawBitmap only sets black pixels, never clears).
+    renderer.fillRect(rect.x, rect.y, rect.width, rect.height, false);
+
+    // More literal Lyra Flow layout: two visible books per side when available.
+    const int leftNearIdx = (centerIdx + bookCount - 1) % bookCount;
+    const int leftFarIdx = (centerIdx + bookCount - 2) % bookCount;
+    const int rightNearIdx = (centerIdx + 1) % bookCount;
+    const int rightFarIdx = (centerIdx + 2) % bookCount;
+
+    if (bookCount >= 5) drawSideCover(leftFarIdx, leftFarX, kFarSideW, kFarSideInnerH, kFarSideOuterH);
+    if (bookCount >= 4) drawSideCover(rightFarIdx, rightFarX, kFarSideW, kFarSideOuterH, kFarSideInnerH);
+    if (bookCount >= 2) drawSideCover(leftNearIdx, leftNearX, kNearSideW, kNearSideInnerH, kNearSideOuterH);
+    if (bookCount >= 3) drawSideCover(rightNearIdx, rightNearX, kNearSideW, kNearSideOuterH, kNearSideInnerH);
+
+    Rect centerCoverRect{};
+    drawCenterCover(centerIdx, centerCoverRect);
+    lastCenterCoverRect = centerCoverRect;
+    if (centerIdx >= 0 && centerIdx < LyraCarouselMetrics::values.homeRecentBooksCount) {
+      cachedCenterCoverRects[centerIdx] = centerCoverRect;
+    }
+
+    // Title sits above the center cover; wrap to 2 lines and ellipsize on line 2 if needed.
+    const int textCenterX = centerCoverRect.x + centerCoverRect.width / 2;
+    const int titleVerticalInset = (reservedTitleBlockHeight - titleBlockHeight) / 2;
+    int currentTitleY = titleY + titleVerticalInset + kTitleDrawOffset;
+    for (const auto& titleLine : titleLines) {
+      const int titleW = renderer.getTextWidth(kTitleFontId, titleLine.c_str(), EpdFontFamily::BOLD);
+      renderer.drawText(kTitleFontId, textCenterX - titleW / 2, currentTitleY, titleLine.c_str(), true,
+                        EpdFontFamily::BOLD);
+      currentTitleY += titleLineHeight;
+    }
+
+    // Dots — centred under the displayed centre cover, count = actual book count
+    const int dotsY = centerCoverSlotRect.y + centerCoverSlotRect.height + 8;
+    const int totalDotsW = bookCount * kDotSize + (bookCount - 1) * kDotGap;
+    int dotX = centerCoverSlotRect.x + (centerCoverSlotRect.width - totalDotsW) / 2;
+    for (int i = 0; i < bookCount; ++i) {
+      if (i == centerIdx)
+        renderer.fillRect(dotX, dotsY, kDotSize, kDotSize, true);
+      else
+        renderer.drawRect(dotX, dotsY, kDotSize, kDotSize, true);
+      dotX += kDotSize + kDotGap;
+    }
+
+    // Minimal-style reading progress footer below the cover.
+    constexpr int footerLabelFontId = UI_10_FONT_ID;
+    const int footerLabelLineHeight = renderer.getLineHeight(footerLabelFontId);
+    const bool hasStats = (stats != nullptr && stats->sessionCount > 0);
+    const bool hasProgress = progressPercent >= 0.0f;
+    int infoY = dotsY + kDotSize + kFooterTopGap;
+    const int footerMaxWidth = std::max(0, screenW - 2 * LyraCarouselMetrics::values.contentSidePadding);
+    const int footerWidth = std::min(footerMaxWidth, centerCoverRect.width);
+    const int footerX = centerCoverRect.x + (centerCoverRect.width - footerWidth) / 2;
+
+    if (hasStats) {
+      char buf[48];
+      formatCompactReadingTime(stats->totalReadingSeconds, buf, sizeof(buf));
+      const auto timeLabel = renderer.truncatedText(footerLabelFontId, buf, footerWidth, EpdFontFamily::REGULAR);
+      renderer.drawText(footerLabelFontId, footerX, infoY, timeLabel.c_str(), true, EpdFontFamily::REGULAR);
+    }
+
+    if (hasProgress) {
+      const int progressBarY = infoY + (hasStats ? footerLabelLineHeight + kFooterLabelToBarGap : 0);
+      const float clampedProgress = std::clamp(progressPercent, 0.0f, 100.0f);
+      const int filledWidth = std::clamp(static_cast<int>((clampedProgress / 100.0f) * footerWidth), 0, footerWidth);
+      char progressLabel[16];
+      snprintf(progressLabel, sizeof(progressLabel), "%.0f%%", clampedProgress);
+      renderer.fillRectDither(footerX, progressBarY, footerWidth, kFooterProgressBarHeight, Color::LightGray);
+      if (filledWidth > 0) {
+        renderer.fillRect(footerX, progressBarY, filledWidth, kFooterProgressBarHeight, true);
+      }
+      const int progressLabelW = renderer.getTextWidth(footerLabelFontId, progressLabel, EpdFontFamily::REGULAR);
+      const int progressLabelY = progressBarY + kFooterProgressBarHeight + kFooterPercentTopGap;
+      renderer.drawText(footerLabelFontId, footerX + footerWidth - progressLabelW, progressLabelY, progressLabel, true,
+                        EpdFontFamily::REGULAR);
+    }
+
+    coverBufferStored = storeCoverBuffer();
+    coverRendered = coverBufferStored;
+  } else if (lastCenterCoverRect.width <= 0 || lastCenterCoverRect.height <= 0) {
+    lastCenterCoverRect = shrinkCenterCoverRect(centerCoverSlotRect);
+  }
+
+  // Always outline the centre cover at its own edge (white ring sits outside the black line);
+  // thicker when the carousel row is active
+  const int outlineW = inCarouselRow ? kSelectionLineW : kThinOutlineW;
+  renderer.drawRoundedRect(lastCenterCoverRect.x, lastCenterCoverRect.y, lastCenterCoverRect.width,
+                           lastCenterCoverRect.height, outlineW, kCornerRadius, true);
+}
+
+// ---------------------------------------------------------------------------
+// Horizontal icon-only menu row — anchored to bottom of screen
+// ---------------------------------------------------------------------------
+void LyraCarouselTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
+                                       const std::function<std::string(int index)>& buttonLabel,
+                                       const std::function<UIIcon(int index)>& rowIcon) const {
+  if (buttonCount <= 0) return;
+  // Rect is retained by the BaseTheme interface; this carousel menu anchors to the screen bottom.
+
+  const MenuLayoutMetrics metrics = computeMenuLayout(renderer, buttonCount);
+
+  for (int i = 0; i < buttonCount; ++i) {
+    const int tileX = i * metrics.tileW;
+    const int iconX = tileX + (metrics.tileW - kMenuIconSize) / 2;
+    const int iconY = metrics.rowY + kMenuIconPad;
+
+    const bool selected = (selectedIndex == i);
+    if (selected) {
+      const int highlightSize = kMenuIconSize + 2 * kHighlightPad;
+      const int highlightY = metrics.rowY + (metrics.tileH - highlightSize) / 2;
+      renderer.fillRoundedRect(iconX - kHighlightPad, highlightY, highlightSize, highlightSize, kCornerRadius,
+                               Color::Black);
+    }
+
+    if (rowIcon != nullptr) {
+      const UIIcon icon = rowIcon(i);
+      if (icon == UIIcon::BookmarkIcon) {
+        drawMenuBookmarkIcon(renderer, iconX, iconY, selected);
+      } else {
+        const uint8_t* bmp = iconForName(icon, kMenuIconSize);
+        if (bmp != nullptr) {
+          if (selected)
+            renderer.drawIconInverted(bmp, iconX, iconY, kMenuIconSize, kMenuIconSize);
+          else
+            renderer.drawIcon(bmp, iconX, iconY, kMenuIconSize, kMenuIconSize);
+        }
+      }
+    }
+  }
+
+  renderer.fillRect(0, metrics.labelY, renderer.getScreenWidth(), metrics.labelLineHeight, false);
+  if (selectedIndex >= 0 && selectedIndex < buttonCount && buttonLabel != nullptr) {
+    const std::string labelStr = buttonLabel(selectedIndex);
+    const auto centeredLabel =
+        renderer.truncatedText(kMenuLabelFontId, labelStr.c_str(), renderer.getScreenWidth() - 40);
+    const int labelWidth = renderer.getTextWidth(kMenuLabelFontId, centeredLabel.c_str(), EpdFontFamily::REGULAR);
+    renderer.drawText(kMenuLabelFontId, (renderer.getScreenWidth() - labelWidth) / 2, metrics.labelY + 2,
+                      centeredLabel.c_str(), true, EpdFontFamily::REGULAR);
+  }
+}
+
+void LyraCarouselTheme::drawButtonMenuSelectionOverlay(const GfxRenderer& renderer, int buttonCount, int selectedIndex,
+                                                       const std::function<std::string(int index)>& buttonLabel,
+                                                       const std::function<UIIcon(int index)>& rowIcon) const {
+  if (buttonCount <= 0 || selectedIndex < 0 || selectedIndex >= buttonCount) return;
+
+  const MenuLayoutMetrics metrics = computeMenuLayout(renderer, buttonCount);
+
+  const int tileX = selectedIndex * metrics.tileW;
+  const int iconX = tileX + (metrics.tileW - kMenuIconSize) / 2;
+  const int iconY = metrics.rowY + kMenuIconPad;
+  const int highlightSize = kMenuIconSize + 2 * kHighlightPad;
+  const int highlightY = metrics.rowY + (metrics.tileH - highlightSize) / 2;
+
+  renderer.fillRoundedRect(iconX - kHighlightPad, highlightY, highlightSize, highlightSize, kCornerRadius,
+                           Color::Black);
+
+  if (rowIcon != nullptr) {
+    const UIIcon icon = rowIcon(selectedIndex);
+    if (icon == UIIcon::BookmarkIcon) {
+      drawMenuBookmarkIcon(renderer, iconX, iconY, true);
+    } else {
+      const uint8_t* bmp = iconForName(icon, kMenuIconSize);
+      if (bmp != nullptr) {
+        renderer.drawIconInverted(bmp, iconX, iconY, kMenuIconSize, kMenuIconSize);
+      }
+    }
+  }
+
+  renderer.fillRect(0, metrics.labelY, renderer.getScreenWidth(), metrics.labelLineHeight, false);
+  if (buttonLabel != nullptr) {
+    const std::string labelStr = buttonLabel(selectedIndex);
+    const auto centeredLabel =
+        renderer.truncatedText(kMenuLabelFontId, labelStr.c_str(), renderer.getScreenWidth() - 40);
+    const int labelWidth = renderer.getTextWidth(kMenuLabelFontId, centeredLabel.c_str(), EpdFontFamily::REGULAR);
+    renderer.drawText(kMenuLabelFontId, (renderer.getScreenWidth() - labelWidth) / 2, metrics.labelY + 2,
+                      centeredLabel.c_str(), true, EpdFontFamily::REGULAR);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// List — solid black highlight, inverted text and icons on selected row
+// ---------------------------------------------------------------------------
+void LyraCarouselTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                                 const std::function<std::string(int index)>& rowTitle,
+                                 const std::function<std::string(int index)>& rowSubtitle,
+                                 const std::function<UIIcon(int index)>& rowIcon,
+                                 const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                                 const std::function<bool(int index)>& rowDimmed,
+                                 const std::function<bool(int index)>& isHeader) const {
+  drawListWithMetrics(renderer, rect, itemCount, selectedIndex, rowTitle, rowSubtitle, rowIcon, rowValue,
+                      highlightValue, rowDimmed, isHeader, LyraCarouselMetrics::values, true);
+}
diff --git a/src/components/themes/lyra/LyraCarouselTheme.h b/src/components/themes/lyra/LyraCarouselTheme.h
new file mode 100644
index 00000000..0b76b4bc
--- /dev/null
+++ b/src/components/themes/lyra/LyraCarouselTheme.h
@@ -0,0 +1,80 @@
+
+
+#pragma once
+
+#include "components/themes/lyra/LyraTheme.h"
+
+class GfxRenderer;
+
+// Lyra Carousel theme metrics (zero runtime cost)
+namespace LyraCarouselMetrics {
+constexpr ThemeMetrics values = {.batteryWidth = 16,
+                                 .batteryHeight = 12,
+                                 .topPadding = 5,
+                                 .batteryBarHeight = 40,
+                                 .headerHeight = 84,
+                                 .verticalSpacing = 16,
+                                 .contentSidePadding = 20,
+                                 .listRowHeight = 35,
+                                 .listWithSubtitleRowHeight = 60,
+                                 .menuRowHeight = 64,
+                                 .menuSpacing = 8,
+                                 .tabSpacing = 8,
+                                 .tabBarHeight = 40,
+                                 .scrollBarWidth = 4,
+                                 .scrollBarRightOffset = 5,
+                                 .homeTopPadding = 28,
+                                 .homeCoverHeight = 600,
+                                 .homeCoverTileHeight = 660,
+                                 .homeRecentBooksCount = 3,
+                                 .homeContinueReadingInMenu = false,
+                                 .homeMenuTopOffset = 16,
+                                 .buttonHintsHeight = 40,
+                                 .sideButtonHintsWidth = 30,
+                                 .progressBarHeight = 16,
+                                 .progressBarMarginTop = 1,
+                                 .statusBarHorizontalMargin = 5,
+                                 .statusBarVerticalMargin = 19,
+                                 .keyboardKeyWidth = 31,
+                                 .keyboardKeyHeight = 50,
+                                 .keyboardKeySpacing = 0,
+                                 .keyboardBottomKeyHeight = 35,
+                                 .keyboardBottomKeySpacing = 5,
+                                 .keyboardBottomAligned = true,
+                                 .keyboardCenteredText = true,
+                                 .keyboardVerticalOffset = -7,
+                                 .keyboardTextFieldWidthPercent = 85,
+                                 .keyboardWidthPercent = 90,
+                                 .keyboardKeyCornerRadius = 6};
+}
+
+class LyraCarouselTheme : public LyraTheme {
+ public:
+  // Exact pixel dimensions for each carousel slot — used for exact-size thumbnail generation
+  static constexpr int kCenterCoverW = 340;
+  static constexpr int kCenterCoverH = LyraCarouselMetrics::values.homeCoverHeight - 60;  // 540
+  static constexpr int kSideCoverW = 200;
+  static constexpr int kSideCoverH = LyraCarouselMetrics::values.homeCoverHeight - 210;  // 390
+
+  static void setPreRenderIndex(int idx);
+  void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
+                           int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           float progressPercent = -1.0f) const override;
+  void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
+                      const std::function<std::string(int index)>& buttonLabel,
+                      const std::function<UIIcon(int index)>& rowIcon) const override;
+  // LyraTheme has no virtual overlay hook; this is a carousel-only helper.
+  void drawButtonMenuSelectionOverlay(const GfxRenderer& renderer, int buttonCount, int selectedIndex,
+                                      const std::function<std::string(int index)>& buttonLabel,
+                                      const std::function<UIIcon(int index)>& rowIcon) const;
+  void drawCarouselBorder(GfxRenderer& renderer, Rect coverRect, const std::vector<RecentBook>& recentBooks,
+                          int centerIdx, bool inCarouselRow) const override;
+  void drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                const std::function<std::string(int index)>& rowTitle,
+                const std::function<std::string(int index)>& rowSubtitle = {},
+                const std::function<UIIcon(int index)>& rowIcon = {},
+                const std::function<std::string(int index)>& rowValue = {}, bool highlightValue = false,
+                const std::function<bool(int index)>& rowDimmed = {},
+                const std::function<bool(int index)>& isHeader = {}) const override;
+};
diff --git a/src/components/themes/lyra/LyraFlowTheme.cpp b/src/components/themes/lyra/LyraFlowTheme.cpp
index 11b03e17..8d5072ed 100644
--- a/src/components/themes/lyra/LyraFlowTheme.cpp
+++ b/src/components/themes/lyra/LyraFlowTheme.cpp
@@ -85,8 +85,8 @@ void cutRoundedCorners(GfxRenderer& renderer, int x, int y, int w, int h, int r)
 }  // namespace
 
 void LyraFlowTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                        const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                        bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                        int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                        bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                         const BookReadingStats* stats, float /*progressPercent*/) const {
   if (recentBooks.empty()) {
     drawEmptyRecents(renderer, rect);
diff --git a/src/components/themes/lyra/LyraFlowTheme.h b/src/components/themes/lyra/LyraFlowTheme.h
index 7d11305f..9041be4a 100644
--- a/src/components/themes/lyra/LyraFlowTheme.h
+++ b/src/components/themes/lyra/LyraFlowTheme.h
@@ -34,8 +34,8 @@ constexpr ThemeMetrics values = [] {
 class LyraFlowTheme : public LyraTheme {
  public:
   void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                           const int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
-                           std::function<bool()> storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
                            float progressPercent = -1.0f) const override;
   // Flow-only override of the home menu. Two-anchor pagination with a
   // sticky bit so the second page stays in view as the cursor scrolls
diff --git a/src/components/themes/lyra/LyraTheme.cpp b/src/components/themes/lyra/LyraTheme.cpp
index ad38c9b6..de677d90 100644
--- a/src/components/themes/lyra/LyraTheme.cpp
+++ b/src/components/themes/lyra/LyraTheme.cpp
@@ -4,6 +4,7 @@
 #include <HalGPIO.h>
 #include <HalPowerManager.h>
 #include <HalStorage.h>
+#include <HalTiltSensor.h>
 #include <I18n.h>
 
 #include <algorithm>
@@ -40,36 +41,14 @@ constexpr int topHintButtonY = 345;
 constexpr int popupMarginX = 16;
 constexpr int popupMarginY = 12;
 constexpr int maxListValueWidth = 200;
-constexpr int mainMenuIconSize = 32;
-constexpr int listIconSize = 24;
+constexpr uint32_t mainMenuIconSize = 32;
+constexpr uint32_t listIconSize = 24;
 constexpr int mainMenuColumns = 2;
 int coverWidth = 0;
 
-void drawLyraBatteryIcon(const GfxRenderer& renderer, int x, int y, int battWidth, int rectHeight,
-                         uint16_t percentage) {
-  BaseTheme::drawBatteryOutline(renderer, x, y, battWidth, rectHeight);
-
-  const bool charging = gpio.isUsbConnected();
-
-  if (charging) {
-    // Draw solid fill when charging so lightning bolt is visible
-    renderer.fillRect(x + 2, y + 2, battWidth - 5, rectHeight - 4);
-    BaseTheme::drawBatteryLightningBolt(renderer, x + 4, y + 2);
-  } else {
-    // Draw bars when not charging
-    if (percentage > 10) {
-      renderer.fillRect(x + 2, y + 2, 3, rectHeight - 4);
-    }
-    if (percentage > 40) {
-      renderer.fillRect(x + 6, y + 2, 3, rectHeight - 4);
-    }
-    if (percentage > 70) {
-      renderer.fillRect(x + 10, y + 2, 3, rectHeight - 4);
-    }
-  }
-}
+}  // namespace
 
-const uint8_t* iconForName(UIIcon icon, int size) {
+const uint8_t* LyraTheme::iconForName(UIIcon icon, uint32_t size) {
   if (size == 24) {
     switch (icon) {
       case UIIcon::Folder:
@@ -111,37 +90,25 @@ const uint8_t* iconForName(UIIcon icon, int size) {
   }
   return nullptr;
 }
-}  // namespace
 
-void LyraTheme::drawBatteryLeft(const GfxRenderer& renderer, Rect rect, const bool showPercentage) const {
-  // Left aligned: icon on left, percentage on right (reader mode)
-  const uint16_t percentage = powerManager.getBatteryPercentage();
-
-  if (showPercentage) {
-    const auto percentageText = std::to_string(percentage) + "%";
-    renderer.drawText(SMALL_FONT_ID, rect.x + BaseTheme::batteryPercentSpacing + LyraMetrics::values.batteryWidth,
-                      rect.y, percentageText.c_str());
-  }
-
-  drawLyraBatteryIcon(renderer, rect.x, rect.y + 6, LyraMetrics::values.batteryWidth, rect.height, percentage);
-}
+void LyraTheme::fillBatteryIcon(const GfxRenderer& renderer, Rect rect, uint16_t percentage) const {
+  const bool charging = gpio.isUsbConnected();
 
-void LyraTheme::drawBatteryRight(const GfxRenderer& renderer, Rect rect, const bool showPercentage) const {
-  // Right aligned: percentage on left, icon on right (UI headers)
-  const uint16_t percentage = powerManager.getBatteryPercentage();
-
-  if (showPercentage) {
-    const auto percentageText = std::to_string(percentage) + "%";
-    const int textWidth = renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str());
-    // Clear the area where we're going to draw the text to prevent ghosting
-    const auto textHeight = renderer.getTextHeight(SMALL_FONT_ID);
-    renderer.fillRect(rect.x - textWidth - BaseTheme::batteryPercentSpacing, rect.y, textWidth, textHeight, false);
-    // Draw text to the left of the icon
-    renderer.drawText(SMALL_FONT_ID, rect.x - textWidth - BaseTheme::batteryPercentSpacing, rect.y,
-                      percentageText.c_str());
+  if (charging) {
+    // Solid fill when charging so lightning bolt is visible
+    renderer.fillRect(rect.x + 2, rect.y + 2, rect.width - 5, rect.height - 4);
+    drawBatteryLightningBolt(renderer, rect.x + 4, rect.y + 2);
+  } else {
+    if (percentage > 10) {
+      renderer.fillRect(rect.x + 2, rect.y + 2, 3, rect.height - 4);
+    }
+    if (percentage > 40) {
+      renderer.fillRect(rect.x + 6, rect.y + 2, 3, rect.height - 4);
+    }
+    if (percentage > 70) {
+      renderer.fillRect(rect.x + 10, rect.y + 2, 3, rect.height - 4);
+    }
   }
-
-  drawLyraBatteryIcon(renderer, rect.x, rect.y + 6, LyraMetrics::values.batteryWidth, rect.height, percentage);
 }
 
 void LyraTheme::drawHeader(const GfxRenderer& renderer, Rect rect, const char* title, const char* subtitle) const {
@@ -250,45 +217,67 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
                          const std::function<std::string(int index)>& rowSubtitle,
                          const std::function<UIIcon(int index)>& rowIcon,
                          const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                         const std::function<bool(int index)>& rowDimmed,
                          const std::function<bool(int index)>& isHeader) const {
-  int rowHeight =
-      (rowSubtitle != nullptr) ? LyraMetrics::values.listWithSubtitleRowHeight : LyraMetrics::values.listRowHeight;
-  int pageItems = rect.height / rowHeight;
-  constexpr int sectionHeaderTopPadding = 20;
+  drawListWithMetrics(renderer, rect, itemCount, selectedIndex, rowTitle, rowSubtitle, rowIcon, rowValue,
+                      highlightValue, rowDimmed, isHeader, LyraMetrics::values, false);
+}
+
+void LyraTheme::drawListWithMetrics(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                                    const std::function<std::string(int index)>& rowTitle,
+                                    const std::function<std::string(int index)>& rowSubtitle,
+                                    const std::function<UIIcon(int index)>& rowIcon,
+                                    const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                                    const std::function<bool(int index)>& rowDimmed,
+                                    const std::function<bool(int index)>& isHeader, const ThemeMetrics& metrics,
+                                    const bool invertSelectedRows) const {
+  int rowHeight = (rowSubtitle != nullptr) ? metrics.listWithSubtitleRowHeight : metrics.listRowHeight;
+  if (itemCount <= 0) return;
+  const auto isHeaderRow = [&isHeader](int index) { return isHeader != nullptr && isHeader(index); };
+  const int sectionHeaderTopPadding = halTiltSensor.isAvailable() ? 10 : 20;
+  constexpr int sectionHeaderFontId = UI_10_FONT_ID;
+  constexpr int sectionHeaderUnderlineGap = 4;
+  const int sectionHeaderLineHeight = renderer.getLineHeight(sectionHeaderFontId);
+  const int sectionHeaderRowHeight = sectionHeaderLineHeight + sectionHeaderUnderlineGap;
+  const auto visualRowHeight = [&](int index) { return isHeaderRow(index) ? sectionHeaderRowHeight : rowHeight; };
+  int totalContentHeight = 0;
+  for (int i = 0; i < itemCount; ++i) {
+    if (i > 0 && isHeaderRow(i)) totalContentHeight += sectionHeaderTopPadding;
+    totalContentHeight += visualRowHeight(i);
+  }
+  const bool contentFits = totalContentHeight <= rect.height;
+  int pageItems = contentFits ? itemCount : rect.height / rowHeight;
+  if (pageItems <= 0) pageItems = 1;
 
   const int totalPages = (itemCount + pageItems - 1) / pageItems;
-  if (totalPages > 1) {
+  if (!contentFits && totalPages > 1) {
     const int scrollAreaHeight = rect.height;
 
     // Draw scroll bar
     const int scrollBarHeight = (scrollAreaHeight * pageItems) / itemCount;
     const int currentPage = selectedIndex / pageItems;
     const int scrollBarY = rect.y + ((scrollAreaHeight - scrollBarHeight) * currentPage) / (totalPages - 1);
-    const int scrollBarX = rect.x + rect.width - LyraMetrics::values.scrollBarRightOffset;
+    const int scrollBarX = rect.x + rect.width - metrics.scrollBarRightOffset;
     renderer.drawLine(scrollBarX, rect.y, scrollBarX, rect.y + scrollAreaHeight, true);
-    renderer.fillRect(scrollBarX - LyraMetrics::values.scrollBarWidth, scrollBarY, LyraMetrics::values.scrollBarWidth,
-                      scrollBarHeight, true);
+    renderer.fillRect(scrollBarX - metrics.scrollBarWidth, scrollBarY, metrics.scrollBarWidth, scrollBarHeight, true);
   }
 
   // Draw selection (skip header rows)
-  int contentWidth =
-      rect.width -
-      (totalPages > 1 ? (LyraMetrics::values.scrollBarWidth + LyraMetrics::values.scrollBarRightOffset) : 1);
+  int contentWidth = rect.width - (totalPages > 1 ? (metrics.scrollBarWidth + metrics.scrollBarRightOffset) : 1);
   const auto pageStartIndex = selectedIndex / pageItems * pageItems;
-  if (selectedIndex >= 0 && !(isHeader && isHeader(selectedIndex))) {
+  if (selectedIndex >= 0 && !isHeaderRow(selectedIndex)) {
     int selY = rect.y;
     for (int j = pageStartIndex; j < selectedIndex; j++) {
-      selY += rowHeight;
-      if (isHeader && isHeader(j + 1)) selY += sectionHeaderTopPadding;
+      selY += visualRowHeight(j);
+      if (isHeaderRow(j + 1)) selY += sectionHeaderTopPadding;
     }
-    renderer.fillRoundedRect(rect.x + LyraMetrics::values.contentSidePadding, selY,
-                             contentWidth - LyraMetrics::values.contentSidePadding * 2, rowHeight, cornerRadius,
-                             Color::LightGray);
+    renderer.fillRoundedRect(rect.x + metrics.contentSidePadding, selY, contentWidth - metrics.contentSidePadding * 2,
+                             rowHeight, cornerRadius, invertSelectedRows ? Color::Black : Color::LightGray);
   }
 
-  int textX = rect.x + LyraMetrics::values.contentSidePadding + hPaddingInSelection;
-  int textWidth = contentWidth - LyraMetrics::values.contentSidePadding * 2 - hPaddingInSelection * 2;
-  int iconSize;
+  int textX = rect.x + metrics.contentSidePadding + hPaddingInSelection;
+  int textWidth = contentWidth - metrics.contentSidePadding * 2 - hPaddingInSelection * 2;
+  uint32_t iconSize;
   if (rowIcon != nullptr) {
     iconSize = (rowSubtitle != nullptr) ? mainMenuIconSize : listIconSize;
     textX += iconSize + hPaddingInSelection;
@@ -299,20 +288,25 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
   int iconY = (rowSubtitle != nullptr) ? 16 : 10;
   int currentY = rect.y;
   for (int i = pageStartIndex; i < itemCount && i < pageStartIndex + pageItems; i++) {
-    if (i > pageStartIndex && isHeader && isHeader(i)) currentY += sectionHeaderTopPadding;
+    if (i > pageStartIndex && isHeaderRow(i)) currentY += sectionHeaderTopPadding;
     const int itemY = currentY;
-    currentY += rowHeight;
+    const int currentRowHeight = visualRowHeight(i);
+    currentY += currentRowHeight;
+    const bool selectedRow = i == selectedIndex;
+    const bool foreground = !(invertSelectedRows && selectedRow);
 
-    if (isHeader && isHeader(i)) {
+    if (isHeaderRow(i)) {
       // Section header: bold uppercase label + divider line below
       std::string label = rowTitle(i);
       std::transform(label.begin(), label.end(), label.begin(),
                      [](unsigned char c) { return static_cast<char>(std::toupper(c)); });
-      auto truncated = renderer.truncatedText(
-          UI_10_FONT_ID, label.c_str(), contentWidth - LyraMetrics::values.contentSidePadding * 2, EpdFontFamily::BOLD);
-      renderer.drawText(UI_10_FONT_ID, rect.x + LyraMetrics::values.contentSidePadding, itemY + 7, truncated.c_str(),
-                        true, EpdFontFamily::BOLD);
-      renderer.drawLine(rect.x, itemY + rowHeight - 1, rect.x + contentWidth, itemY + rowHeight - 1, true);
+      auto truncated = renderer.truncatedText(sectionHeaderFontId, label.c_str(),
+                                              contentWidth - metrics.contentSidePadding * 2, EpdFontFamily::BOLD);
+      const int headerTextY = itemY;
+      renderer.drawText(sectionHeaderFontId, rect.x + metrics.contentSidePadding, headerTextY, truncated.c_str(), true,
+                        EpdFontFamily::BOLD);
+      renderer.drawLine(rect.x, itemY + currentRowHeight - 1, rect.x + contentWidth, itemY + currentRowHeight - 1,
+                        true);
       continue;
     }
 
@@ -330,14 +324,27 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
 
     auto itemName = rowTitle(i);
     auto item = renderer.truncatedText(UI_10_FONT_ID, itemName.c_str(), rowTextWidth);
-    renderer.drawText(UI_10_FONT_ID, textX, itemY + 7, item.c_str(), true);
+    renderer.drawText(UI_10_FONT_ID, textX, itemY + 7, item.c_str(), foreground);
+
+    // Apply checkerboard dither to create gray text effect for dimmed items
+    if (rowDimmed && rowDimmed(i) && !selectedRow) {
+      const int titleWidth = renderer.getTextWidth(UI_10_FONT_ID, item.c_str());
+      const int lineH = renderer.getLineHeight(UI_10_FONT_ID);
+      for (int py = itemY + 7; py < itemY + 7 + lineH; py++)
+        for (int px = textX; px < textX + titleWidth; px++)
+          if ((px + py) % 2 == 0) renderer.drawPixel(px, py, false);
+    }
 
     if (rowIcon != nullptr) {
       UIIcon icon = rowIcon(i);
       const uint8_t* iconBitmap = iconForName(icon, iconSize);
       if (iconBitmap != nullptr) {
-        renderer.drawIcon(iconBitmap, rect.x + LyraMetrics::values.contentSidePadding + hPaddingInSelection,
-                          itemY + iconY, iconSize, iconSize);
+        const int iconX = rect.x + metrics.contentSidePadding + hPaddingInSelection;
+        if (invertSelectedRows && selectedRow) {
+          renderer.drawIconInverted(iconBitmap, iconX, itemY + iconY, iconSize, iconSize);
+        } else {
+          renderer.drawIcon(iconBitmap, iconX, itemY + iconY, iconSize, iconSize);
+        }
       }
     }
 
@@ -345,34 +352,39 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
       // Draw subtitle
       std::string subtitleText = rowSubtitle(i);
       auto subtitle = renderer.truncatedText(SMALL_FONT_ID, subtitleText.c_str(), rowTextWidth);
-      renderer.drawText(SMALL_FONT_ID, textX, itemY + 30, subtitle.c_str(), true);
+      renderer.drawText(SMALL_FONT_ID, textX, itemY + 30, subtitle.c_str(), foreground);
     }
 
     // Draw value
     if (!valueText.empty()) {
-      if (i == selectedIndex && highlightValue) {
-        renderer.fillRoundedRect(
-            rect.x + contentWidth - LyraMetrics::values.contentSidePadding - hPaddingInSelection - valueWidth, itemY,
-            valueWidth + hPaddingInSelection, rowHeight, cornerRadius, Color::Black);
+      if (selectedRow && highlightValue) {
+        renderer.fillRoundedRect(rect.x + contentWidth - metrics.contentSidePadding - hPaddingInSelection - valueWidth,
+                                 itemY, valueWidth + hPaddingInSelection, rowHeight, cornerRadius, Color::Black);
       }
 
-      renderer.drawText(UI_10_FONT_ID, rect.x + contentWidth - LyraMetrics::values.contentSidePadding - valueWidth,
-                        itemY + 6, valueText.c_str(), !(i == selectedIndex && highlightValue));
+      int valueY = itemY + 6;
+      if (rowSubtitle != nullptr) {
+        valueY = itemY + 16;
+      }
+      const bool valueForeground = invertSelectedRows ? !selectedRow : !(selectedRow && highlightValue);
+      renderer.drawText(UI_10_FONT_ID, rect.x + contentWidth - metrics.contentSidePadding - valueWidth, valueY,
+                        valueText.c_str(), valueForeground);
     }
   }
 }
 
 void LyraTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                                const char* btn4) const {
+                                const char* btn4, const bool allowInvertedText) const {
   const GfxRenderer::Orientation orig_orientation = renderer.getOrientation();
-  renderer.setOrientation(GfxRenderer::Orientation::Portrait);
+  const bool invertText = allowInvertedText && orig_orientation == GfxRenderer::Orientation::PortraitInverted;
+  renderer.setOrientation(invertText ? GfxRenderer::Orientation::PortraitInverted : GfxRenderer::Orientation::Portrait);
 
   const int pageHeight = renderer.getScreenHeight();
   constexpr int buttonWidth = 80;
   constexpr int smallButtonHeight = 15;
   constexpr int buttonHeight = LyraMetrics::values.buttonHintsHeight;
-  constexpr int buttonY = LyraMetrics::values.buttonHintsHeight;  // Distance from bottom
-  constexpr int textYOffset = 7;                                  // Distance from top of button to text baseline
+  const int buttonY = invertText ? pageHeight : LyraMetrics::values.buttonHintsHeight;
+  constexpr int textYOffset = 7;  // Distance from top of button to text baseline
   // X3 has wider screen in portrait (528 vs 480), use more spacing
   constexpr int x4ButtonPositions[] = {58, 146, 254, 342};
   constexpr int x3ButtonPositions[] = {65, 157, 291, 383};
@@ -380,7 +392,7 @@ void LyraTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const c
   const char* labels[] = {btn1, btn2, btn3, btn4};
 
   for (int i = 0; i < 4; i++) {
-    const int x = buttonPositions[i];
+    const int x = buttonPositions[invertText ? 3 - i : i];
     if (labels[i] != nullptr && labels[i][0] != '\0') {
       // Draw the filled background and border for a FULL-sized button
       renderer.fillRoundedRect(x, pageHeight - buttonY, buttonWidth, buttonHeight, cornerRadius, Color::White);
@@ -391,10 +403,10 @@ void LyraTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const c
       renderer.drawText(SMALL_FONT_ID, textX, pageHeight - buttonY + textYOffset, labels[i]);
     } else {
       // Draw the filled background and border for a SMALL-sized button
-      renderer.fillRoundedRect(x, pageHeight - smallButtonHeight, buttonWidth, smallButtonHeight, cornerRadius,
-                               Color::White);
-      renderer.drawRoundedRect(x, pageHeight - smallButtonHeight, buttonWidth, smallButtonHeight, 1, cornerRadius, true,
-                               true, false, false, true);
+      const int smallButtonY = invertText ? 0 : pageHeight - smallButtonHeight;
+      renderer.fillRoundedRect(x, smallButtonY, buttonWidth, smallButtonHeight, cornerRadius, Color::White);
+      renderer.drawRoundedRect(x, smallButtonY, buttonWidth, smallButtonHeight, 1, cornerRadius, true, true, false,
+                               false, true);
     }
   }
 
@@ -451,8 +463,8 @@ void LyraTheme::drawSideButtonHints(const GfxRenderer& renderer, const char* top
 }
 
 void LyraTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                    const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                    bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                    int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                    bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                     const BookReadingStats* stats, float progressPercent) const {
   const int tileWidth = rect.width - 2 * LyraMetrics::values.contentSidePadding;
   const int tileHeight = rect.height;
diff --git a/src/components/themes/lyra/LyraTheme.h b/src/components/themes/lyra/LyraTheme.h
index 663e9294..849678e5 100644
--- a/src/components/themes/lyra/LyraTheme.h
+++ b/src/components/themes/lyra/LyraTheme.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 #include "components/themes/BaseTheme.h"
 
 class GfxRenderer;
@@ -13,7 +15,7 @@ constexpr ThemeMetrics values = {.batteryWidth = 16,
                                  .headerHeight = 84,
                                  .verticalSpacing = 16,
                                  .contentSidePadding = 20,
-                                 .listRowHeight = 40,
+                                 .listRowHeight = 36,
                                  .listWithSubtitleRowHeight = 60,
                                  .menuRowHeight = 56,
                                  .menuSpacing = 6,
@@ -49,9 +51,7 @@ constexpr ThemeMetrics values = {.batteryWidth = 16,
 class LyraTheme : public BaseTheme {
  public:
   // Component drawing methods
-  //   void drawProgressBar(const GfxRenderer& renderer, Rect rect, size_t current, size_t total) override;
-  void drawBatteryLeft(const GfxRenderer& renderer, Rect rect, bool showPercentage = true) const override;
-  void drawBatteryRight(const GfxRenderer& renderer, Rect rect, bool showPercentage = true) const override;
+  void fillBatteryIcon(const GfxRenderer& renderer, Rect rect, uint16_t percentage) const override;
   void drawHeader(const GfxRenderer& renderer, Rect rect, const char* title, const char* subtitle) const override;
   void drawSubHeader(const GfxRenderer& renderer, Rect rect, const char* label,
                      const char* rightLabel = nullptr) const override;
@@ -61,19 +61,33 @@ class LyraTheme : public BaseTheme {
                 const std::function<std::string(int index)>& rowTitle,
                 const std::function<std::string(int index)>& rowSubtitle,
                 const std::function<UIIcon(int index)>& rowIcon, const std::function<std::string(int index)>& rowValue,
-                bool highlightValue, const std::function<bool(int index)>& isHeader) const override;
-  void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                       const char* btn4) const override;
+                bool highlightValue, const std::function<bool(int index)>& rowDimmed = nullptr,
+                const std::function<bool(int index)>& isHeader = nullptr) const override;
+  void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3, const char* btn4,
+                       bool allowInvertedText = false) const override;
   void drawSideButtonHints(const GfxRenderer& renderer, const char* topBtn, const char* bottomBtn) const override;
   void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
                       const std::function<std::string(int index)>& buttonLabel,
                       const std::function<UIIcon(int index)>& rowIcon) const override;
   void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                           const int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
-                           std::function<bool()> storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
                            float progressPercent = -1.0f) const override;
   void drawEmptyRecents(const GfxRenderer& renderer, const Rect rect) const;
   Rect drawPopup(const GfxRenderer& renderer, const char* message) const override;
   void fillPopupProgress(const GfxRenderer& renderer, const Rect& layout, const int progress) const override;
   bool showsFileIcons() const override { return true; }
+
+ protected:
+  void drawListWithMetrics(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                           const std::function<std::string(int index)>& rowTitle,
+                           const std::function<std::string(int index)>& rowSubtitle,
+                           const std::function<UIIcon(int index)>& rowIcon,
+                           const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                           const std::function<bool(int index)>& rowDimmed,
+                           const std::function<bool(int index)>& isHeader, const ThemeMetrics& metrics,
+                           bool invertSelectedRows) const;
+
+  // Returns nullptr when the icon or requested bitmap size is not available.
+  static const uint8_t* iconForName(UIIcon icon, uint32_t size);
 };
diff --git a/src/components/themes/minimal/MinimalTheme.cpp b/src/components/themes/minimal/MinimalTheme.cpp
new file mode 100644
index 00000000..8d2228ce
--- /dev/null
+++ b/src/components/themes/minimal/MinimalTheme.cpp
@@ -0,0 +1,506 @@
+#include "MinimalTheme.h"
+
+#include <Arduino.h>
+#include <Bitmap.h>
+#include <GfxRenderer.h>
+#include <HalPowerManager.h>
+#include <HalStorage.h>
+#include <I18n.h>
+
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <string>
+#include <vector>
+
+#include "RecentBooksStore.h"
+#include "activities/reader/BookReadingStats.h"
+#include "components/UITheme.h"
+#include "components/icons/cover.h"
+#include "fontIds.h"
+
+namespace {
+struct MinimalQuote {
+  const char* text;
+  const char* author;
+};
+
+constexpr MinimalQuote kQuotes[] = {
+    {"\"A book is a dream you hold in your hands.\"", "Neil Gaiman"},
+    {"\"I have always imagined that Paradise will be a kind of library.\"", "Jorge Luis Borges"},
+    {"\"A reader lives a thousand lives before he dies. The man who never reads lives only one.\"",
+     "George R.R. Martin"},
+    {"\"So many books, so little time.\"", "Frank Zappa"},
+    {"\"If you only read the books that everyone else is reading, you can only think what everyone else is thinking.\"",
+     "Haruki Murakami"},
+};
+
+constexpr int kCoverCornerRadius = 8;
+constexpr int kProgressBarHeight = 6;
+constexpr int kButtonCornerRadius = 6;
+constexpr int kFileBrowserIconSize = 24;
+constexpr int kFileBrowserRowVerticalPadding = 6;
+constexpr int kFileBrowserTextGap = 8;
+constexpr int kFileBrowserValueMaxWidth = 76;
+constexpr int kFileBrowserFolderTextYOffset = 7;
+constexpr int kFileBrowserFolderIconYOffset = 10;
+constexpr int kFileBrowserFolderValueYOffset = 6;
+constexpr int kMenuPanelWidth = 384;
+constexpr int kMenuRowHeight = 64;
+constexpr int kMenuPanelTop = 210;
+constexpr int kMenuPanelRadius = 3;
+constexpr int kMenuSelectionTriangleWidth = 14;
+constexpr int kMenuSelectionTriangleHeight = 20;
+constexpr int kMenuSelectionTriangleInset = 30;
+constexpr int kCoverTopOffset = 0;
+constexpr int kProgressBlockGap = 8;
+constexpr int kProgressBarGap = 4;
+constexpr int kProgressLabelGap = 5;
+int homeButtonHintSelection = -1;
+
+Rect coverRectForScreen(const GfxRenderer& renderer, const Rect& rect) {
+  const int coverH = MinimalMetrics::values.homeCoverHeight;
+  const int coverW = static_cast<int>((static_cast<int64_t>(coverH) * 3 + 2) / 5);
+  const int coverX = (renderer.getScreenWidth() - coverW) / 2;
+  const int coverY = rect.y + kCoverTopOffset;
+  return Rect{coverX, coverY, coverW, coverH};
+}
+
+Rect fittedBitmapRect(const Bitmap& bitmap, const Rect& target) {
+  if (bitmap.getWidth() <= 0 || bitmap.getHeight() <= 0 || target.width <= 0 || target.height <= 0) {
+    return target;
+  }
+
+  const float widthScale = static_cast<float>(target.width) / static_cast<float>(bitmap.getWidth());
+  const float heightScale = static_cast<float>(target.height) / static_cast<float>(bitmap.getHeight());
+  const float scale = std::min(1.0f, std::min(widthScale, heightScale));
+  const int drawnW = std::min(target.width, std::max(1, static_cast<int>(std::ceil(bitmap.getWidth() * scale))));
+  const int drawnH = std::min(target.height, std::max(1, static_cast<int>(std::ceil(bitmap.getHeight() * scale))));
+  return Rect{target.x + (target.width - drawnW) / 2, target.y + (target.height - drawnH) / 2, drawnW, drawnH};
+}
+
+uint8_t selectedQuoteIndex() {
+  static bool initialized = false;
+  static uint8_t index = 0;
+  if (!initialized) {
+    index = static_cast<uint8_t>((millis() / 137u) % (sizeof(kQuotes) / sizeof(kQuotes[0])));
+    initialized = true;
+  }
+  return index;
+}
+
+void drawProgressBlock(const GfxRenderer& renderer, const Rect& coverRect, const BookReadingStats* stats,
+                       float progressPercent) {
+  if ((stats == nullptr || stats->totalReadingSeconds == 0) && progressPercent < 0.0f) {
+    return;
+  }
+
+  const int barW = coverRect.width;
+  const int barX = coverRect.x;
+  const int durationY = coverRect.y + coverRect.height + kProgressBlockGap;
+  const int barY = durationY + renderer.getLineHeight(UI_10_FONT_ID) + kProgressBarGap;
+
+  if (stats != nullptr && stats->totalReadingSeconds > 0) {
+    char duration[32];
+    BookReadingStats::formatDuration(stats->totalReadingSeconds, duration, sizeof(duration));
+    renderer.drawText(UI_10_FONT_ID, barX, durationY, duration);
+  }
+
+  if (progressPercent < 0.0f) {
+    return;
+  }
+
+  const int progress = std::clamp(static_cast<int>(progressPercent + 0.5f), 0, 100);
+  const int fillW = (barW * progress) / 100;
+  renderer.fillRectDither(barX, barY, barW, kProgressBarHeight, Color::LightGray);
+  if (fillW > 0) {
+    renderer.fillRectDither(barX, barY, fillW, kProgressBarHeight, Color::DarkGray);
+  }
+
+  char progressLabel[12];
+  snprintf(progressLabel, sizeof(progressLabel), "%d%%", progress);
+  const int labelW = renderer.getTextWidth(UI_10_FONT_ID, progressLabel);
+  renderer.drawText(UI_10_FONT_ID, barX + barW - labelW, barY + kProgressBarHeight + kProgressLabelGap, progressLabel);
+}
+
+void drawMissingBookCover(const GfxRenderer& renderer, const Rect& coverRect, const RecentBook& book) {
+  constexpr int commonBookCoverHeightRatio = 3;
+  constexpr int commonBookCoverWidthRatio = 2;
+  const int placeholderHeight =
+      std::min(coverRect.height, (coverRect.width * commonBookCoverHeightRatio) / commonBookCoverWidthRatio);
+  const Rect placeholderRect{coverRect.x, coverRect.y + (coverRect.height - placeholderHeight) / 2, coverRect.width,
+                             placeholderHeight};
+
+  renderer.fillRoundedRect(placeholderRect.x, placeholderRect.y, placeholderRect.width, placeholderRect.height,
+                           kCoverCornerRadius, Color::White);
+  renderer.drawRoundedRect(placeholderRect.x, placeholderRect.y, placeholderRect.width, placeholderRect.height, 1,
+                           kCoverCornerRadius, true);
+
+  const int dividerY = placeholderRect.y + placeholderRect.height / 3;
+  renderer.drawLine(placeholderRect.x, dividerY, placeholderRect.x + placeholderRect.width - 1, dividerY, true);
+
+  constexpr int iconSize = 32;
+  renderer.drawIcon(CoverIcon, placeholderRect.x + (placeholderRect.width - iconSize) / 2,
+                    placeholderRect.y + (placeholderRect.height / 3 - iconSize) / 2, iconSize, iconSize);
+
+  constexpr int textPadding = 16;
+  constexpr int textVerticalPadding = 22;
+  constexpr int titleAuthorGap = 28;
+  const int textW = placeholderRect.width - textPadding * 2;
+  const std::string& titleText = book.title.empty() ? book.path : book.title;
+  const int titleLineHeight = renderer.getLineHeight(UI_12_FONT_ID);
+  const int authorLineHeight = renderer.getLineHeight(UI_10_FONT_ID);
+  const bool hasAuthor = !book.author.empty();
+  auto authorLines =
+      hasAuthor ? renderer.wrappedText(UI_10_FONT_ID, book.author.c_str(), textW, 2) : std::vector<std::string>{};
+  const int lowerAreaHeight = placeholderRect.y + placeholderRect.height - dividerY;
+  const int authorBlockHeight = authorLineHeight * static_cast<int>(authorLines.size());
+  const int authorGap = authorLines.empty() ? 0 : titleAuthorGap;
+  const int availableTitleHeight = lowerAreaHeight - textVerticalPadding * 2 - authorBlockHeight - authorGap;
+  const int maxTitleLines = std::clamp(availableTitleHeight / titleLineHeight, 1, 4);
+  auto titleLines = renderer.wrappedText(UI_12_FONT_ID, titleText.c_str(), textW, maxTitleLines);
+
+  const int titleBlockHeight = titleLineHeight * static_cast<int>(titleLines.size());
+  const int totalTextHeight = titleBlockHeight + authorBlockHeight + authorGap;
+  int textY = dividerY + std::max(textVerticalPadding, (lowerAreaHeight - totalTextHeight) / 2);
+
+  for (const auto& line : titleLines) {
+    const int lineW = renderer.getTextWidth(UI_12_FONT_ID, line.c_str());
+    renderer.drawText(UI_12_FONT_ID, placeholderRect.x + (placeholderRect.width - lineW) / 2, textY, line.c_str());
+    textY += titleLineHeight;
+  }
+
+  if (!authorLines.empty()) {
+    textY += titleAuthorGap;
+    for (const auto& line : authorLines) {
+      const int lineW = renderer.getTextWidth(UI_10_FONT_ID, line.c_str());
+      renderer.drawText(UI_10_FONT_ID, placeholderRect.x + (placeholderRect.width - lineW) / 2, textY, line.c_str());
+      textY += authorLineHeight;
+    }
+  }
+}
+}  // namespace
+
+void MinimalTheme::drawHeader(const GfxRenderer& renderer, Rect rect, const char* title, const char* subtitle) const {
+  (void)subtitle;
+
+  renderer.fillRect(rect.x, rect.y, rect.width, rect.height, false);
+  const bool showBatteryPercentage =
+      SETTINGS.hideBatteryPercentage != CrossPointSettings::HIDE_BATTERY_PERCENTAGE::HIDE_ALWAYS;
+  const int batteryX = rect.x + rect.width - 12 - MinimalMetrics::values.batteryWidth;
+  drawBatteryRight(
+      renderer, Rect{batteryX, rect.y + 5, MinimalMetrics::values.batteryWidth, MinimalMetrics::values.batteryHeight},
+      showBatteryPercentage);
+
+  if (title) {
+    constexpr int titleInsetX = 12;
+    const int maxTitleWidth = batteryX - rect.x - titleInsetX - MinimalMetrics::values.contentSidePadding;
+    auto truncatedTitle = renderer.truncatedText(UI_12_FONT_ID, title, maxTitleWidth, EpdFontFamily::BOLD);
+    renderer.drawText(UI_12_FONT_ID, rect.x + titleInsetX, rect.y + MinimalMetrics::values.batteryBarHeight + 3,
+                      truncatedTitle.c_str(), true, EpdFontFamily::BOLD);
+    renderer.drawLine(rect.x, rect.y + rect.height - 3, rect.x + rect.width - 1, rect.y + rect.height - 3, 3, true);
+  }
+}
+
+void MinimalTheme::drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
+                              const bool selected) const {
+  (void)selected;
+
+  if (tabs.empty()) {
+    return;
+  }
+
+  const int tabCount = static_cast<int>(tabs.size());
+  const int lineY = rect.y + rect.height - 1;
+  renderer.drawLine(rect.x, rect.y, rect.x + rect.width - 1, rect.y, true);
+  renderer.drawLine(rect.x, lineY, rect.x + rect.width - 1, lineY, true);
+
+  for (int i = 0; i < tabCount; i++) {
+    const int slotX = rect.x + (i * rect.width) / tabCount;
+    const int nextSlotX = rect.x + ((i + 1) * rect.width) / tabCount;
+    const int slotWidth = nextSlotX - slotX;
+    const auto& tab = tabs[i];
+    const auto fontStyle = tab.selected ? EpdFontFamily::BOLD : EpdFontFamily::REGULAR;
+    const int textWidth = renderer.getTextWidth(UI_10_FONT_ID, tab.label, fontStyle);
+    const int textX = slotX + (slotWidth - textWidth) / 2;
+    const int textY = rect.y + (rect.height - renderer.getLineHeight(UI_10_FONT_ID)) / 2;
+    renderer.drawText(UI_10_FONT_ID, textX, textY, tab.label, true, fontStyle);
+  }
+}
+
+int MinimalTheme::compactFileBrowserRowHeight(const GfxRenderer& renderer) const {
+  const int textHeight = renderer.getLineHeight(UI_10_FONT_ID) * 2 + kFileBrowserRowVerticalPadding;
+  return std::max(kFileBrowserIconSize + kFileBrowserRowVerticalPadding, textHeight);
+}
+
+void MinimalTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                            const std::function<std::string(int index)>& rowTitle,
+                            const std::function<std::string(int index)>& rowSubtitle,
+                            const std::function<UIIcon(int index)>& rowIcon,
+                            const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                            const std::function<bool(int index)>& rowDimmed,
+                            const std::function<bool(int index)>& isHeader) const {
+  const bool compactFileRows = rowSubtitle != nullptr && rowIcon != nullptr && rowValue != nullptr;
+  if (!compactFileRows) {
+    LyraTheme::drawList(renderer, rect, itemCount, selectedIndex, rowTitle, rowSubtitle, rowIcon, rowValue,
+                        highlightValue, rowDimmed, isHeader);
+    return;
+  }
+
+  if (itemCount <= 0) return;
+
+  const int fileRowHeight = compactFileBrowserRowHeight(renderer);
+  const int lineHeight = renderer.getLineHeight(UI_10_FONT_ID);
+  const int folderRowHeight = MinimalMetrics::values.listRowHeight;
+  const auto isFolderRow = [&](int index) { return rowSubtitle(index) == "folder"; };
+  const auto rowHeightFor = [&](int index) { return isFolderRow(index) ? folderRowHeight : fileRowHeight; };
+  const auto pageEndFor = [&](int startIndex) {
+    int usedHeight = 0;
+    int endIndex = startIndex;
+    while (endIndex < itemCount) {
+      const int nextRowHeight = rowHeightFor(endIndex);
+      if (endIndex > startIndex && usedHeight + nextRowHeight > rect.height) break;
+      usedHeight += nextRowHeight;
+      endIndex++;
+    }
+    return std::max(startIndex + 1, endIndex);
+  };
+
+  int pageStartIndex = 0;
+  int pageEndIndex = pageEndFor(pageStartIndex);
+  while (selectedIndex >= pageEndIndex && pageEndIndex < itemCount) {
+    pageStartIndex = pageEndIndex;
+    pageEndIndex = pageEndFor(pageStartIndex);
+  }
+
+  int totalPages = 0;
+  int currentPage = 0;
+  for (int pageStart = 0; pageStart < itemCount;) {
+    if (pageStart == pageStartIndex) currentPage = totalPages;
+    totalPages++;
+    const int nextPageStart = pageEndFor(pageStart);
+    if (nextPageStart <= pageStart) break;
+    pageStart = nextPageStart;
+  }
+
+  const int contentWidth =
+      rect.width -
+      (totalPages > 1 ? (MinimalMetrics::values.scrollBarWidth + MinimalMetrics::values.scrollBarRightOffset) : 1);
+
+  if (totalPages > 1) {
+    const int scrollAreaHeight = rect.height;
+    const int scrollBarHeight = std::max(MinimalMetrics::values.scrollBarWidth, scrollAreaHeight / totalPages);
+    const int scrollBarY = rect.y + ((scrollAreaHeight - scrollBarHeight) * currentPage) / (totalPages - 1);
+    const int scrollBarX = rect.x + rect.width - MinimalMetrics::values.scrollBarRightOffset;
+    renderer.drawLine(scrollBarX, rect.y, scrollBarX, rect.y + scrollAreaHeight, true);
+    renderer.fillRect(scrollBarX - MinimalMetrics::values.scrollBarWidth, scrollBarY,
+                      MinimalMetrics::values.scrollBarWidth, scrollBarHeight, true);
+  }
+
+  if (selectedIndex >= 0) {
+    int selectedY = rect.y;
+    for (int i = pageStartIndex; i < selectedIndex; i++) {
+      selectedY += rowHeightFor(i);
+    }
+    const int selectedRowHeight = rowHeightFor(selectedIndex);
+    renderer.fillRoundedRect(rect.x + MinimalMetrics::values.contentSidePadding, selectedY,
+                             contentWidth - MinimalMetrics::values.contentSidePadding * 2, selectedRowHeight, 6,
+                             Color::LightGray);
+  }
+
+  const int iconX = rect.x + MinimalMetrics::values.contentSidePadding + kFileBrowserTextGap;
+  const int textX = iconX + kFileBrowserIconSize + kFileBrowserTextGap;
+
+  int itemY = rect.y;
+  for (int i = pageStartIndex; i < itemCount && i < pageEndIndex; i++) {
+    const int rowHeight = rowHeightFor(i);
+    const bool folderRow = isFolderRow(i);
+    const bool selectedRow = i == selectedIndex;
+
+    std::string valueText = rowValue(i);
+    if (!valueText.empty()) {
+      valueText = renderer.truncatedText(UI_10_FONT_ID, valueText.c_str(), kFileBrowserValueMaxWidth);
+    }
+    const int valueWidth = valueText.empty() ? 0 : renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
+    const int valueGap = valueText.empty() ? 0 : kFileBrowserTextGap;
+    const int textWidth =
+        std::max(1, contentWidth - textX - MinimalMetrics::values.contentSidePadding - valueWidth - valueGap);
+
+    const uint8_t* iconBitmap = iconForName(rowIcon(i), kFileBrowserIconSize);
+    if (iconBitmap != nullptr) {
+      const int iconY =
+          folderRow ? itemY + kFileBrowserFolderIconYOffset : itemY + (rowHeight - kFileBrowserIconSize) / 2;
+      renderer.drawIcon(iconBitmap, iconX, iconY, kFileBrowserIconSize, kFileBrowserIconSize);
+    }
+
+    const int maxTitleLines = folderRow ? 1 : 2;
+    auto lines = renderer.wrappedText(UI_10_FONT_ID, rowTitle(i).c_str(), textWidth, maxTitleLines);
+    const int textBlockHeight = static_cast<int>(lines.size()) * lineHeight;
+    int textY = folderRow ? itemY + kFileBrowserFolderTextYOffset : itemY + (rowHeight - textBlockHeight) / 2;
+    for (const auto& line : lines) {
+      renderer.drawText(UI_10_FONT_ID, textX, textY, line.c_str(), true);
+      textY += lineHeight;
+    }
+
+    if (!valueText.empty()) {
+      const int valueY = folderRow ? itemY + kFileBrowserFolderValueYOffset : itemY + (rowHeight - lineHeight) / 2;
+      renderer.drawText(UI_10_FONT_ID, rect.x + contentWidth - MinimalMetrics::values.contentSidePadding - valueWidth,
+                        valueY, valueText.c_str(), true);
+    }
+
+    if (rowDimmed && rowDimmed(i) && !selectedRow) {
+      const int dimHeight = std::max(lineHeight, textBlockHeight);
+      for (int py = itemY; py < itemY + dimHeight; py++) {
+        for (int px = textX; px < textX + textWidth; px++) {
+          if ((px + py) % 2 == 0) renderer.drawPixel(px, py, false);
+        }
+      }
+    }
+    itemY += rowHeight;
+  }
+}
+
+void MinimalTheme::setHomeButtonHintSelection(const int selectedIndex) { homeButtonHintSelection = selectedIndex; }
+
+void MinimalTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
+                                   const char* btn4, const bool allowInvertedText) const {
+  const GfxRenderer::Orientation origOrientation = renderer.getOrientation();
+  const bool invertText = allowInvertedText && origOrientation == GfxRenderer::Orientation::PortraitInverted;
+  renderer.setOrientation(invertText ? GfxRenderer::Orientation::PortraitInverted : GfxRenderer::Orientation::Portrait);
+
+  const int pageHeight = renderer.getScreenHeight();
+  const int screenWidth = renderer.getScreenWidth();
+  constexpr int buttonWidth = 80;
+  constexpr int smallButtonHeight = 15;
+  constexpr int buttonHeight = MinimalMetrics::values.buttonHintsHeight;
+  const int buttonY = invertText ? pageHeight : MinimalMetrics::values.buttonHintsHeight;
+  constexpr int textYOffset = 7;
+  constexpr int x4ButtonPositions[] = {58, 146, 254, 342};
+  constexpr int x3ButtonPositions[] = {65, 157, 291, 383};
+  const int* buttonPositions = screenWidth > 500 ? x3ButtonPositions : x4ButtonPositions;
+  const char* labels[] = {btn1, btn2, btn3, btn4};
+  const int selectedIndex = homeButtonHintSelection;
+  homeButtonHintSelection = -1;
+
+  for (int i = 0; i < 4; i++) {
+    const int x = buttonPositions[invertText ? 3 - i : i];
+    const bool hasLabel = labels[i] != nullptr && labels[i][0] != '\0';
+    if (hasLabel) {
+      const Color background = i == selectedIndex ? Color::LightGray : Color::White;
+      renderer.fillRoundedRect(x, pageHeight - buttonY, buttonWidth, buttonHeight, kButtonCornerRadius, background);
+      renderer.drawRoundedRect(x, pageHeight - buttonY, buttonWidth, buttonHeight, 1, kButtonCornerRadius, true, true,
+                               false, false, true);
+      const int textWidth = renderer.getTextWidth(SMALL_FONT_ID, labels[i]);
+      const int textX = x + (buttonWidth - 1 - textWidth) / 2;
+      renderer.drawText(SMALL_FONT_ID, textX, pageHeight - buttonY + textYOffset, labels[i]);
+    } else {
+      const int smallButtonY = invertText ? 0 : pageHeight - smallButtonHeight;
+      renderer.fillRoundedRect(x, smallButtonY, buttonWidth, smallButtonHeight, kButtonCornerRadius, Color::White);
+      renderer.drawRoundedRect(x, smallButtonY, buttonWidth, smallButtonHeight, 1, kButtonCornerRadius, true, true,
+                               false, false, true);
+    }
+  }
+
+  renderer.setOrientation(origOrientation);
+}
+
+void MinimalTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
+                                       int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                       bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
+                                       const BookReadingStats* stats, float progressPercent) const {
+  (void)selectorIndex;
+  (void)bufferRestored;
+
+  const Rect coverRect = coverRectForScreen(renderer, rect);
+  if (recentBooks.empty()) {
+    renderer.drawRoundedRect(coverRect.x, coverRect.y, coverRect.width, coverRect.height, 1, kCoverCornerRadius, true);
+
+    const MinimalQuote& quote = kQuotes[selectedQuoteIndex()];
+    constexpr int quotePadding = 18;
+    const int textW = coverRect.width - quotePadding * 2;
+    auto lines = renderer.wrappedText(UI_12_FONT_ID, quote.text, textW, 6);
+    int lineY = coverRect.y + 88;
+    const int lineH = renderer.getLineHeight(UI_12_FONT_ID);
+    for (const auto& line : lines) {
+      renderer.drawText(UI_12_FONT_ID, coverRect.x + quotePadding, lineY, line.c_str());
+      lineY += lineH;
+    }
+
+    const int authorW = renderer.getTextWidth(UI_10_FONT_ID, quote.author, EpdFontFamily::ITALIC);
+    renderer.drawText(UI_10_FONT_ID, coverRect.x + coverRect.width - quotePadding - authorW,
+                      coverRect.y + coverRect.height - 110, quote.author, true, EpdFontFamily::ITALIC);
+    coverRendered = false;
+    coverBufferStored = false;
+    return;
+  }
+
+  if (!coverRendered) {
+    bool hasCover = false;
+    const RecentBook& book = recentBooks[0];
+    if (!book.coverBmpPath.empty()) {
+      std::string coverBmpPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverRect.width, coverRect.height);
+      if (coverBmpPath.empty() || !Storage.exists(coverBmpPath.c_str())) {
+        coverBmpPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverRect.height);
+      }
+      FsFile file;
+      if (Storage.openFileForRead("HOME", coverBmpPath, file)) {
+        Bitmap bitmap(file);
+        if (bitmap.parseHeaders() == BmpReaderError::Ok) {
+          const Rect bitmapRect = fittedBitmapRect(bitmap, coverRect);
+          renderer.fillRoundedRect(coverRect.x, coverRect.y, coverRect.width, coverRect.height, kCoverCornerRadius,
+                                   Color::White);
+          renderer.drawBitmap(bitmap, bitmapRect.x, bitmapRect.y, bitmapRect.width, bitmapRect.height);
+          renderer.maskRoundedRectOutsideCorners(bitmapRect.x, bitmapRect.y, bitmapRect.width, bitmapRect.height,
+                                                 kCoverCornerRadius);
+          renderer.drawRoundedRect(bitmapRect.x, bitmapRect.y, bitmapRect.width, bitmapRect.height, 1,
+                                   kCoverCornerRadius, true);
+          hasCover = true;
+        }
+        file.close();
+      }
+    }
+
+    if (!hasCover) {
+      drawMissingBookCover(renderer, coverRect, recentBooks[0]);
+    }
+    coverBufferStored = storeCoverBuffer();
+    coverRendered = coverBufferStored;
+  }
+
+  drawProgressBlock(renderer, coverRect, stats, progressPercent);
+}
+
+void MinimalTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
+                                  const std::function<std::string(int index)>& buttonLabel,
+                                  const std::function<UIIcon(int index)>& rowIcon) const {
+  (void)rect;
+  (void)rowIcon;
+
+  if (buttonCount <= 0) {
+    return;
+  }
+
+  const int panelW = std::min(kMenuPanelWidth, renderer.getScreenWidth() - 80);
+  const int panelH = buttonCount * kMenuRowHeight + 2;
+  const int panelX = (renderer.getScreenWidth() - panelW) / 2;
+  const int panelY = kMenuPanelTop;
+  renderer.drawRoundedRect(panelX, panelY, panelW, panelH, 1, kMenuPanelRadius, true);
+
+  for (int i = 0; i < buttonCount; ++i) {
+    const int rowY = panelY + 1 + i * kMenuRowHeight;
+    if (i == selectedIndex) {
+      const int triangleX = panelX + kMenuSelectionTriangleInset;
+      const int triangleCenterY = rowY + kMenuRowHeight / 2;
+      const int triangleHalfH = kMenuSelectionTriangleHeight / 2;
+      const int triangleXPoints[3] = {triangleX, triangleX, triangleX + kMenuSelectionTriangleWidth};
+      const int triangleYPoints[3] = {triangleCenterY - triangleHalfH, triangleCenterY + triangleHalfH,
+                                      triangleCenterY};
+      renderer.fillPolygon(triangleXPoints, triangleYPoints, 3, true);
+    }
+
+    const std::string label = buttonLabel(i);
+    const int labelW = renderer.getTextWidth(UI_12_FONT_ID, label.c_str());
+    const int labelY = rowY + (kMenuRowHeight - renderer.getLineHeight(UI_12_FONT_ID)) / 2;
+    renderer.drawText(UI_12_FONT_ID, panelX + (panelW - labelW) / 2, labelY, label.c_str());
+  }
+}
diff --git a/src/components/themes/minimal/MinimalTheme.h b/src/components/themes/minimal/MinimalTheme.h
new file mode 100644
index 00000000..5d3cf39d
--- /dev/null
+++ b/src/components/themes/minimal/MinimalTheme.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "components/themes/lyra/LyraTheme.h"
+
+namespace MinimalMetrics {
+constexpr ThemeMetrics makeValues() {
+  ThemeMetrics v = LyraMetrics::values;
+  v.homeTopPadding = 50;
+  v.homeCoverHeight = 583;
+  v.homeCoverTileHeight = 690;
+  v.homeRecentBooksCount = 1;
+  v.homeContinueReadingInMenu = false;
+  v.homeMenuTopOffset = 0;
+  return v;
+}
+
+constexpr ThemeMetrics values = makeValues();
+}  // namespace MinimalMetrics
+
+class MinimalTheme : public LyraTheme {
+ public:
+  static void setHomeButtonHintSelection(int selectedIndex);
+
+  void drawHeader(const GfxRenderer& renderer, Rect rect, const char* title,
+                  const char* subtitle = nullptr) const override;
+  void drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
+                  bool selected) const override;
+  void drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
+                const std::function<std::string(int index)>& rowTitle,
+                const std::function<std::string(int index)>& rowSubtitle,
+                const std::function<UIIcon(int index)>& rowIcon, const std::function<std::string(int index)>& rowValue,
+                bool highlightValue, const std::function<bool(int index)>& rowDimmed = nullptr,
+                const std::function<bool(int index)>& isHeader = nullptr) const override;
+  void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3, const char* btn4,
+                       bool allowInvertedText = false) const override;
+  void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
+                           int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           float progressPercent = -1.0f) const override;
+  void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
+                      const std::function<std::string(int index)>& buttonLabel,
+                      const std::function<UIIcon(int index)>& rowIcon) const override;
+  bool usesCompactFileBrowserRows() const override { return true; }
+  int compactFileBrowserRowHeight(const GfxRenderer& renderer) const override;
+};
diff --git a/src/components/themes/roundedraff/RoundedRaffTheme.cpp b/src/components/themes/roundedraff/RoundedRaffTheme.cpp
index b716b77b..8d12d419 100644
--- a/src/components/themes/roundedraff/RoundedRaffTheme.cpp
+++ b/src/components/themes/roundedraff/RoundedRaffTheme.cpp
@@ -1,8 +1,8 @@
 #include "RoundedRaffTheme.h"
 
 #include <GfxRenderer.h>
-#include <HalPowerManager.h>
 #include <HalStorage.h>
+#include <HalTiltSensor.h>
 #include <I18n.h>
 
 #include <algorithm>
@@ -20,9 +20,11 @@ constexpr int kCoverRadius = 18;
 constexpr int kMenuRadius = 30;
 constexpr int kBottomRadius = 15;
 constexpr int kRowRadius = 20;
-constexpr int kInteractiveInsetX = 20;
+constexpr int kInteractiveInsetX = 15;
 constexpr int kSelectableRowGap = 6;
-constexpr int batteryPercentSpacing = 4;
+constexpr int kHomeMenuSidePadding = RoundedRaffMetrics::values.contentSidePadding;
+constexpr int kListSidePadding = 10;
+constexpr int kTabHorizontalInset = 2;
 constexpr int kTitleFontId = UI_12_FONT_ID;     // Requested main title size: 12px
 constexpr int kSubtitleFontId = SMALL_FONT_ID;  // Requested subtitle size: 8px
 constexpr int kGuideFontId = SMALL_FONT_ID;     // Closest available to requested 6px
@@ -46,54 +48,6 @@ void drawScrollBar(const GfxRenderer& renderer, Rect rect, int itemCount, int pa
   renderer.fillRect(barX, thumbY, barW, thumbH);
 }
 
-void drawBatteryIcon(const GfxRenderer& renderer, int x, int y, int battWidth, int rectHeight, uint16_t percentage) {
-  // Top line
-  renderer.drawLine(x + 1, y, x + battWidth - 3, y);
-  // Bottom line
-  renderer.drawLine(x + 1, y + rectHeight - 1, x + battWidth - 3, y + rectHeight - 1);
-  // Left line
-  renderer.drawLine(x, y + 1, x, y + rectHeight - 2);
-  // Battery end
-  renderer.drawLine(x + battWidth - 2, y + 1, x + battWidth - 2, y + rectHeight - 2);
-  renderer.drawPixel(x + battWidth - 1, y + 3);
-  renderer.drawPixel(x + battWidth - 1, y + rectHeight - 4);
-  renderer.drawLine(x + battWidth - 0, y + 4, x + battWidth - 0, y + rectHeight - 5);
-
-  // The +1 is to round up, so that we always fill at least one pixel.
-  int filledWidth = percentage * (battWidth - 5) / 100 + 1;
-  if (filledWidth > battWidth - 5) {
-    filledWidth = battWidth - 5;  // Ensure we don't overflow.
-  }
-
-  renderer.fillRect(x + 2, y + 2, filledWidth, rectHeight - 4);
-}
-
-void drawBatteryRightStable(const GfxRenderer& renderer, Rect iconRect, uint16_t percentage, bool showPercentage) {
-  // Match BaseTheme::drawBatteryRight layout, but use a stable percentage value for this render.
-  const int iconY = iconRect.y + 6;
-
-  if (showPercentage) {
-    const auto percentageText = std::to_string(percentage) + "%";
-    const int textWidth = renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str());
-    renderer.drawText(SMALL_FONT_ID, iconRect.x - textWidth - batteryPercentSpacing, iconRect.y,
-                      percentageText.c_str());
-  }
-
-  drawBatteryIcon(renderer, iconRect.x, iconY, RoundedRaffMetrics::values.batteryWidth, iconRect.height, percentage);
-}
-
-std::string sanitizeButtonLabel(std::string label) {
-  // Remove common directional prefixes/symbols (e.g. "<< Home", unsupported icon glyphs).
-  while (!label.empty() && !std::isalnum(static_cast<unsigned char>(label[0]))) {
-    label.erase(0, 1);
-  }
-  // Trim any extra left spaces.
-  while (!label.empty() && label[0] == ' ') {
-    label.erase(0, 1);
-  }
-  return label;
-}
-
 }  // namespace
 int coverWidth = 0;
 
@@ -110,28 +64,27 @@ void RoundedRaffTheme::drawHeader(const GfxRenderer& renderer, Rect rect, const
 
   const bool showBatteryPercentage =
       SETTINGS.hideBatteryPercentage != CrossPointSettings::HIDE_BATTERY_PERCENTAGE::HIDE_ALWAYS;
-  const uint16_t percentage = powerManager.getBatteryPercentage();
   const int batteryIconX = rect.x + rect.width - sidePadding - RoundedRaffMetrics::values.batteryWidth;
+
+  // Reserve space for the widest possible percentage text to avoid title/battery overlap
   int batteryGroupLeftX = batteryIconX;
   if (showBatteryPercentage) {
-    const auto percentageText = std::to_string(percentage) + "%";
-    batteryGroupLeftX -= renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str()) + batteryPercentSpacing;
-
-    // Clear a fixed-width area for the battery percentage to avoid ghosting when digit count changes (e.g. 100% ->
-    // 99%).
+    // Clear a fixed-width area for the battery percentage to avoid ghosting when digit count changes (e.g. 100% -> 99%)
     const int maxTextWidth = renderer.getTextWidth(SMALL_FONT_ID, "100%");
+    batteryGroupLeftX -= maxTextWidth + batteryPercentSpacing;
+
     const int clearW = maxTextWidth + batteryPercentSpacing + RoundedRaffMetrics::values.batteryWidth;
     const int clearH = std::max(renderer.getTextHeight(SMALL_FONT_ID), RoundedRaffMetrics::values.batteryHeight + 8);
     renderer.fillRect(batteryIconX - maxTextWidth - batteryPercentSpacing, rect.y + 14, clearW, clearH, false);
   }
 
-  const int maxTextWidth = std::max(0, batteryGroupLeftX - 20 - titleX);
-  auto headerTitle = renderer.truncatedText(kTitleFontId, title, maxTextWidth, EpdFontFamily::BOLD);
+  const int maxTitleWidth = std::max(0, batteryGroupLeftX - 20 - titleX);
+  auto headerTitle = renderer.truncatedText(kTitleFontId, title, maxTitleWidth, EpdFontFamily::BOLD);
   renderer.drawText(kTitleFontId, titleX, titleY, headerTitle.c_str(), true, EpdFontFamily::BOLD);
-  drawBatteryRightStable(renderer,
-                         Rect{batteryIconX, rect.y + 14, RoundedRaffMetrics::values.batteryWidth,
-                              RoundedRaffMetrics::values.batteryHeight},
-                         percentage, showBatteryPercentage);
+  drawBatteryRight(renderer,
+                   Rect{batteryIconX, rect.y + 14, RoundedRaffMetrics::values.batteryWidth,
+                        RoundedRaffMetrics::values.batteryHeight},
+                   showBatteryPercentage);
 }
 
 void RoundedRaffTheme::drawTabBar(const GfxRenderer& renderer, Rect rect, const std::vector<TabInfo>& tabs,
@@ -140,14 +93,17 @@ void RoundedRaffTheme::drawTabBar(const GfxRenderer& renderer, Rect rect, const
     return;
   }
 
-  const int slotWidth = rect.width / static_cast<int>(tabs.size());
+  const int tabCount = static_cast<int>(tabs.size());
   const int tabY = rect.y + 4;
   const int tabHeight = rect.height - 12;
 
-  for (size_t i = 0; i < tabs.size(); i++) {
-    const int slotX = rect.x + static_cast<int>(i) * slotWidth;
-    const int tabX = slotX + 4;
-    const int tabWidth = slotWidth - 8;
+  for (int i = 0; i < tabCount; i++) {
+    const int slotX = rect.x + (i * rect.width) / tabCount;
+    const int nextSlotX = rect.x + ((i + 1) * rect.width) / tabCount;
+    const int slotWidth = nextSlotX - slotX;
+    const int tabInsetX = std::min(kTabHorizontalInset, slotWidth / 2);
+    const int tabX = slotX + tabInsetX;
+    const int tabWidth = std::max(0, slotWidth - tabInsetX * 2);
     const auto& tab = tabs[i];
 
     if (tab.selected) {
@@ -155,18 +111,18 @@ void RoundedRaffTheme::drawTabBar(const GfxRenderer& renderer, Rect rect, const
     }
 
     const int textWidth = renderer.getTextWidth(kTitleFontId, tab.label, EpdFontFamily::BOLD);
-    const int textX = slotX + (slotWidth - textWidth) / 2;
+    const int textX = tabX + (tabWidth - textWidth) / 2;
     const int textY = tabY + (tabHeight - renderer.getLineHeight(kTitleFontId)) / 2;
     renderer.drawText(kTitleFontId, textX, textY, tab.label, !(tab.selected), EpdFontFamily::BOLD);
   }
 
   // Full-width divider between tabs and setting rows.
-  renderer.drawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1, true);
+  renderer.drawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width - 1, rect.y + rect.height - 1, true);
 }
 
 void RoundedRaffTheme::drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
-                                           const int selectorIndex, bool& coverRendered, bool& coverBufferStored,
-                                           bool& bufferRestored, std::function<bool()> storeCoverBuffer,
+                                           int selectorIndex, bool& coverRendered, bool& coverBufferStored,
+                                           bool& bufferRestored, const std::function<bool()>& storeCoverBuffer,
                                            const BookReadingStats* stats, float progressPercent) const {
   (void)stats;
   (void)progressPercent;
@@ -252,9 +208,9 @@ void RoundedRaffTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int butt
                                       const std::function<std::string(int index)>& buttonLabel,
                                       const std::function<UIIcon(int index)>& rowIcon) const {
   (void)rowIcon;
-  const int sidePadding = RoundedRaffMetrics::values.contentSidePadding;
+  const int sidePadding = kHomeMenuSidePadding;
   const int rowX = rect.x + sidePadding;
-  const int rowHeight = renderer.getLineHeight(kTitleFontId) + 20;  // 10px top + 10px bottom
+  const int rowHeight = renderer.getLineHeight(kTitleFontId) + 15;  // 10px top + 10px bottom
   const int rowGap = kSelectableRowGap;
   const int rowStep = rowHeight + rowGap;
   const int pageItems = std::max(1, rect.height / rowStep);
@@ -267,7 +223,7 @@ void RoundedRaffTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int butt
   for (int i = pageStartIndex; i < buttonCount && i < pageStartIndex + pageItems; ++i) {
     const std::string label = buttonLabel(i);
     const int rowY = menuTop + (i - pageStartIndex) * rowStep;
-    constexpr int kRowPaddingX = 40;  // 20px L/R
+    constexpr int kRowPaddingX = 30;  // 20px L/R
     const int maxLabelWidth = std::max(0, menuMaxWidth - kRowPaddingX);
     const std::string truncatedLabel =
         renderer.truncatedText(kTitleFontId, label.c_str(), maxLabelWidth, EpdFontFamily::BOLD);
@@ -287,15 +243,91 @@ void RoundedRaffTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int butt
   drawScrollBar(renderer, rect, buttonCount, pageStartIndex, pageItems);
 }
 
+void RoundedRaffTheme::drawTextField(const GfxRenderer& renderer, Rect rect, const int textWidth, bool cursorMode,
+                                     int contentStartX, int contentWidth) const {
+  const auto& metrics = UITheme::getInstance().getMetrics();
+  const int lineHeight = renderer.getLineHeight(UI_12_FONT_ID);
+  const int lineY = rect.y + rect.height + lineHeight + metrics.verticalSpacing;
+  const int thickness = cursorMode ? 3 : 2;
+
+  if (contentWidth > 0) {
+    renderer.drawLine(rect.x + contentStartX, lineY, rect.x + contentStartX + contentWidth - 1, lineY, thickness, true);
+    return;
+  }
+
+  constexpr int hPadding = 8;
+  const int lineW = textWidth + hPadding * 2;
+  const int lineStart = rect.x + (rect.width - lineW) / 2;
+  renderer.drawLine(lineStart, lineY, lineStart + lineW - 1, lineY, thickness, true);
+}
+
+void RoundedRaffTheme::drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const char* label, const bool isSelected,
+                                       const char* secondaryLabel, const KeyboardKeyType keyType,
+                                       const bool inactiveSelection) const {
+  constexpr int keyRadius = 6;
+  const bool disabled = keyType == KeyboardKeyType::Disabled;
+  const bool invert = isSelected && !inactiveSelection;
+  const bool hasSecondary = secondaryLabel != nullptr && secondaryLabel[0] != '\0';
+
+  if (isSelected) {
+    const Color fillColor = (inactiveSelection || disabled) ? Color::LightGray : Color::Black;
+    renderer.fillRoundedRect(rect.x, rect.y, rect.width, rect.height, keyRadius, fillColor);
+  } else {
+    if (disabled) {
+      renderer.fillRoundedRect(rect.x, rect.y, rect.width, rect.height, keyRadius, Color::LightGray);
+    } else {
+      renderer.fillRoundedRect(rect.x, rect.y, rect.width, rect.height, keyRadius, Color::White);
+    }
+    renderer.drawRoundedRect(rect.x, rect.y, rect.width, rect.height, 1, keyRadius, true);
+  }
+
+  if (keyType == KeyboardKeyType::Space) {
+    const int lineHalfWidth = rect.width * 3 / 10;
+    const int centerX = rect.x + rect.width / 2;
+    const int lineY = rect.y + rect.height / 2 + 3;
+    renderer.drawLine(centerX - lineHalfWidth, lineY, centerX + lineHalfWidth, lineY, 3, !invert);
+    return;
+  }
+
+  if (keyType == KeyboardKeyType::Del) {
+    const int centerX = rect.x + rect.width / 2;
+    const int centerY = rect.y + rect.height / 2;
+    const int arrowLen = rect.width / 4;
+    const int arrowHead = std::max(1, arrowLen / 2);
+    renderer.drawLine(centerX - arrowLen / 2, centerY, centerX + arrowLen / 2, centerY, 3, !invert);
+    renderer.drawLine(centerX - arrowLen / 2, centerY, centerX - arrowLen / 2 + arrowHead, centerY - arrowHead, 3,
+                      !invert);
+    renderer.drawLine(centerX - arrowLen / 2, centerY, centerX - arrowLen / 2 + arrowHead, centerY + arrowHead, 3,
+                      !invert);
+    return;
+  }
+
+  if (label != nullptr && label[0] != '\0') {
+    const int primaryFontId = hasSecondary ? UI_10_FONT_ID : UI_12_FONT_ID;
+    const int itemWidth = renderer.getTextWidth(primaryFontId, label);
+    const int centeredTextX = rect.x + (rect.width - itemWidth) / 2;
+    const int textX = hasSecondary ? std::max(rect.x + 4, centeredTextX - 6) : centeredTextX;
+    const int lineHeight = renderer.getLineHeight(primaryFontId);
+    const int textY = hasSecondary ? rect.y + rect.height - lineHeight - 2 : rect.y + (rect.height - lineHeight) / 2;
+    renderer.drawText(primaryFontId, textX, textY, label, !invert);
+  }
+
+  if (hasSecondary) {
+    const int secWidth = renderer.getTextWidth(SMALL_FONT_ID, secondaryLabel);
+    renderer.drawText(SMALL_FONT_ID, rect.x + rect.width - secWidth - 3, rect.y + 2, secondaryLabel, !invert);
+  }
+}
+
 void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
                                 const std::function<std::string(int index)>& rowTitle,
                                 const std::function<std::string(int index)>& rowSubtitle,
                                 const std::function<UIIcon(int index)>& rowIcon,
                                 const std::function<std::string(int index)>& rowValue, bool highlightValue,
+                                const std::function<bool(int index)>& rowDimmed,
                                 const std::function<bool(int index)>& isHeader) const {
   (void)rowIcon;
   (void)highlightValue;
-  (void)isHeader;
+  (void)rowDimmed;
   const bool hasSubtitle = static_cast<bool>(rowSubtitle);
   const int titleLineHeight = renderer.getLineHeight(kTitleFontId);
   const int subtitleLineHeight = renderer.getLineHeight(kSubtitleFontId);
@@ -305,18 +337,60 @@ void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int item
   const int subtitleRowHeight =
       subtitleTopPadding + titleLineHeight + subtitleInterLineGap + subtitleLineHeight + subtitleBottomPadding;
   const int rowHeight = hasSubtitle ? subtitleRowHeight : RoundedRaffMetrics::values.listRowHeight;
-  const int rowStep = rowHeight + kSelectableRowGap;
-  const int pageItems = std::max(1, rect.height / rowStep);
+  const auto isHeaderRow = [&isHeader](int index) { return isHeader != nullptr && isHeader(index); };
+  bool hasHeaderRows = false;
+  for (int i = 0; i < itemCount; ++i) {
+    if (isHeaderRow(i)) {
+      hasHeaderRows = true;
+      break;
+    }
+  }
+  const int sectionHeaderTopPadding = halTiltSensor.isAvailable() ? 10 : 20;
+  constexpr int sectionHeaderFontId = kTitleFontId;
+  constexpr int sectionHeaderUnderlineGap = 4;
+  const int sectionHeaderLineHeight = renderer.getLineHeight(sectionHeaderFontId);
+  const int sectionHeaderRowHeight = sectionHeaderLineHeight + sectionHeaderUnderlineGap;
+  const int selectableRowGap = hasHeaderRows ? 0 : kSelectableRowGap;
+  const auto visualRowHeight = [&](int index) { return isHeaderRow(index) ? sectionHeaderRowHeight : rowHeight; };
+  int totalContentHeight = 0;
+  for (int i = 0; i < itemCount; ++i) {
+    if (i > 0) totalContentHeight += selectableRowGap;
+    if (i > 0 && isHeaderRow(i)) totalContentHeight += sectionHeaderTopPadding;
+    totalContentHeight += visualRowHeight(i);
+  }
+  const bool contentFits = totalContentHeight <= rect.height;
+  const int rowStep = rowHeight + selectableRowGap;
+  const int pageItems = contentFits ? std::max(1, itemCount) : std::max(1, rect.height / rowStep);
   const int pageStartIndex = std::max(0, selectedIndex / pageItems) * pageItems;
 
-  const int sidePadding = RoundedRaffMetrics::values.contentSidePadding;
+  const int sidePadding = kListSidePadding;
   const int rowX = rect.x + sidePadding;
   const int rowWidth = rect.width - sidePadding * 2;
 
   for (int i = pageStartIndex; i < itemCount && i < pageStartIndex + pageItems; i++) {
-    const int rowY = rect.y + (i % pageItems) * rowStep;
+    int rowY = rect.y;
+    for (int j = pageStartIndex; j < i; ++j) {
+      rowY += visualRowHeight(j) + selectableRowGap;
+      if (isHeaderRow(j + 1)) rowY += sectionHeaderTopPadding;
+    }
     const bool isSelected = i == selectedIndex;
-    renderer.fillRoundedRect(rowX, rowY, rowWidth, rowHeight, kRowRadius, isSelected ? Color::Black : Color::White);
+    const int currentRowHeight = visualRowHeight(i);
+
+    if (isHeaderRow(i)) {
+      std::string label = rowTitle(i);
+      std::transform(label.begin(), label.end(), label.begin(),
+                     [](unsigned char c) { return static_cast<char>(std::toupper(c)); });
+      const auto title = renderer.truncatedText(sectionHeaderFontId, label.c_str(), rowWidth - kInteractiveInsetX * 2,
+                                                EpdFontFamily::BOLD);
+      const int textY = rowY;
+      renderer.drawText(sectionHeaderFontId, rowX + kInteractiveInsetX, textY, title.c_str(), true,
+                        EpdFontFamily::BOLD);
+      renderer.drawLine(rowX, rowY + currentRowHeight - 1, rowX + rowWidth, rowY + currentRowHeight - 1, true);
+      continue;
+    }
+
+    renderer.fillRoundedRect(rowX, rowY, rowWidth, currentRowHeight, kRowRadius,
+                             isSelected ? Color::Black : Color::White);
 
     constexpr int kMinTitleWidth = 40;
     constexpr int kMinValueGap = kInteractiveInsetX;
@@ -330,8 +404,8 @@ void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int item
               renderer.truncatedText(kTitleFontId, valueText.c_str(), maxValueWidth, EpdFontFamily::REGULAR);
           const int valueW = renderer.getTextWidth(kTitleFontId, truncatedValue.c_str(), EpdFontFamily::REGULAR);
           renderer.drawText(kTitleFontId, rowX + rowWidth - kInteractiveInsetX - valueW,
-                            rowY + (rowHeight - renderer.getLineHeight(kTitleFontId)) / 2, truncatedValue.c_str(),
-                            !isSelected, EpdFontFamily::REGULAR);
+                            rowY + (currentRowHeight - renderer.getLineHeight(kTitleFontId)) / 2,
+                            truncatedValue.c_str(), !isSelected, EpdFontFamily::REGULAR);
           textAreaWidth = std::max(0, textAreaWidth - valueW - kMinValueGap);
         }
       }
@@ -343,7 +417,7 @@ void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int item
 
       if (subtitleRaw.empty()) {
         // If there is no subtitle/author, center title vertically in the full row.
-        const int centeredTitleY = rowY + (rowHeight - titleLineHeight) / 2;
+        const int centeredTitleY = rowY + (currentRowHeight - titleLineHeight) / 2;
         renderer.drawText(kTitleFontId, rowX + kInteractiveInsetX, centeredTitleY, title.c_str(), !isSelected,
                           EpdFontFamily::BOLD);
       } else {
@@ -359,8 +433,8 @@ void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int item
     } else {
       auto title = renderer.truncatedText(kTitleFontId, rowTitle(i).c_str(), textAreaWidth, EpdFontFamily::BOLD);
       renderer.drawText(kTitleFontId, rowX + kInteractiveInsetX,
-                        rowY + (rowHeight - renderer.getLineHeight(kTitleFontId)) / 2, title.c_str(), !isSelected,
-                        EpdFontFamily::BOLD);
+                        rowY + (currentRowHeight - renderer.getLineHeight(kTitleFontId)) / 2, title.c_str(),
+                        !isSelected, EpdFontFamily::BOLD);
     }
   }
 
@@ -368,9 +442,10 @@ void RoundedRaffTheme::drawList(const GfxRenderer& renderer, Rect rect, int item
 }
 
 void RoundedRaffTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                                       const char* btn4) const {
+                                       const char* btn4, const bool allowInvertedText) const {
   const GfxRenderer::Orientation origOrientation = renderer.getOrientation();
-  renderer.setOrientation(GfxRenderer::Orientation::Portrait);
+  const bool invertText = allowInvertedText && origOrientation == GfxRenderer::Orientation::PortraitInverted;
+  renderer.setOrientation(invertText ? GfxRenderer::Orientation::PortraitInverted : GfxRenderer::Orientation::Portrait);
 
   const int pageWidth = renderer.getScreenWidth();
   const int pageHeight = renderer.getScreenHeight();
@@ -379,17 +454,22 @@ void RoundedRaffTheme::drawButtonHints(GfxRenderer& renderer, const char* btn1,
   const int bottomMargin = 10;
   const int hintHeight = RoundedRaffMetrics::values.buttonHintsHeight - 10;  // 30px total guide height
   const int groupWidth = (pageWidth - sidePadding * 2 - groupGap) / 2;
-  const int hintY = pageHeight - hintHeight - bottomMargin;
+  const int hintY = invertText ? bottomMargin : pageHeight - hintHeight - bottomMargin;
   const int textY = hintY + (hintHeight - renderer.getLineHeight(kGuideFontId)) / 2;
 
-  const bool backDisabled = (btn1 == nullptr || btn1[0] == '\0');
+  const char* leftOuterLabel = invertText ? btn4 : btn1;
+  const char* leftInnerLabel = invertText ? btn3 : btn2;
+  const char* rightInnerLabel = invertText ? btn2 : btn3;
+  const char* rightOuterLabel = invertText ? btn1 : btn4;
+
+  const bool backDisabled = (leftOuterLabel == nullptr || leftOuterLabel[0] == '\0');
   const int leftGroupX = sidePadding;
   const int rightGroupX = leftGroupX + groupWidth + groupGap;
-  const std::string backLabel = backDisabled ? "" : sanitizeButtonLabel(std::string(btn1));
+  const std::string backLabel = backDisabled ? "" : std::string(leftOuterLabel);
   // Callers should provide the button labels. If a label is not specified, it should render empty.
-  const std::string selectText = (btn2 && btn2[0] != '\0') ? sanitizeButtonLabel(std::string(btn2)) : "";
-  const std::string upText = (btn3 && btn3[0] != '\0') ? sanitizeButtonLabel(std::string(btn3)) : "";
-  const std::string downText = (btn4 && btn4[0] != '\0') ? sanitizeButtonLabel(std::string(btn4)) : "";
+  const std::string selectText = (leftInnerLabel && leftInnerLabel[0] != '\0') ? std::string(leftInnerLabel) : "";
+  const std::string upText = (rightInnerLabel && rightInnerLabel[0] != '\0') ? std::string(rightInnerLabel) : "";
+  const std::string downText = (rightOuterLabel && rightOuterLabel[0] != '\0') ? std::string(rightOuterLabel) : "";
 
   // Ensure button hints always "win" visually even if other elements accidentally render into this area.
   renderer.fillRect(leftGroupX, hintY, groupWidth, hintHeight, false);
diff --git a/src/components/themes/roundedraff/RoundedRaffTheme.h b/src/components/themes/roundedraff/RoundedRaffTheme.h
index d19fe693..f863c7d3 100644
--- a/src/components/themes/roundedraff/RoundedRaffTheme.h
+++ b/src/components/themes/roundedraff/RoundedRaffTheme.h
@@ -11,7 +11,7 @@ constexpr ThemeMetrics values = {.batteryWidth = 15,
                                  .batteryBarHeight = 20,
                                  .headerHeight = 45,
                                  .verticalSpacing = 10,
-                                 .contentSidePadding = 20,
+                                 .contentSidePadding = 15,
                                  .listRowHeight = 42,
                                  .listWithSubtitleRowHeight = 69,
                                  .menuRowHeight = 42,
@@ -34,10 +34,16 @@ constexpr ThemeMetrics values = {.batteryWidth = 15,
                                  .statusBarHorizontalMargin = 5,
                                  .statusBarVerticalMargin = 19,
                                  .keyboardKeyWidth = 22,
-                                 .keyboardKeyHeight = 30,
+                                 .keyboardKeyHeight = 38,
                                  .keyboardKeySpacing = 10,
-                                 .keyboardBottomAligned = false,
-                                 .keyboardCenteredText = false};
+                                 .keyboardBottomKeyHeight = 34,
+                                 .keyboardBottomKeySpacing = 5,
+                                 .keyboardBottomAligned = true,
+                                 .keyboardCenteredText = false,
+                                 .keyboardVerticalOffset = 0,
+                                 .keyboardTextFieldWidthPercent = 85,
+                                 .keyboardWidthPercent = 90,
+                                 .keyboardKeyCornerRadius = 0};
 }
 
 class RoundedRaffTheme : public BaseTheme {
@@ -48,18 +54,24 @@ class RoundedRaffTheme : public BaseTheme {
                   bool selected) const override;
   void drawRecentBookCover(GfxRenderer& renderer, Rect rect, const std::vector<RecentBook>& recentBooks,
                            int selectorIndex, bool& coverRendered, bool& coverBufferStored, bool& bufferRestored,
-                           std::function<bool()> storeCoverBuffer, const BookReadingStats* stats = nullptr,
+                           const std::function<bool()>& storeCoverBuffer, const BookReadingStats* stats = nullptr,
                            float progressPercent = -1.0f) const override;
   void drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount, int selectedIndex,
                       const std::function<std::string(int index)>& buttonLabel,
                       const std::function<UIIcon(int index)>& rowIcon) const override;
+  void drawTextField(const GfxRenderer& renderer, Rect rect, int textWidth, bool cursorMode = false,
+                     int contentStartX = 0, int contentWidth = 0) const override;
+  void drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const char* label, bool isSelected,
+                       const char* secondaryLabel = nullptr, KeyboardKeyType keyType = KeyboardKeyType::Normal,
+                       bool inactiveSelection = false) const override;
   void drawList(const GfxRenderer& renderer, Rect rect, int itemCount, int selectedIndex,
                 const std::function<std::string(int index)>& rowTitle,
                 const std::function<std::string(int index)>& rowSubtitle = nullptr,
                 const std::function<UIIcon(int index)>& rowIcon = nullptr,
                 const std::function<std::string(int index)>& rowValue = nullptr, bool highlightValue = false,
+                const std::function<bool(int index)>& rowDimmed = nullptr,
                 const std::function<bool(int index)>& isHeader = nullptr) const override;
-  void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3,
-                       const char* btn4) const override;
+  void drawButtonHints(GfxRenderer& renderer, const char* btn1, const char* btn2, const char* btn3, const char* btn4,
+                       bool allowInvertedText = false) const override;
   bool homeMenuShowsContinueReading() const { return true; }
 };
diff --git a/src/fontIds.h b/src/fontIds.h
index 60cf3dac..1fb81713 100644
--- a/src/fontIds.h
+++ b/src/fontIds.h
@@ -12,108 +12,143 @@
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_8_FONT_ID (-1529542243)
 #else
-#define LEXENDDECA_8_FONT_ID (1874776109)
+#define LEXENDDECA_8_FONT_ID (-2007827299)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_10_FONT_ID (-1178760654)
 #else
-#define LEXENDDECA_10_FONT_ID (-1605392266)
+#define LEXENDDECA_10_FONT_ID (-833446840)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_12_FONT_ID (576453416)
 #else
-#define LEXENDDECA_12_FONT_ID (-485970719)
+#define LEXENDDECA_12_FONT_ID (-1629698200)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_14_FONT_ID (-90104999)
 #else
-#define LEXENDDECA_14_FONT_ID (1443855446)
+#define LEXENDDECA_14_FONT_ID (1797004611)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_16_FONT_ID (-1174553084)
 #else
-#define LEXENDDECA_16_FONT_ID (572561126)
+#define LEXENDDECA_16_FONT_ID (-654563150)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_18_FONT_ID (-257054697)
 #else
-#define LEXENDDECA_18_FONT_ID (-2114038106)
+#define LEXENDDECA_18_FONT_ID (270578372)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define LEXENDDECA_20_FONT_ID (1833613135)
 #else
-#define LEXENDDECA_20_FONT_ID (333993558)
+#define LEXENDDECA_20_FONT_ID (-798807655)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_8_FONT_ID (127130883)
 #else
-#define CHAREINK_8_FONT_ID (1856559554)
+#define CHAREINK_8_FONT_ID (-2129730116)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_10_FONT_ID (2016565087)
 #else
-#define CHAREINK_10_FONT_ID (1529460461)
+#define CHAREINK_10_FONT_ID (-1653202343)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_12_FONT_ID (-1319580286)
 #else
-#define CHAREINK_12_FONT_ID (981077)
+#define CHAREINK_12_FONT_ID (1691845221)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_14_FONT_ID (-1955424964)
 #else
-#define CHAREINK_14_FONT_ID (1046405669)
+#define CHAREINK_14_FONT_ID (-1175923005)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_16_FONT_ID (1683895346)
 #else
-#define CHAREINK_16_FONT_ID (-1309014274)
+#define CHAREINK_16_FONT_ID (-1210801859)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_18_FONT_ID (827115541)
 #else
-#define CHAREINK_18_FONT_ID (1483163501)
+#define CHAREINK_18_FONT_ID (820691502)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define CHAREINK_20_FONT_ID (900401448)
 #else
-#define CHAREINK_20_FONT_ID (-1540327512)
+#define CHAREINK_20_FONT_ID (1306792472)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_8_FONT_ID (396692004)
 #else
-#define BITTER_8_FONT_ID (299295489)
+#define BITTER_8_FONT_ID (954763661)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_10_FONT_ID (-1655643523)
 #else
-#define BITTER_10_FONT_ID (949475439)
+#define BITTER_10_FONT_ID (-2037991310)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_12_FONT_ID (-998701579)
 #else
-#define BITTER_12_FONT_ID (945573658)
+#define BITTER_12_FONT_ID (70596465)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_14_FONT_ID (-969934)
 #else
-#define BITTER_14_FONT_ID (-810572379)
+#define BITTER_14_FONT_ID (1849723397)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_16_FONT_ID (-263078880)
 #else
-#define BITTER_16_FONT_ID (150358638)
+#define BITTER_16_FONT_ID (1209964980)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_18_FONT_ID (-2112776323)
 #else
-#define BITTER_18_FONT_ID (-613950257)
+#define BITTER_18_FONT_ID (-1753285491)
 #endif
 #ifdef OMIT_EMOJI_FONTS
 #define BITTER_20_FONT_ID (-1176289379)
 #else
-#define BITTER_20_FONT_ID (1155264103)
+#define BITTER_20_FONT_ID (1701313611)
 #endif
-#define UI_10_FONT_ID (22918846)
-#define UI_12_FONT_ID (1635686837)
+#define UI_10_FONT_ID (1449607355)
+#define UI_12_FONT_ID (-837600088)
 #define SMALL_FONT_ID (1002091607)
+
+// Font ID 0 is reserved as the "not found" sentinel.
+// Guard against any hash accidentally producing 0.
+static_assert(NOTOEMOJI_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOEMOJI_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOEMOJI_14_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOEMOJI_16_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOSYMBOLS_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOSYMBOLS_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOSYMBOLS_14_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(NOTOSYMBOLS_16_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_8_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_14_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_16_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_18_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(LEXENDDECA_20_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_8_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_14_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_16_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_18_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(CHAREINK_20_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_8_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_14_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_16_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_18_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(BITTER_20_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(UI_10_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(UI_12_FONT_ID != 0, "Font ID collision with sentinel");
+static_assert(SMALL_FONT_ID != 0, "Font ID collision with sentinel");
diff --git a/src/main.cpp b/src/main.cpp
index 55581efc..6897fdcd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,13 +27,18 @@
 #include "MappedInputManager.h"
 #include "OpdsServerStore.h"
 #include "RecentBooksStore.h"
+#include "SdCardFontSystem.h"
 #include "activities/Activity.h"
 #include "activities/ActivityManager.h"
 #include "activities/boot_sleep/SleepActivity.h"
 #include "activities/reader/KOReaderSyncActivity.h"
 #include "activities/settings/KOReaderSettingsActivity.h"
+#include "activities/settings/SdFirmwareUpdateActivity.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
+#ifdef SIMULATOR
+#include "simulator/SimulatorSmokeTest.h"
+#endif
 #include "util/ButtonNavigator.h"
 #include "util/ScreenshotUtil.h"
 
@@ -41,19 +46,22 @@ MappedInputManager mappedInputManager(gpio);
 GfxRenderer renderer(display);
 ActivityManager activityManager(renderer, mappedInputManager);
 FontDecompressor fontDecompressor;
-FontCacheManager fontCacheManager(renderer.getFontMap());
+SdCardFontSystem sdFontSystem;
+FontCacheManager fontCacheManager(renderer.getFontMap(), renderer.getSdCardFonts());
 
 // Updated each main-loop iteration; read by the BLE HID manager via a
 // callback so it can decide whether to inject reader-only buttons.
 static bool gBluetoothReaderContext = false;
 
 // Fonts
+#ifndef OMIT_MEDIUM_FONT
 EpdFont lexenddeca14RegularFont(&lexenddeca_14_regular);
 EpdFont lexenddeca14BoldFont(&lexenddeca_14_bold);
 EpdFont lexenddeca14ItalicFont(&lexenddeca_14_italic);
 EpdFont lexenddeca14BoldItalicFont(&lexenddeca_14_bolditalic);
 EpdFontFamily lexenddeca14FontFamily(&lexenddeca14RegularFont, &lexenddeca14BoldFont, &lexenddeca14ItalicFont,
                                      &lexenddeca14BoldItalicFont);
+#endif
 #ifndef OMIT_TEENSY_FONT
 EpdFont charein8RegularFont(&charein_8_regular);
 EpdFont charein8BoldFont(&charein_8_bold);
@@ -77,12 +85,14 @@ EpdFont charein12BoldItalicFont(&charein_12_bolditalic);
 EpdFontFamily charein12FontFamily(&charein12RegularFont, &charein12BoldFont, &charein12ItalicFont,
                                   &charein12BoldItalicFont);
 #endif
+#ifndef OMIT_MEDIUM_FONT
 EpdFont charein14RegularFont(&charein_14_regular);
 EpdFont charein14BoldFont(&charein_14_bold);
 EpdFont charein14ItalicFont(&charein_14_italic);
 EpdFont charein14BoldItalicFont(&charein_14_bolditalic);
 EpdFontFamily charein14FontFamily(&charein14RegularFont, &charein14BoldFont, &charein14ItalicFont,
                                   &charein14BoldItalicFont);
+#endif
 EpdFont charein16RegularFont(&charein_16_regular);
 EpdFont charein16BoldFont(&charein_16_bold);
 EpdFont charein16ItalicFont(&charein_16_italic);
@@ -173,11 +183,13 @@ EpdFont bitter12ItalicFont(&bitter_12_italic);
 EpdFont bitter12BoldItalicFont(&bitter_12_bolditalic);
 EpdFontFamily bitter12FontFamily(&bitter12RegularFont, &bitter12BoldFont, &bitter12ItalicFont, &bitter12BoldItalicFont);
 #endif
+#ifndef OMIT_MEDIUM_FONT
 EpdFont bitter14RegularFont(&bitter_14_regular);
 EpdFont bitter14BoldFont(&bitter_14_bold);
 EpdFont bitter14ItalicFont(&bitter_14_italic);
 EpdFont bitter14BoldItalicFont(&bitter_14_bolditalic);
 EpdFontFamily bitter14FontFamily(&bitter14RegularFont, &bitter14BoldFont, &bitter14ItalicFont, &bitter14BoldItalicFont);
+#endif
 EpdFont bitter16RegularFont(&bitter_16_regular);
 EpdFont bitter16BoldFont(&bitter_16_bold);
 EpdFont bitter16ItalicFont(&bitter_16_italic);
@@ -319,8 +331,14 @@ bool startGlobalSyncProgress() {
     spineIndex = 0;
   }
 
-  activityManager.pushActivity(std::make_unique<KOReaderSyncActivity>(renderer, mappedInputManager, epub, epubPath,
-                                                                      spineIndex, pageNumber, totalPagesInSpine));
+  CrossPointPosition localPos = {spineIndex, pageNumber, totalPagesInSpine};
+  KOReaderPosition localKoPos = ProgressMapper::toKOReader(epub, localPos);
+  const int tocIdx = epub->getTocIndexForSpineIndex(spineIndex);
+  std::string localChapterName = (tocIdx >= 0) ? epub->getTocItem(tocIdx).title : "";
+
+  activityManager.pushActivity(
+      std::make_unique<KOReaderSyncActivity>(renderer, mappedInputManager, epubPath, spineIndex, pageNumber,
+                                             totalPagesInSpine, std::move(localKoPos), std::move(localChapterName)));
   return true;
 }
 
@@ -564,7 +582,9 @@ void setupDisplayAndFonts() {
 #ifndef OMIT_SMALL_FONT
   renderer.insertFont(CHAREINK_12_FONT_ID, charein12FontFamily);
 #endif
+#ifndef OMIT_MEDIUM_FONT
   renderer.insertFont(CHAREINK_14_FONT_ID, charein14FontFamily);
+#endif
   renderer.insertFont(CHAREINK_16_FONT_ID, charein16FontFamily);
 #ifndef OMIT_XLARGE_FONT
   renderer.insertFont(CHAREINK_18_FONT_ID, charein18FontFamily);
@@ -582,7 +602,9 @@ void setupDisplayAndFonts() {
 #ifndef OMIT_SMALL_FONT
   renderer.insertFont(LEXENDDECA_12_FONT_ID, lexenddeca12FontFamily);
 #endif
+#ifndef OMIT_MEDIUM_FONT
   renderer.insertFont(LEXENDDECA_14_FONT_ID, lexenddeca14FontFamily);
+#endif
   renderer.insertFont(LEXENDDECA_16_FONT_ID, lexenddeca16FontFamily);
 #ifndef OMIT_XLARGE_FONT
   renderer.insertFont(LEXENDDECA_18_FONT_ID, lexenddeca18FontFamily);
@@ -600,7 +622,9 @@ void setupDisplayAndFonts() {
 #ifndef OMIT_SMALL_FONT
   renderer.insertFont(BITTER_12_FONT_ID, bitter12FontFamily);
 #endif
+#ifndef OMIT_MEDIUM_FONT
   renderer.insertFont(BITTER_14_FONT_ID, bitter14FontFamily);
+#endif
   renderer.insertFont(BITTER_16_FONT_ID, bitter16FontFamily);
 #ifndef OMIT_XLARGE_FONT
   renderer.insertFont(BITTER_18_FONT_ID, bitter18FontFamily);
@@ -611,6 +635,10 @@ void setupDisplayAndFonts() {
   renderer.insertFont(UI_10_FONT_ID, ui10FontFamily);
   renderer.insertFont(UI_12_FONT_ID, ui12FontFamily);
   renderer.insertFont(SMALL_FONT_ID, smallFontFamily);
+
+  // Discover and load SD card fonts
+  sdFontSystem.begin(renderer);
+
   LOG_DBG("MAIN", "Fonts setup");
 }
 
@@ -689,8 +717,27 @@ void setup() {
       break;
   }
 
+  // Recovery firmware mode: hold left side button (BTN_UP) together with the power button at
+  // boot to skip directly to the SD-card firmware update screen. Useful on devices where USB
+  // flashing has been locked down (e.g. recent X3 firmware).
+  bool recoveryFirmwareMode = false;
+  if (wakeupReason == HalGPIO::WakeupReason::PowerButton) {
+    // Refresh the cached button state a few times — isPressed() needs ~half a second to settle
+    // after boot per the HalGPIO contract. Use a millis-based deadline so we always wait the full
+    // settle window even if the loop body takes longer than expected on slow boots.
+    const unsigned long settleStart = millis();
+    while (millis() - settleStart < 500) {
+      gpio.update();
+      delay(10);
+    }
+    if (gpio.isPressed(HalGPIO::BTN_UP)) {
+      recoveryFirmwareMode = true;
+      LOG_INF("MAIN", "Recovery firmware mode (UP + POWER held at boot)");
+    }
+  }
+
   // First serial output only here to avoid timing inconsistencies for power button press duration verification
-  LOG_DBG("MAIN", "Starting CrossPoint version " CROSSPOINT_VERSION);
+  LOG_DBG("MAIN", "Starting FlexBLE " FLEXBLE_VERSION " (CrossInk " CROSSINK_VERSION ")");
 
   setupDisplayAndFonts();
 
@@ -699,7 +746,11 @@ void setup() {
   APP_STATE.loadFromFile();
   RECENT_BOOKS.loadFromFile();
 
-  if (HalSystem::isRebootFromPanic()) {
+  if (recoveryFirmwareMode) {
+    // Skip normal home/reader routing: jump straight into the SD firmware picker.
+    activityManager.replaceActivity(
+        std::make_unique<SdFirmwareUpdateActivity>(renderer, mappedInputManager, /*recoveryMode=*/true));
+  } else if (HalSystem::isRebootFromPanic()) {
     // If we rebooted from a panic, go to crash report screen to show the panic info
     activityManager.goToCrashReport();
   } else if (APP_STATE.openEpubPath.empty() || !APP_STATE.lastSleepFromReader ||
@@ -732,7 +783,17 @@ void loop() {
   auto& btMgr = BluetoothHIDManager::getInstance();
   const bool userInputDetectedForBt = gpio.wasAnyPressed() || gpio.wasAnyReleased();
   btMgr.updateActivity();
+  // checkAutoReconnect can block for 2-3 s calling connectToDevice() when a
+  // reconnect to the bonded remote is in flight. If the user impatiently
+  // taps Back during that freeze, the release lands on the next iteration
+  // and would kick them out of the book (and BLE auto-disables on book
+  // exit). Time the call and swallow one Back release when it actually
+  // blocked, so the hasty tap is treated as the no-op the user intended.
+  const unsigned long btReconnectStart = millis();
   btMgr.checkAutoReconnect(userInputDetectedForBt);
+  if (millis() - btReconnectStart > 500) {
+    mappedInputManager.suppressNextBackRelease();
+  }
   // Drain deferred disable from EpubReaderActivity::onExit. We can't call
   // disable() inline from onExit because the activity manager still holds
   // the render lock during the transition; doing it here, after loop()
@@ -774,7 +835,9 @@ void loop() {
   }
 
   static bool screenshotButtonsReleased = true;
+  static bool screenshotComboActive = false;
   if (gpio.isPressed(HalGPIO::BTN_POWER) && gpio.isPressed(HalGPIO::BTN_DOWN)) {
+    screenshotComboActive = true;
     if (screenshotButtonsReleased) {
       screenshotButtonsReleased = false;
       screenshotComboHandled = true;
@@ -785,9 +848,25 @@ void loop() {
       }
     }
     return;
-  } else {
+  }
+  if (screenshotComboActive) {
+    if (gpio.isPressed(HalGPIO::BTN_POWER)) return;
+    if (gpio.wasReleased(HalGPIO::BTN_POWER)) {
+      screenshotButtonsReleased = true;
+      screenshotComboActive = false;
+      return;
+    }
     screenshotButtonsReleased = true;
+    screenshotComboActive = false;
+  }
+
+#ifdef SIMULATOR
+  if (gpio.consumeSimulatorSleepRequest()) {
+    enterDeepSleep();
+    lastActivityTime = millis();
+    return;
   }
+#endif
 
   const unsigned long sleepTimeoutMs = SETTINGS.getSleepTimeoutMs();
   if (millis() - lastActivityTime >= sleepTimeoutMs) {
@@ -815,6 +894,10 @@ void loop() {
   activityManager.loop();
   const unsigned long activityDuration = millis() - activityStartTime;
 
+#ifdef SIMULATOR
+  runSimulatorSmokeTestTick();
+#endif
+
   const unsigned long loopDuration = millis() - loopStartTime;
   if (loopDuration > maxLoopDuration) {
     maxLoopDuration = loopDuration;
diff --git a/src/network/CrossPointWebServer.cpp b/src/network/CrossPointWebServer.cpp
index 85771c33..b7e674c0 100644
--- a/src/network/CrossPointWebServer.cpp
+++ b/src/network/CrossPointWebServer.cpp
@@ -12,30 +12,55 @@
 #include <esp_task_wdt.h>
 
 #include <algorithm>
+#include <iterator>
 
 #include "AppVersion.h"
 #include "CrossPointSettings.h"
+#include "FontInstaller.h"
 #include "OpdsServerStore.h"
+#include "SdCardFontSystem.h"
 #include "SettingsList.h"
 #include "WebDAVHandler.h"
 #include "WifiCredentialStore.h"
 #include "html/FilesPageHtml.generated.h"
+#include "html/FontsPageHtml.generated.h"
 #include "html/HomePageHtml.generated.h"
 #include "html/SettingsPageHtml.generated.h"
 #include "html/js/jszip_minJs.generated.h"
 #include "util/StringUtils.h"
 
 namespace {
-// Folders/files to hide from the web interface file browser
-// Note: Items starting with "." are automatically hidden
-const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"};
-constexpr size_t HIDDEN_ITEMS_COUNT = sizeof(HIDDEN_ITEMS) / sizeof(HIDDEN_ITEMS[0]);
+// Folders/files to hide from the web interface file browser.
+// Dot-prefixed items are hidden unless showHiddenFiles is enabled.
+constexpr const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"};
 constexpr uint16_t UDP_PORTS[] = {54982, 48123, 39001, 44044, 59678};
 constexpr uint16_t LOCAL_UDP_PORT = 8134;
 
 // Static pointer for WebSocket callback (WebSocketsServer requires C-style callback)
 CrossPointWebServer* wsInstance = nullptr;
 
+uint8_t enumDisplayIndexForRawValue(const SettingInfo& setting, uint8_t rawValue) {
+  if (setting.enumRawValues.empty()) {
+    return rawValue;
+  }
+
+  auto it = std::find(setting.enumRawValues.begin(), setting.enumRawValues.end(), rawValue);
+  if (it == setting.enumRawValues.end()) {
+    return 0;
+  }
+  return static_cast<uint8_t>(std::distance(setting.enumRawValues.begin(), it));
+}
+
+uint8_t enumRawValueForDisplayIndex(const SettingInfo& setting, uint8_t displayIndex) {
+  if (setting.enumRawValues.empty()) {
+    return displayIndex;
+  }
+  if (displayIndex >= setting.enumRawValues.size()) {
+    return setting.enumRawValues.front();
+  }
+  return setting.enumRawValues[displayIndex];
+}
+
 // WebSocket upload state
 FsFile wsUploadFile;
 String wsUploadFileName;
@@ -91,10 +116,10 @@ bool isProtectedPath(const String& path) {
 
     String segment = path.substring(start, end);
 
-    if (segment.startsWith(".")) return true;
+    if (!SETTINGS.showHiddenFiles && segment.startsWith(".")) return true;
 
-    for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) {
-      if (segment.equals(HIDDEN_ITEMS[i])) return true;
+    for (const auto* item : HIDDEN_ITEMS) {
+      if (segment.equals(item)) return true;
     }
 
     start = end + 1;
@@ -140,6 +165,9 @@ void CrossPointWebServer::begin() {
   // Disable WiFi sleep to improve responsiveness and prevent 'unreachable' errors.
   // This is critical for reliable web server operation on ESP32.
   WiFi.setSleep(false);
+  // Default varies by ESP32 core version. The activity's loss-recovery loop
+  // relies on driver retries during transient disconnects.
+  WiFi.setAutoReconnect(true);
 
   // Note: WebServer class doesn't have setNoDelay() in the standard ESP32 library.
   // We rely on disabling WiFi sleep for responsiveness.
@@ -181,6 +209,12 @@ void CrossPointWebServer::begin() {
   server->on("/api/settings", HTTP_GET, [this] { handleGetSettings(); });
   server->on("/api/settings", HTTP_POST, [this] { handlePostSettings(); });
 
+  // Font management endpoints
+  server->on("/fonts", HTTP_GET, [this] { handleFontsPage(); });
+  server->on("/api/fonts", HTTP_GET, [this] { handleFontList(); });
+  server->on("/api/fonts/upload", HTTP_POST, [this] { handleFontUpload(); }, [this] { handleFontUploadData(); });
+  server->on("/api/fonts/delete", HTTP_POST, [this] { handleFontDelete(); });
+
   // OPDS server endpoints
   server->on("/api/opds", HTTP_GET, [this] { handleGetOpdsServers(); });
   server->on("/api/opds", HTTP_POST, [this] { handlePostOpdsServer(); });
@@ -414,8 +448,8 @@ void CrossPointWebServer::scanFiles(const char* path, const std::function<void(F
 
     // Check against explicitly hidden items list
     if (!shouldHide) {
-      for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) {
-        if (fileName.equals(HIDDEN_ITEMS[i])) {
+      for (const auto* item : HIDDEN_ITEMS) {
+        if (fileName.equals(item)) {
           shouldHide = true;
           break;
         }
@@ -1082,7 +1116,10 @@ void CrossPointWebServer::handleSettingsPage() const {
 }
 
 void CrossPointWebServer::handleGetSettings() const {
-  const auto& settings = getSettingsList();
+  // Pass the SD font registry so the fontFamily setting's enumStringValues
+  // includes SD-resident families — otherwise the web API only exposes the
+  // three built-in fonts.
+  const auto& settings = getSettingsList(&sdFontSystem.registry());
 
   server->setContentLength(CONTENT_LENGTH_UNKNOWN);
   server->send(200, "application/json", "");
@@ -1112,13 +1149,19 @@ void CrossPointWebServer::handleGetSettings() const {
       case SettingType::ENUM: {
         doc["type"] = "enum";
         if (s.valuePtr) {
-          doc["value"] = static_cast<int>(SETTINGS.*(s.valuePtr));
+          doc["value"] = static_cast<int>(enumDisplayIndexForRawValue(s, SETTINGS.*(s.valuePtr)));
         } else if (s.valueGetter) {
           doc["value"] = static_cast<int>(s.valueGetter());
         }
         JsonArray options = doc["options"].to<JsonArray>();
-        for (const auto& opt : s.enumValues) {
-          options.add(I18N.get(opt));
+        if (!s.enumStringValues.empty()) {
+          for (const auto& opt : s.enumStringValues) {
+            options.add(opt);
+          }
+        } else {
+          for (const auto& opt : s.enumValues) {
+            options.add(I18N.get(opt));
+          }
         }
         break;
       }
@@ -1178,7 +1221,7 @@ void CrossPointWebServer::handlePostSettings() {
     return;
   }
 
-  const auto& settings = getSettingsList();
+  const auto& settings = getSettingsList(&sdFontSystem.registry());
   int applied = 0;
 
   for (const auto& s : settings) {
@@ -1196,9 +1239,11 @@ void CrossPointWebServer::handlePostSettings() {
       }
       case SettingType::ENUM: {
         const int val = doc[s.key].as<int>();
-        if (val >= 0 && val < static_cast<int>(s.enumValues.size())) {
+        const int maxVal = s.enumStringValues.empty() ? static_cast<int>(s.enumValues.size())
+                                                      : static_cast<int>(s.enumStringValues.size());
+        if (val >= 0 && val < maxVal) {
           if (s.valuePtr) {
-            SETTINGS.*(s.valuePtr) = static_cast<uint8_t>(val);
+            SETTINGS.*(s.valuePtr) = enumRawValueForDisplayIndex(s, static_cast<uint8_t>(val));
           } else if (s.valueSetter) {
             s.valueSetter(static_cast<uint8_t>(val));
           }
@@ -1676,3 +1721,199 @@ void CrossPointWebServer::onWebSocketEvent(uint8_t num, WStype_t type, uint8_t*
       break;
   }
 }
+
+// --- Font management handlers ---
+
+void CrossPointWebServer::handleFontsPage() const {
+  sendHtmlContent(server.get(), FontsPageHtml, sizeof(FontsPageHtml));
+  LOG_DBG("WEB", "Served fonts page");
+}
+
+void CrossPointWebServer::handleFontList() const {
+  // Pick up any uploads/deletes that happened since the last reader load.
+  const_cast<SdCardFontSystem&>(sdFontSystem).refreshIfDirty();
+  const auto& families = sdFontSystem.registry().getFamilies();
+
+  JsonDocument doc;
+  JsonArray arr = doc["families"].to<JsonArray>();
+  doc["maxFamilies"] = SdCardFontRegistry::MAX_SD_FAMILIES;
+
+  for (const auto& family : families) {
+    JsonObject fObj = arr.add<JsonObject>();
+    fObj["name"] = family.name;
+
+    JsonArray sizes = fObj["sizes"].to<JsonArray>();
+    for (uint8_t s : family.availableSizes()) {
+      sizes.add(s);
+    }
+
+    JsonArray files = fObj["files"].to<JsonArray>();
+    for (const auto& file : family.files) {
+      JsonObject fileObj = files.add<JsonObject>();
+      // Extract filename from full path
+      const char* name = strrchr(file.path.c_str(), '/');
+      fileObj["name"] = name ? name + 1 : file.path.c_str();
+
+      // Stat the file for size
+      FsFile f;
+      if (Storage.openFileForRead("WEB", file.path.c_str(), f)) {
+        fileObj["size"] = static_cast<unsigned long>(f.size());
+        f.close();
+      } else {
+        fileObj["size"] = 0;
+      }
+    }
+  }
+
+  String json;
+  serializeJson(doc, json);
+  server->send(200, "application/json", json);
+}
+
+void CrossPointWebServer::handleFontUploadData() {
+  HTTPUpload& upload = server->upload();
+
+  switch (upload.status) {
+    case UPLOAD_FILE_START: {
+      esp_task_wdt_reset();
+      String family = server->arg("family");
+      fontUpload.valid = false;
+      fontUpload.magicChecked = false;
+      fontUpload.bytesWritten = 0;
+      fontUpload.bufferPos = 0;
+
+      if (!FontInstaller::isValidFamilyName(family.c_str())) {
+        LOG_ERR("WEB", "Invalid font family name: %s", family.c_str());
+        break;
+      }
+
+      String filename = upload.filename;
+      // Validate filename: rejects path traversal (../, /, \) and enforces
+      // a .cpfont basename of alphanumeric + hyphen + underscore. Without
+      // this an attacker could supply "../../.crosspoint/settings.json" as
+      // a "filename" and have it written outside the fonts directory.
+      if (!FontInstaller::isValidCpfontFilename(filename.c_str())) {
+        LOG_ERR("WEB", "Invalid font filename: %s", filename.c_str());
+        break;
+      }
+
+      fontUpload.familyName = family.c_str();
+
+      // Create a temporary FontInstaller for directory creation
+      FontInstaller installer(sdFontSystem.registry());
+      if (!installer.ensureFamilyDir(family.c_str())) {
+        LOG_ERR("WEB", "Failed to create font family dir");
+        break;
+      }
+
+      char path[128];
+      FontInstaller::buildFontPath(family.c_str(), filename.c_str(), path, sizeof(path));
+      fontUpload.filePath = path;
+
+      if (!Storage.openFileForWrite("WEB", path, fontUpload.file)) {
+        LOG_ERR("WEB", "Failed to open font file for write: %s", path);
+        break;
+      }
+
+      fontUpload.valid = true;
+      LOG_DBG("WEB", "Font upload started: %s -> %s", filename.c_str(), path);
+      break;
+    }
+
+    case UPLOAD_FILE_WRITE: {
+      if (!fontUpload.valid) break;
+      esp_task_wdt_reset();
+
+      // Validate magic bytes on first chunk only
+      if (!fontUpload.magicChecked && upload.currentSize >= 8) {
+        if (memcmp(upload.buf, "CPFONT\0\0", 8) != 0) {
+          LOG_ERR("WEB", "Invalid .cpfont magic bytes");
+          fontUpload.valid = false;
+          break;
+        }
+        fontUpload.magicChecked = true;
+      }
+
+      // Buffer writes for efficiency
+      size_t remaining = upload.currentSize;
+      const uint8_t* src = upload.buf;
+      while (remaining > 0) {
+        size_t space = FontUploadState::BUFFER_SIZE - fontUpload.bufferPos;
+        size_t chunk = (remaining < space) ? remaining : space;
+        memcpy(fontUpload.buffer.data() + fontUpload.bufferPos, src, chunk);
+        fontUpload.bufferPos += chunk;
+        src += chunk;
+        remaining -= chunk;
+
+        if (fontUpload.bufferPos >= FontUploadState::BUFFER_SIZE) {
+          fontUpload.file.write(fontUpload.buffer.data(), fontUpload.bufferPos);
+          fontUpload.bytesWritten += fontUpload.bufferPos;
+          fontUpload.bufferPos = 0;
+          esp_task_wdt_reset();
+        }
+      }
+      break;
+    }
+
+    case UPLOAD_FILE_END: {
+      // Flush remaining buffer
+      if (fontUpload.valid && fontUpload.bufferPos > 0) {
+        fontUpload.file.write(fontUpload.buffer.data(), fontUpload.bufferPos);
+        fontUpload.bytesWritten += fontUpload.bufferPos;
+        fontUpload.bufferPos = 0;
+      }
+      fontUpload.file.close();
+
+      if (!fontUpload.valid && !fontUpload.filePath.empty()) {
+        Storage.remove(fontUpload.filePath.c_str());
+      }
+
+      LOG_DBG("WEB", "Font upload end: valid=%d, %zu bytes", fontUpload.valid, fontUpload.bytesWritten);
+      break;
+    }
+
+    case UPLOAD_FILE_ABORTED: {
+      fontUpload.file.close();
+      if (!fontUpload.filePath.empty()) {
+        Storage.remove(fontUpload.filePath.c_str());
+      }
+      fontUpload.valid = false;
+      LOG_DBG("WEB", "Font upload aborted");
+      break;
+    }
+  }
+}
+
+void CrossPointWebServer::handleFontUpload() {
+  if (fontUpload.valid) {
+    sdFontSystem.markRegistryDirty();
+    server->send(200, "application/json", "{\"ok\":true}");
+    LOG_DBG("WEB", "Font upload complete: %s", fontUpload.filePath.c_str());
+  } else {
+    server->send(400, "application/json", "{\"error\":\"Invalid .cpfont file\"}");
+  }
+}
+
+void CrossPointWebServer::handleFontDelete() {
+  String body = server->arg("plain");
+  JsonDocument doc;
+  DeserializationError err = deserializeJson(doc, body);
+
+  if (err || !doc["family"].is<const char*>()) {
+    server->send(400, "application/json", "{\"error\":\"Invalid request\"}");
+    return;
+  }
+
+  const char* familyName = doc["family"];
+  FontInstaller installer(sdFontSystem.registry());
+  auto result = installer.deleteFamily(familyName);
+
+  if (result == FontInstaller::Error::OK) {
+    sdFontSystem.markRegistryDirty();
+    server->send(200, "application/json", "{\"ok\":true}");
+    LOG_DBG("WEB", "Deleted font family: %s", familyName);
+  } else {
+    server->send(500, "application/json", "{\"error\":\"Delete failed\"}");
+    LOG_ERR("WEB", "Failed to delete font family: %s", familyName);
+  }
+}
diff --git a/src/network/CrossPointWebServer.h b/src/network/CrossPointWebServer.h
index 6850b687..c5116681 100644
--- a/src/network/CrossPointWebServer.h
+++ b/src/network/CrossPointWebServer.h
@@ -108,6 +108,28 @@ class CrossPointWebServer {
   void handleGetSettings() const;
   void handlePostSettings();
 
+  // Font management handlers
+  void handleFontsPage() const;
+  void handleFontList() const;
+  void handleFontUpload();
+  void handleFontUploadData();
+  void handleFontDelete();
+
+  // Font upload state
+  struct FontUploadState {
+    FsFile file;
+    std::string familyName;
+    std::string filePath;
+    bool valid = false;
+    bool magicChecked = false;
+    size_t bytesWritten = 0;
+    static constexpr size_t BUFFER_SIZE = 4096;
+    std::vector<uint8_t> buffer;
+    size_t bufferPos = 0;
+
+    FontUploadState() { buffer.resize(BUFFER_SIZE); }
+  } fontUpload;
+
   // OPDS server handlers
   void handleGetOpdsServers() const;
   void handlePostOpdsServer();
diff --git a/src/network/FirmwareFlasher.cpp b/src/network/FirmwareFlasher.cpp
new file mode 100644
index 00000000..38369ee7
--- /dev/null
+++ b/src/network/FirmwareFlasher.cpp
@@ -0,0 +1,311 @@
+#include "FirmwareFlasher.h"
+
+#include <Arduino.h>
+#include <HalStorage.h>
+#include <Logging.h>
+#include <esp_ota_ops.h>
+#include <esp_partition.h>
+#include <mbedtls/sha256.h>
+#include <spi_flash_mmap.h>
+
+#include <algorithm>
+#include <cstring>
+#include <memory>
+
+#include "OtaBootSwitch.h"
+
+namespace firmware_flash {
+
+namespace {
+constexpr uint8_t ESP_IMAGE_MAGIC = 0xE9;
+constexpr size_t MIN_FIRMWARE_SIZE = 64 * 1024;
+constexpr size_t SEC = SPI_FLASH_SEC_SIZE;  // 4 KiB
+constexpr size_t BLK = 64 * 1024;           // 64 KiB block-erase granularity
+constexpr size_t CHUNK = 4096;
+constexpr size_t SHA_TRAILER = 32;
+constexpr uint8_t CHECKSUM_SEED = 0xEF;
+constexpr size_t HEADER_SIZE = 24;
+constexpr size_t SEG_HEADER_SIZE = 8;
+}  // namespace
+
+const char* resultName(Result r) {
+  switch (r) {
+    case Result::OK:
+      return "OK";
+    case Result::OPEN_FAIL:
+      return "OPEN_FAIL";
+    case Result::TOO_SMALL:
+      return "TOO_SMALL";
+    case Result::TOO_LARGE:
+      return "TOO_LARGE";
+    case Result::BAD_MAGIC:
+      return "BAD_MAGIC";
+    case Result::BAD_SEGMENTS:
+      return "BAD_SEGMENTS";
+    case Result::BAD_CHECKSUM:
+      return "BAD_CHECKSUM";
+    case Result::BAD_SHA:
+      return "BAD_SHA";
+    case Result::BAD_SIZE:
+      return "BAD_SIZE";
+    case Result::NO_PARTITION:
+      return "NO_PARTITION";
+    case Result::OOM:
+      return "OOM";
+    case Result::READ_FAIL:
+      return "READ_FAIL";
+    case Result::ERASE_FAIL:
+      return "ERASE_FAIL";
+    case Result::WRITE_FAIL:
+      return "WRITE_FAIL";
+    case Result::OTADATA_FAIL:
+      return "OTADATA_FAIL";
+  }
+  return "?";
+}
+
+namespace {
+// Stream `length` bytes from `file` starting at the current read offset, feeding them through
+// both the XOR-checksum and SHA256 accumulators. Used by validateImageFile so the whole image
+// is verified end-to-end without holding it in RAM (ESP32-C3 only has ~380 KB).
+Result feedHashAndChecksum(HalFile& file, size_t length, uint8_t* xorAccum, mbedtls_sha256_context* sha, uint8_t* buf) {
+  size_t remaining = length;
+  while (remaining > 0) {
+    const size_t want = std::min<size_t>(CHUNK, remaining);
+    const int got = file.read(buf, want);
+    if (got <= 0 || static_cast<size_t>(got) != want) return Result::READ_FAIL;
+    if (sha) mbedtls_sha256_update(sha, buf, want);
+    if (xorAccum) {
+      uint8_t acc = *xorAccum;
+      for (size_t i = 0; i < want; i++) acc ^= buf[i];
+      *xorAccum = acc;
+    }
+    remaining -= want;
+  }
+  return Result::OK;
+}
+}  // namespace
+
+Result validateImageFile(const char* sdPath, size_t partitionSize) {
+  HalFile file;
+  if (!Storage.openFileForRead("FLASH", sdPath, file) || !file) {
+    LOG_ERR("FLASH", "validate: open failed: %s", sdPath);
+    return Result::OPEN_FAIL;
+  }
+
+  const size_t fileSize = file.fileSize();
+  if (fileSize < MIN_FIRMWARE_SIZE) {
+    LOG_ERR("FLASH", "validate: too small: %u", static_cast<unsigned>(fileSize));
+    file.close();
+    return Result::TOO_SMALL;
+  }
+  if (partitionSize > 0 && fileSize > partitionSize) {
+    LOG_ERR("FLASH", "validate: too large: %u > %u", static_cast<unsigned>(fileSize),
+            static_cast<unsigned>(partitionSize));
+    file.close();
+    return Result::TOO_LARGE;
+  }
+
+  uint8_t header[HEADER_SIZE];
+  if (file.read(header, HEADER_SIZE) != static_cast<int>(HEADER_SIZE)) {
+    LOG_ERR("FLASH", "validate: header read failed");
+    file.close();
+    return Result::READ_FAIL;
+  }
+  if (header[0] != ESP_IMAGE_MAGIC) {
+    LOG_ERR("FLASH", "validate: bad magic 0x%02X", header[0]);
+    file.close();
+    return Result::BAD_MAGIC;
+  }
+  const uint8_t segCount = header[1];
+  const bool hashAppended = header[23] != 0;
+
+  auto buf = std::unique_ptr<uint8_t[]>(new (std::nothrow) uint8_t[CHUNK]);
+  if (!buf) {
+    file.close();
+    return Result::OOM;
+  }
+
+  mbedtls_sha256_context shaCtx;
+  mbedtls_sha256_init(&shaCtx);
+  mbedtls_sha256_starts(&shaCtx, /*is224=*/0);
+  mbedtls_sha256_update(&shaCtx, header, HEADER_SIZE);
+
+  uint8_t xorAccum = CHECKSUM_SEED;
+  size_t pos = HEADER_SIZE;
+
+  for (uint8_t i = 0; i < segCount; i++) {
+    if (pos + SEG_HEADER_SIZE > fileSize) {
+      LOG_ERR("FLASH", "validate: seg %u header overruns EOF at %u", i, static_cast<unsigned>(pos));
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return Result::BAD_SEGMENTS;
+    }
+    uint8_t segHdr[SEG_HEADER_SIZE];
+    if (file.read(segHdr, SEG_HEADER_SIZE) != static_cast<int>(SEG_HEADER_SIZE)) {
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return Result::READ_FAIL;
+    }
+    mbedtls_sha256_update(&shaCtx, segHdr, SEG_HEADER_SIZE);
+    pos += SEG_HEADER_SIZE;
+
+    uint32_t dataLen;
+    std::memcpy(&dataLen, segHdr + 4, sizeof(dataLen));
+    if (pos + dataLen > fileSize) {
+      LOG_ERR("FLASH", "validate: seg %u data overruns EOF (%u + %u > %u)", i, static_cast<unsigned>(pos),
+              static_cast<unsigned>(dataLen), static_cast<unsigned>(fileSize));
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return Result::BAD_SEGMENTS;
+    }
+
+    const Result feedRes = feedHashAndChecksum(file, dataLen, &xorAccum, &shaCtx, buf.get());
+    if (feedRes != Result::OK) {
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return feedRes;
+    }
+    pos += dataLen;
+  }
+
+  // pad_end is the 16-byte aligned offset at which the checksum byte sits at pad_end - 1.
+  const size_t padEnd = (pos + 16) & ~static_cast<size_t>(15);
+  const size_t expectedTotal = padEnd + (hashAppended ? SHA_TRAILER : 0);
+  if (expectedTotal != fileSize) {
+    LOG_ERR("FLASH", "validate: size mismatch body+pad=%u sha=%u expected=%u actual=%u", static_cast<unsigned>(padEnd),
+            static_cast<unsigned>(hashAppended ? SHA_TRAILER : 0), static_cast<unsigned>(expectedTotal),
+            static_cast<unsigned>(fileSize));
+    mbedtls_sha256_free(&shaCtx);
+    file.close();
+    return Result::BAD_SIZE;
+  }
+
+  // Read the padding bytes (which include the stored checksum at the last byte) into the SHA stream.
+  const size_t padLen = padEnd - pos;
+  uint8_t padBuf[16];
+  if (padLen > sizeof(padBuf)) {
+    mbedtls_sha256_free(&shaCtx);
+    file.close();
+    return Result::BAD_SIZE;
+  }
+  if (padLen > 0 && file.read(padBuf, padLen) != static_cast<int>(padLen)) {
+    mbedtls_sha256_free(&shaCtx);
+    file.close();
+    return Result::READ_FAIL;
+  }
+  mbedtls_sha256_update(&shaCtx, padBuf, padLen);
+
+  const uint8_t storedChecksum = padBuf[padLen - 1];
+  if ((xorAccum & 0xFF) != storedChecksum) {
+    LOG_ERR("FLASH", "validate: checksum mismatch computed=0x%02X stored=0x%02X", xorAccum, storedChecksum);
+    mbedtls_sha256_free(&shaCtx);
+    file.close();
+    return Result::BAD_CHECKSUM;
+  }
+
+  if (hashAppended) {
+    uint8_t computed[SHA_TRAILER];
+    mbedtls_sha256_finish(&shaCtx, computed);
+    uint8_t stored[SHA_TRAILER];
+    if (file.read(stored, SHA_TRAILER) != static_cast<int>(SHA_TRAILER)) {
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return Result::READ_FAIL;
+    }
+    if (std::memcmp(computed, stored, SHA_TRAILER) != 0) {
+      LOG_ERR("FLASH", "validate: SHA256 mismatch");
+      mbedtls_sha256_free(&shaCtx);
+      file.close();
+      return Result::BAD_SHA;
+    }
+  }
+
+  mbedtls_sha256_free(&shaCtx);
+  file.close();
+  return Result::OK;
+}
+
+Result flashFromSdPath(const char* sdPath, ProgressCb onProgress, void* ctx, bool alreadyValidated) {
+  // Resolve destination first so we can size-check during validation. The full image-integrity
+  // pass below verifies header, segment table, XOR checksum and SHA256 trailer end-to-end before
+  // we touch otadata, so a truncated/corrupted .bin can never become the next boot target.
+  const esp_partition_t* dest = esp_ota_get_next_update_partition(nullptr);
+  if (!dest) {
+    LOG_ERR("FLASH", "no next-update partition");
+    return Result::NO_PARTITION;
+  }
+
+  // When the caller already ran validateImageFile() against this same partition
+  // size (e.g. SdFirmwareUpdateActivity validates before the confirmation
+  // prompt), skip the redundant integrity scan. We still keep the partition
+  // lookup so the rest of the flashing path stays unchanged.
+  if (!alreadyValidated) {
+    const Result validateRes = validateImageFile(sdPath, dest->size);
+    if (validateRes != Result::OK) {
+      LOG_ERR("FLASH", "image validation failed: %s", resultName(validateRes));
+      return validateRes;
+    }
+  }
+
+  HalFile file;
+  if (!Storage.openFileForRead("FLASH", sdPath, file) || !file) {
+    LOG_ERR("FLASH", "open failed: %s", sdPath);
+    return Result::OPEN_FAIL;
+  }
+
+  const size_t firmwareSize = file.fileSize();
+  LOG_INF("FLASH", "src=%s size=%u dest=%s @0x%x partsize=%u", sdPath, static_cast<unsigned>(firmwareSize), dest->label,
+          static_cast<unsigned>(dest->address), static_cast<unsigned>(dest->size));
+
+  auto buffer = std::unique_ptr<uint8_t[]>(new (std::nothrow) uint8_t[CHUNK]);
+  if (!buffer) {
+    LOG_ERR("FLASH", "OOM");
+    file.close();
+    return Result::OOM;
+  }
+
+  // Interleave erase + write so the progress bar advances 0→100% smoothly
+  // rather than stalling for several seconds during a single up-front erase.
+  size_t streamPos = 0;
+  size_t erasedUpto = 0;
+  while (streamPos < firmwareSize) {
+    if (streamPos >= erasedUpto) {
+      size_t eraseLen = std::min<size_t>(BLK, dest->size - streamPos);
+      eraseLen = (eraseLen + SEC - 1) & ~(SEC - 1);
+      eraseLen = std::min<size_t>(eraseLen, dest->size - streamPos);
+      if (esp_partition_erase_range(dest, streamPos, eraseLen) != ESP_OK) {
+        LOG_ERR("FLASH", "erase @%u (len=%u) failed", static_cast<unsigned>(streamPos),
+                static_cast<unsigned>(eraseLen));
+        file.close();
+        return Result::ERASE_FAIL;
+      }
+      erasedUpto = streamPos + eraseLen;
+    }
+
+    const size_t want = std::min<size_t>(CHUNK, firmwareSize - streamPos);
+    const int read = file.read(buffer.get(), want);
+    if (read <= 0 || static_cast<size_t>(read) != want) {
+      LOG_ERR("FLASH", "read @%u: got=%d want=%u", static_cast<unsigned>(streamPos), read, static_cast<unsigned>(want));
+      file.close();
+      return Result::READ_FAIL;
+    }
+    if (esp_partition_write(dest, streamPos, buffer.get(), want) != ESP_OK) {
+      LOG_ERR("FLASH", "write @%u failed", static_cast<unsigned>(streamPos));
+      file.close();
+      return Result::WRITE_FAIL;
+    }
+    streamPos += want;
+    if (onProgress) onProgress(streamPos, firmwareSize, ctx);
+    delay(1);
+  }
+  file.close();
+
+  if (!ota_boot::switchTo(dest)) {
+    LOG_ERR("FLASH", "otadata switch failed");
+    return Result::OTADATA_FAIL;
+  }
+  return Result::OK;
+}
+
+}  // namespace firmware_flash
diff --git a/src/network/FirmwareFlasher.h b/src/network/FirmwareFlasher.h
new file mode 100644
index 00000000..2d622c21
--- /dev/null
+++ b/src/network/FirmwareFlasher.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+// Flash a firmware image from an SD-card path into the next OTA app
+// partition, then switch otadata so the X3/X4 stock bootloader picks it up
+// on next boot. Mirrors the web flasher: raw esp_partition_erase_range +
+// esp_partition_write + ota_boot::switchTo (no Arduino Update class, no
+// esp_image_verify — those reject our patched image on X4 silicon).
+//
+// Both the SD update activity and the OTA path land here. OTA first
+// downloads the firmware to an SD-card cache file, then calls this.
+
+namespace firmware_flash {
+
+enum class Result {
+  OK,
+  OPEN_FAIL,
+  TOO_SMALL,
+  TOO_LARGE,
+  BAD_MAGIC,
+  BAD_SEGMENTS,  // segment table malformed or runs past EOF
+  BAD_CHECKSUM,  // ESP image XOR checksum mismatch
+  BAD_SHA,       // SHA256 trailer mismatch (hash_appended images)
+  BAD_SIZE,      // body+pad+sha length doesn't match file size
+  NO_PARTITION,
+  OOM,
+  READ_FAIL,
+  ERASE_FAIL,
+  WRITE_FAIL,
+  OTADATA_FAIL,
+};
+
+// Progress callback: called after every chunk write. `written`/`total` are bytes.
+using ProgressCb = void (*)(size_t written, size_t total, void* ctx);
+
+// Open `sdPath`, validate it looks like an ESP32 image, then stream it into the
+// next OTA app partition with interleaved 64 KiB erase + sector writes. On
+// success switches otadata via ota_boot::switchTo. Caller is responsible for
+// ESP.restart() afterwards.
+//
+// `alreadyValidated` lets callers that have just run `validateImageFile()`
+// themselves (e.g. SdFirmwareUpdateActivity, which validates before showing
+// the user the confirmation prompt) skip the redundant second pass. Defaults
+// to false so callers without prior validation (any future entry point) keep
+// the defense-in-depth check.
+Result flashFromSdPath(const char* sdPath, ProgressCb onProgress, void* ctx, bool alreadyValidated = false);
+
+// Full-image integrity check that mirrors the bootloader's verification:
+// header magic, segment table walk, XOR checksum, and SHA256 trailer (when
+// hash_appended == 1). Run this before flashing a candidate firmware so a
+// truncated/corrupted .bin never reaches otadata.
+//
+// `partitionSize` is the size of the destination OTA partition; pass 0 to
+// skip the size-fits-partition check (e.g. when validating ahead of partition
+// lookup). Streams the file in CHUNK-sized reads; the file is rewound on
+// success so the caller can immediately reread it for flashing.
+Result validateImageFile(const char* sdPath, size_t partitionSize);
+
+const char* resultName(Result r);
+
+}  // namespace firmware_flash
diff --git a/src/network/OtaBootSwitch.cpp b/src/network/OtaBootSwitch.cpp
new file mode 100644
index 00000000..7c3ca762
--- /dev/null
+++ b/src/network/OtaBootSwitch.cpp
@@ -0,0 +1,86 @@
+#include "OtaBootSwitch.h"
+
+#include <Logging.h>
+#include <esp_rom_crc.h>
+#include <spi_flash_mmap.h>
+#include <string.h>
+
+namespace ota_boot {
+
+uint32_t computeSeqCrc(uint32_t seq) {
+  return esp_rom_crc32_le(UINT32_MAX, reinterpret_cast<const uint8_t*>(&seq), kOtaSeqCrcLen);
+}
+
+bool switchTo(const esp_partition_t* dest) {
+  if (!dest) return false;
+
+  const esp_partition_t* otadata =
+      esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_OTA, nullptr);
+  if (!otadata) {
+    LOG_ERR("BOOT", "otadata partition not found");
+    return false;
+  }
+  if (otadata->size < 2 * SPI_FLASH_SEC_SIZE) {
+    LOG_ERR("BOOT", "otadata too small: %u", static_cast<unsigned>(otadata->size));
+    return false;
+  }
+
+  SelectEntry slots[2] = {};
+  if (esp_partition_read(otadata, 0, &slots[0], sizeof(SelectEntry)) != ESP_OK ||
+      esp_partition_read(otadata, SPI_FLASH_SEC_SIZE, &slots[1], sizeof(SelectEntry)) != ESP_OK) {
+    LOG_ERR("BOOT", "otadata read failed");
+    return false;
+  }
+
+  // Pick the slot with valid CRC and highest seq, ignoring INVALID/ABORTED.
+  int activeIdx = -1;
+  uint32_t activeSeq = 0;
+  for (int i = 0; i < 2; ++i) {
+    if (slots[i].ota_seq == 0xFFFFFFFFu) continue;
+    if (slots[i].crc != computeSeqCrc(slots[i].ota_seq)) continue;
+    if (slots[i].ota_state == kOtaImgInvalid || slots[i].ota_state == kOtaImgAborted) continue;
+    if (activeIdx < 0 || slots[i].ota_seq > activeSeq) {
+      activeIdx = i;
+      activeSeq = slots[i].ota_seq;
+    }
+  }
+  LOG_INF("BOOT", "otadata: active slot=%d seq=%u", activeIdx, static_cast<unsigned>(activeSeq));
+
+  // ota_seq encoding: (seq - 1) % NUM_OTA_PARTITIONS picks the partition.
+  const uint32_t destOtaIdx =
+      static_cast<uint32_t>(dest->subtype) - static_cast<uint32_t>(ESP_PARTITION_SUBTYPE_APP_OTA_0);
+  if (destOtaIdx > 15) {
+    LOG_ERR("BOOT", "dest is not an OTA app partition (subtype=0x%02X)", dest->subtype);
+    return false;
+  }
+
+  // Find smallest seq > activeSeq such that (seq-1) % 2 == destOtaIdx,
+  // assuming 2 OTA partitions (matches our partitions.csv with ota_0 + ota_1).
+  uint32_t newSeq = activeSeq + 1;
+  while (((newSeq - 1u) % 2u) != (destOtaIdx % 2u)) ++newSeq;
+
+  SelectEntry next = {};
+  next.ota_seq = newSeq;
+  memset(next.seq_label, 0xFF, sizeof(next.seq_label));
+  next.ota_state = kOtaImgNew;
+  next.crc = computeSeqCrc(next.ota_seq);
+
+  // Write to the OTHER slot (so the bootloader sees a higher seq there).
+  const int targetSlot = (activeIdx == 0) ? 1 : 0;
+  const size_t targetOff = static_cast<size_t>(targetSlot) * SPI_FLASH_SEC_SIZE;
+
+  if (esp_partition_erase_range(otadata, targetOff, SPI_FLASH_SEC_SIZE) != ESP_OK) {
+    LOG_ERR("BOOT", "otadata erase failed (slot=%d)", targetSlot);
+    return false;
+  }
+  if (esp_partition_write(otadata, targetOff, &next, sizeof(next)) != ESP_OK) {
+    LOG_ERR("BOOT", "otadata write failed (slot=%d)", targetSlot);
+    return false;
+  }
+
+  LOG_INF("BOOT", "otadata: wrote slot=%d seq=%u crc=0x%08x -> %s", targetSlot, static_cast<unsigned>(newSeq),
+          static_cast<unsigned>(next.crc), dest->label);
+  return true;
+}
+
+}  // namespace ota_boot
diff --git a/src/network/OtaBootSwitch.h b/src/network/OtaBootSwitch.h
new file mode 100644
index 00000000..3c52f7be
--- /dev/null
+++ b/src/network/OtaBootSwitch.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <esp_partition.h>
+
+#include <cstddef>
+#include <cstdint>
+
+// X4 (and X3) factory bootloaders accept our patch_firmware_image.py-patched
+// firmware.bin (web flasher proves this), but the running ESP-IDF's
+// esp_image_verify rejects with bogus efuse-blk-rev errors. Both SD-card and
+// OTA update paths bypass that runtime check by writing the OTA app partition
+// raw and updating otadata directly — same scheme as the web flasher
+// (crosspoint-reader-docs/src/lib/flasher/OtaPartition.ts).
+//
+// Layout reference: esp_flash_partitions.h. CRC covers ota_seq (4 bytes) only.
+
+namespace ota_boot {
+
+struct __attribute__((packed)) SelectEntry {
+  uint32_t ota_seq;
+  uint8_t seq_label[20];
+  uint32_t ota_state;
+  uint32_t crc;
+};
+static_assert(sizeof(SelectEntry) == 32, "SelectEntry must be 32 bytes");
+
+constexpr uint32_t kOtaImgNew = 0;      // ESP_OTA_IMG_NEW
+constexpr uint32_t kOtaImgInvalid = 3;  // ESP_OTA_IMG_INVALID
+constexpr uint32_t kOtaImgAborted = 4;  // ESP_OTA_IMG_ABORTED
+constexpr size_t kOtaSeqCrcLen = 4;
+
+// CRC32-LE over the 4-byte ota_seq, init UINT32_MAX. Matches IDF and web flasher.
+uint32_t computeSeqCrc(uint32_t seq);
+
+// Switch the bootloader's selected app partition to `dest` by writing a fresh
+// otadata entry into the inactive otadata slot. Bypasses esp_ota_set_boot_partition's
+// esp_image_verify call. The bytes in `dest` must already be a valid app image
+// (e.g. patch_firmware_image.py output) — caller is responsible for that.
+//
+// Returns true on success.
+bool switchTo(const esp_partition_t* dest);
+
+}  // namespace ota_boot
diff --git a/src/network/WebDAVHandler.cpp b/src/network/WebDAVHandler.cpp
index 481bfc63..19e4e9f6 100644
--- a/src/network/WebDAVHandler.cpp
+++ b/src/network/WebDAVHandler.cpp
@@ -7,9 +7,20 @@
 #include <Logging.h>
 #include <esp_task_wdt.h>
 
+#include <algorithm>
+#include <cstring>
+
+#include "CrossPointSettings.h"
+
 namespace {
-const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"};
-constexpr size_t HIDDEN_ITEMS_COUNT = sizeof(HIDDEN_ITEMS) / sizeof(HIDDEN_ITEMS[0]);
+constexpr const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"};
+constexpr size_t HIDDEN_ITEM_COUNT = sizeof(HIDDEN_ITEMS) / sizeof(HIDDEN_ITEMS[0]);
+
+bool isProtectedPathSegment(const char* name) {
+  return (!SETTINGS.showHiddenFiles && name[0] == '.') ||
+         std::any_of(HIDDEN_ITEMS, HIDDEN_ITEMS + HIDDEN_ITEM_COUNT,
+                     [name](const char* item) { return strcmp(name, item) == 0; });
+}
 
 // RFC 1123 date format helper: "Sun, 06 Nov 1994 08:49:37 GMT"
 // ESP32 doesn't have real-time clock set by default, so we use a fixed epoch date
@@ -227,18 +238,7 @@ void WebDAVHandler::handlePropfind(WebServer& s) {
     while (file) {
       file.getName(name, sizeof(name));
 
-      // Skip hidden/protected items
-      bool shouldHide = (name[0] == '.');
-      if (!shouldHide) {
-        for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) {
-          if (strcmp(name, HIDDEN_ITEMS[i]) == 0) {
-            shouldHide = true;
-            break;
-          }
-        }
-      }
-
-      if (!shouldHide) {
+      if (!isProtectedPathSegment(name)) {
         String childPath = path;
         if (!childPath.endsWith("/")) childPath += "/";
         childPath += name;
@@ -772,11 +772,7 @@ bool WebDAVHandler::isProtectedPath(const String& path) const {
 
     String segment = path.substring(start, end);
 
-    if (segment.startsWith(".")) return true;
-
-    for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) {
-      if (segment.equals(HIDDEN_ITEMS[i])) return true;
-    }
+    if (isProtectedPathSegment(segment.c_str())) return true;
 
     start = end + 1;
   }
diff --git a/src/network/html/FilesPage.html b/src/network/html/FilesPage.html
index d4a7800f..922e24ff 100644
--- a/src/network/html/FilesPage.html
+++ b/src/network/html/FilesPage.html
@@ -47,7 +47,7 @@
     }
     h2 {
       color: var(--title-color);
-      margin-top: 0;
+      margin: 0;
     }
     .card {
       background: var(--card-bg);
@@ -67,7 +67,7 @@
     }
     .page-header-left {
       display: flex;
-      align-items: baseline;
+      align-items: center;
       gap: 12px;
       flex-wrap: wrap;
     }
@@ -1480,6 +1480,7 @@ <h1 class="crossink-header">CrossInk</h1>
   <a href="/">Home</a>
   <a href="/files" class="active">File Manager</a>
   <a href="/settings">Settings</a>
+  <a href="/fonts">Fonts</a>
 </div>
 
 <div class="page-header">
@@ -3459,6 +3460,26 @@ <h3>📂 Move File</h3>
   return result;
 }
 
+function protectWhitespaceOnlyTextNodes(content) {
+  const preserved = [];
+  const tokenPrefix = '__CROSSINK_PRESERVE_WS_';
+  const protectedContent = content.replace(/>([\s\u00a0]+)</g, (_, whitespace) => {
+    const token = `${tokenPrefix}${preserved.length}__`;
+    preserved.push(whitespace);
+    return `>${token}<`;
+  });
+
+  return {
+    content: protectedContent,
+    restore(serialized) {
+      return serialized.replace(new RegExp(`${escapeRegex(tokenPrefix)}(\\d+)__`, 'g'), (match, indexText) => {
+        const index = Number(indexText);
+        return Number.isInteger(index) && index >= 0 && index < preserved.length ? preserved[index] : match;
+      });
+    }
+  };
+}
+
 /**
  * Extract main identifier from OPF for NCX sync. DOMParser with regex fallback.
  */
@@ -3693,8 +3714,9 @@ <h3>📂 Move File</h3>
   if (!hasSvg || !content.includes('xlink:href')) return { c: content, fixed: false, count: 0 };
 
   try {
+    const whitespaceGuard = protectWhitespaceOnlyTextNodes(content);
     const parser = new DOMParser();
-    const doc = parser.parseFromString(content, 'application/xhtml+xml');
+    const doc = parser.parseFromString(whitespaceGuard.content, 'application/xhtml+xml');
 
     if (doc.querySelector('parsererror')) {
       // Fallback to regex
@@ -3729,7 +3751,7 @@ <h3>📂 Move File</h3>
     }
 
     if (fixedCount === 0) return { c: content, fixed: false, count: 0 };
-    return { c: safeSerialize(doc, content), fixed: true, count: fixedCount };
+    return { c: whitespaceGuard.restore(safeSerialize(doc, whitespaceGuard.content)), fixed: true, count: fixedCount };
 
   } catch (e) {
     // Fallback to regex
@@ -4330,8 +4352,9 @@ <h3>📂 Move File</h3>
 
     // Use DOMParser for all img modifications: remove width/height and handle split images
     try {
+      const whitespaceGuard = protectWhitespaceOnlyTextNodes(t);
       const parser = new DOMParser();
-      const doc = parser.parseFromString(t, 'application/xhtml+xml');
+      const doc = parser.parseFromString(whitespaceGuard.content, 'application/xhtml+xml');
       const parseError = doc.querySelector('parsererror');
 
       if (!parseError) {
@@ -4448,7 +4471,7 @@ <h3>📂 Move File</h3>
 
         // Only serialize if we made changes
         if (modified) {
-          t = safeSerialize(doc, content);
+          t = whitespaceGuard.restore(safeSerialize(doc, whitespaceGuard.content));
         }
       }
     } catch (e) {
diff --git a/src/network/html/FontsPage.html b/src/network/html/FontsPage.html
new file mode 100644
index 00000000..962cc2ce
--- /dev/null
+++ b/src/network/html/FontsPage.html
@@ -0,0 +1,392 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Fonts - CrossInk</title>
+    <style>
+      :root {
+        --font-color: #333;
+        --bg: #f5f5f5;
+        --title-color: #2c3e50;
+        --card-bg: #FFF;
+        --label-color: #7f8c8d;
+        --border-color: #eee;
+        --accent-color: rgb(110, 154, 130);
+        --accent-hover-color: #5a8c73;
+        --danger-color: #e74c3c;
+        --danger-hover: #c0392b;
+      }
+      @media (prefers-color-scheme: dark) {
+        :root {
+          --font-color: #f5f5f5;
+          --bg: #333;
+          --title-color: #ecf0f1;
+          --card-bg: #444;
+          --label-color: #bdc3c7;
+          --border-color: #555;
+          color-scheme: dark;
+        }
+      }
+      body {
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+          Oxygen, Ubuntu, sans-serif;
+        max-width: 800px;
+        margin: 0 auto;
+        padding: 20px;
+        background-color: var(--bg);
+        color: var(--font-color);
+      }
+      .crossink-header {
+        font-family: Georgia, 'Times New Roman', Times, serif;
+      }
+      h1 {
+        color: var(--title-color);
+        border-bottom: 2px solid var(--accent-color);
+        padding-bottom: 10px;
+      }
+      h2 {
+        color: var(--title-color);
+        margin-top: 0;
+      }
+      h3 {
+        margin: 0 0 8px 0;
+        color: var(--title-color);
+      }
+      .card {
+        background: var(--card-bg);
+        border-radius: 8px;
+        padding: 20px;
+        margin: 15px 0;
+        border: 1px solid var(--border-color);
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+      }
+      .nav-links {
+        margin: 20px 0;
+        display: flex;
+        gap: 0;
+        border-bottom: 1px solid var(--border-color);
+      }
+      .nav-links a {
+        padding: 8px 16px;
+        color: var(--label-color);
+        text-decoration: none;
+        border-bottom: 2px solid transparent;
+        margin-bottom: -1px;
+        transition: color 0.15s;
+      }
+      .nav-links a.active {
+        color: var(--accent-color);
+        border-bottom-color: var(--accent-color);
+        font-weight: 500;
+      }
+      .nav-links a:not(.active):hover {
+        color: var(--font-color);
+      }
+      .family {
+        border-bottom: 1px solid var(--border-color);
+        padding: 12px 0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 12px;
+      }
+      .family:last-child { border-bottom: none; }
+      .family-info {
+        flex: 1;
+        min-width: 0;
+      }
+      .family-meta { color: var(--label-color); font-size: 0.9em; }
+      .btn {
+        padding: 6px 16px;
+        border: 1px solid transparent;
+        border-radius: 4px;
+        cursor: pointer;
+        font-size: 0.9em;
+        font-weight: 500;
+        transition: color 0.15s, background-color 0.15s, border-color 0.15s;
+      }
+      .btn-danger {
+        background: transparent;
+        border-color: var(--border-color);
+        color: var(--label-color);
+      }
+      .btn-danger:hover {
+        border-color: var(--danger-color);
+        color: var(--danger-color);
+        background-color: rgba(231, 76, 60, 0.05);
+      }
+      .btn-primary {
+        background: var(--accent-color);
+        border-color: var(--accent-color);
+        color: white;
+      }
+      .btn-primary:hover {
+        background: var(--accent-hover-color);
+        border-color: var(--accent-hover-color);
+      }
+      .upload-form {
+        display: flex;
+        gap: 10px;
+        align-items: center;
+        flex-wrap: wrap;
+      }
+      .upload-form input[type="text"] {
+        padding: 6px 10px;
+        border: 1px solid var(--border-color);
+        border-radius: 4px;
+        background: var(--bg);
+        color: var(--font-color);
+      }
+      .upload-form input[type="file"] { flex: 1; min-width: 200px; }
+      #status {
+        margin-top: 10px;
+        padding: 12px;
+        border-radius: 4px;
+        display: none;
+        text-align: center;
+      }
+      .status-ok {
+        background: #d4edda;
+        border: 1px solid #c3e6cb;
+        color: #155724;
+        display: block !important;
+      }
+      .status-err {
+        background: #f8d7da;
+        border: 1px solid #f5c6cb;
+        color: #721c24;
+        display: block !important;
+      }
+      .empty { color: var(--label-color); text-align: center; padding: 20px; }
+      @media (max-width: 600px) {
+        body {
+          padding: 10px;
+          font-size: 14px;
+        }
+        .card {
+          padding: 12px;
+          margin: 10px 0;
+        }
+        h1 {
+          font-size: 1.3em;
+        }
+        .nav-links a {
+          padding: 6px 12px;
+          font-size: 0.9em;
+        }
+        .family {
+          align-items: flex-start;
+          flex-direction: column;
+        }
+        .upload-form {
+          align-items: stretch;
+          flex-direction: column;
+        }
+        .upload-form input[type="file"] {
+          min-width: 0;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <h1 class="crossink-header">CrossInk</h1>
+
+    <div class="nav-links">
+      <a href="/">Home</a>
+      <a href="/files">File Manager</a>
+      <a href="/settings">Settings</a>
+      <a href="/fonts" class="active">Fonts</a>
+    </div>
+
+    <div class="card">
+      <h2>Installed Fonts</h2>
+      <div id="families"><p class="empty">Loading...</p></div>
+    </div>
+
+    <div class="card">
+      <h2>Upload Font</h2>
+      <form class="upload-form" id="uploadForm">
+        <input type="file" id="fontFiles" webkitdirectory directory multiple required />
+        <button type="submit" class="btn btn-primary">Upload</button>
+      </form>
+      <p id="pickedInfo" class="family-meta" style="margin: 8px 0 0;"></p>
+      <div id="status"></div>
+    </div>
+
+    <p style="text-align: center; color: var(--label-color); font-size: 0.85em; padding: 20px 0; margin: 0;">CrossInk &bull; Open Source</p>
+
+  <script>
+    function formatSize(bytes) {
+      if (bytes >= 1048576) return (bytes / 1048576).toFixed(1) + ' MB';
+      if (bytes >= 1024) return (bytes / 1024).toFixed(0) + ' KB';
+      return bytes + ' B';
+    }
+
+    async function loadFonts() {
+      const el = document.getElementById('families');
+      try {
+        const res = await fetch('/api/fonts');
+        const data = await res.json();
+        // Build rows with DOM APIs and textContent so on-device family names
+        // (which can contain arbitrary characters) cannot break markup or
+        // execute script via innerHTML / inline onclick interpolation.
+        el.replaceChildren();
+        if (!data.families || data.families.length === 0) {
+          const p = document.createElement('p');
+          p.className = 'empty';
+          p.textContent = 'No fonts installed';
+          el.appendChild(p);
+          return;
+        }
+        for (const f of data.families) {
+          const row = document.createElement('div');
+          row.className = 'family';
+
+          const info = document.createElement('div');
+          info.className = 'family-info';
+          const h3 = document.createElement('h3');
+          h3.textContent = f.name;
+          info.appendChild(h3);
+          const meta = document.createElement('span');
+          meta.className = 'family-meta';
+          const sizes = (f.sizes || []).join(', ');
+          const filesSizes = (f.files || []).map(fi => formatSize(fi.size)).join(' + ');
+          meta.textContent = sizes + 'pt · ' + filesSizes;
+          info.appendChild(meta);
+
+          const btn = document.createElement('button');
+          btn.className = 'btn btn-danger';
+          btn.textContent = 'Delete';
+          // Capture name in the closure rather than interpolating into onclick.
+          const familyName = f.name;
+          btn.addEventListener('click', () => deleteFamily(familyName));
+
+          row.appendChild(info);
+          row.appendChild(btn);
+          el.appendChild(row);
+        }
+      } catch (e) {
+        el.replaceChildren();
+        const p = document.createElement('p');
+        p.className = 'empty';
+        p.textContent = 'Failed to load font list';
+        el.appendChild(p);
+      }
+    }
+
+    async function deleteFamily(name) {
+      if (!confirm('Delete font family "' + name + '"?')) return;
+      const status = document.getElementById('status');
+      status.className = '';
+      status.style.display = 'block';
+      status.textContent = 'Deleting ' + name + '...';
+      try {
+        const res = await fetch('/api/fonts/delete', {
+          method: 'POST',
+          headers: {'Content-Type': 'application/json'},
+          body: JSON.stringify({family: name})
+        });
+        if (res.ok) {
+          status.className = 'status-ok';
+          status.textContent = 'Deleted "' + name + '".';
+        } else {
+          status.className = 'status-err';
+          status.textContent = 'Failed to delete "' + name + '".';
+        }
+      } catch (err) {
+        status.className = 'status-err';
+        status.textContent = 'Delete error: ' + err.message;
+      }
+      await loadFonts();
+    }
+
+    // Derive family name from a .cpfont filename: take everything before the
+    // last '-' or '_' (that separator precedes the size suffix, e.g. Bookerly_12.cpfont).
+    function familyFromFilename(name) {
+      const stem = name.replace(/\.cpfont$/i, '');
+      const cut = Math.max(stem.lastIndexOf('-'), stem.lastIndexOf('_'));
+      return cut > 0 ? stem.slice(0, cut) : stem;
+    }
+
+    // Sanitize to match firmware's [A-Za-z0-9_-]+ pattern.
+    function sanitizeFamily(raw) {
+      return raw.replace(/[^A-Za-z0-9_-]/g, '_');
+    }
+
+    function cpfontFilesOnly(fileList) {
+      return Array.from(fileList).filter(f => /\.cpfont$/i.test(f.name));
+    }
+
+    document.getElementById('fontFiles').addEventListener('change', function() {
+      const info = document.getElementById('pickedInfo');
+      const files = cpfontFilesOnly(this.files);
+      if (files.length === 0) {
+        info.textContent = 'No .cpfont files found in the selected folder.';
+        return;
+      }
+      const family = sanitizeFamily(familyFromFilename(files[0].name));
+      info.textContent = files.length + ' file' + (files.length === 1 ? '' : 's') +
+        ' → family "' + family + '"';
+    });
+
+    document.getElementById('uploadForm').addEventListener('submit', async function(e) {
+      e.preventDefault();
+      const status = document.getElementById('status');
+      const files = cpfontFilesOnly(document.getElementById('fontFiles').files);
+      if (files.length === 0) {
+        status.className = 'status-err';
+        status.style.display = 'block';
+        status.textContent = 'No .cpfont files selected.';
+        return;
+      }
+
+      // A directory picker may include files from multiple family subfolders.
+      // Reject that up front — otherwise files[0]'s family is silently reused
+      // for every upload, corrupting the install layout.
+      const families = [...new Set(files.map(f => sanitizeFamily(familyFromFilename(f.name))))];
+      if (families.length !== 1) {
+        status.className = 'status-err';
+        status.style.display = 'block';
+        status.textContent = 'Please select files from a single font family.';
+        return;
+      }
+      const family = families[0];
+
+      status.className = '';
+      status.style.display = 'block';
+
+      let uploaded = 0;
+      for (const file of files) {
+        status.textContent = 'Uploading ' + (uploaded + 1) + '/' + files.length + ': ' + file.name;
+        const formData = new FormData();
+        formData.append('family', family);
+        formData.append('file', file, file.name);
+        try {
+          const res = await fetch('/api/fonts/upload', { method: 'POST', body: formData });
+          const data = await res.json();
+          if (!data.ok) {
+            status.className = 'status-err';
+            status.textContent = 'Failed on ' + file.name + ': ' + (data.error || 'unknown error');
+            await loadFonts();
+            return;
+          }
+        } catch (err) {
+          status.className = 'status-err';
+          status.textContent = 'Upload error on ' + file.name + ': ' + err.message;
+          await loadFonts();
+          return;
+        }
+        uploaded++;
+      }
+
+      status.className = 'status-ok';
+      status.textContent = 'Uploaded ' + uploaded + ' file' + (uploaded === 1 ? '' : 's') +
+        ' to family "' + family + '".';
+      await loadFonts();
+    });
+
+    loadFonts();
+  </script>
+  </body>
+</html>
diff --git a/src/network/html/HomePage.html b/src/network/html/HomePage.html
index 96c3d959..fff2b68f 100644
--- a/src/network/html/HomePage.html
+++ b/src/network/html/HomePage.html
@@ -111,6 +111,7 @@ <h1 class="crossink-header">CrossInk</h1>
       <a href="/" class="active">Home</a>
       <a href="/files">File Manager</a>
       <a href="/settings">Settings</a>
+      <a href="/fonts">Fonts</a>
     </div>
 
     <div class="card">
diff --git a/src/network/html/SettingsPage.html b/src/network/html/SettingsPage.html
index ef7edb07..7c2a36d9 100644
--- a/src/network/html/SettingsPage.html
+++ b/src/network/html/SettingsPage.html
@@ -292,6 +292,7 @@ <h1 class="crossink-header">CrossInk</h1>
     <a href="/">Home</a>
     <a href="/files">File Manager</a>
     <a href="/settings" class="active">Settings</a>
+    <a href="/fonts">Fonts</a>
   </div>
 
   <div id="message" class="message"></div>
diff --git a/src/simulator/SimulatorSmokeTest.cpp b/src/simulator/SimulatorSmokeTest.cpp
new file mode 100644
index 00000000..2af15fb7
--- /dev/null
+++ b/src/simulator/SimulatorSmokeTest.cpp
@@ -0,0 +1,282 @@
+#ifdef SIMULATOR
+
+#include "SimulatorSmokeTest.h"
+
+#include <HalStorage.h>
+#include <Logging.h>
+
+#include <algorithm>
+#include <cstdlib>
+#include <exception>
+#include <memory>
+#include <vector>
+
+#include "CrossPointSettings.h"
+#include "MappedInputManager.h"
+#include "activities/ActivityManager.h"
+#include "activities/reader/EpubReaderMenuActivity.h"
+#include "activities/reader/ReaderOptionsActivity.h"
+#include "components/UITheme.h"
+
+extern ActivityManager activityManager;
+extern GfxRenderer renderer;
+extern MappedInputManager mappedInputManager;
+
+namespace {
+
+enum class SmokeStep : uint8_t {
+  Start,
+  Home,
+  FileBrowser,
+  RecentBooks,
+  Settings,
+  ReaderOptions,
+  ReaderMenu,
+  Sleep,
+  Reader,
+  ReaderInput,
+  Done,
+};
+
+class SimulatorSmokeTest {
+ public:
+  void tick() {
+    if (!enabled()) return;
+
+    try {
+      tickImpl();
+    } catch (const std::exception& e) {
+      fail("Unhandled exception: %s", e.what());
+    } catch (...) {
+      fail("Unhandled non-standard exception");
+    }
+  }
+
+ private:
+  enum class ScriptActionType : uint8_t { Press, Release, Render };
+
+  struct ScriptAction {
+    ScriptActionType type;
+    MappedInputManager::Button button;
+    const char* label;
+    int settleFrames;
+  };
+
+  SmokeStep step = SmokeStep::Start;
+  int settleFrames = 0;
+  const char* activeStepName = nullptr;
+  std::vector<ScriptAction> inputScript;
+  size_t scriptIndex = 0;
+
+  static bool enabled() { return std::getenv("CROSSINK_SIMULATOR_SMOKE_TEST") != nullptr; }
+
+  static int pageTurnCount() {
+    const char* raw = std::getenv("CROSSINK_SIMULATOR_SMOKE_PAGE_TURNS");
+    if (raw == nullptr || raw[0] == '\0') {
+      return 2;
+    }
+    return std::max(0, std::atoi(raw));
+  }
+
+  static void applyRequestedTheme() {
+    const char* raw = std::getenv("CROSSINK_SIMULATOR_SMOKE_THEME");
+    if (raw == nullptr || raw[0] == '\0') {
+      return;
+    }
+
+    const int theme = std::atoi(raw);
+    if (theme < 0 || theme >= CrossPointSettings::UI_THEME_COUNT) {
+      fail("Invalid smoke test theme index: %d", theme);
+    }
+
+    SETTINGS.uiTheme = static_cast<uint8_t>(theme);
+    UITheme::getInstance().reload();
+    LOG_INF("SMOKE", "Using theme index %d", theme);
+  }
+
+  [[noreturn]] static void fail(const char* message) {
+    LOG_ERR("SMOKE", "%s", message);
+    std::_Exit(2);
+  }
+
+  template <typename... Args>
+  [[noreturn]] static void fail(const char* format, Args... args) {
+    logPrintf("ERR", "SMOKE", format, args...);
+    logPrintf("ERR", "SMOKE", "\n");
+    std::_Exit(2);
+  }
+
+  static void renderCurrentStep(const char* name) {
+    LOG_INF("SMOKE", "Rendering %s", name);
+    if (activityManager.requestUpdateAndWait() != RequestUpdateResult::Rendered) {
+      fail("Render was rejected for %s", name);
+    }
+  }
+
+  void queueStep(const char* name, SmokeStep nextStep, int framesToSettle = 3) {
+    activeStepName = name;
+    settleFrames = framesToSettle;
+    step = nextStep;
+  }
+
+  void tickImpl() {
+    mappedInputManager.simulatorClearInputFrame();
+
+    if (settleFrames > 0) {
+      --settleFrames;
+      if (settleFrames == 0 && activeStepName != nullptr) {
+        renderCurrentStep(activeStepName);
+        activeStepName = nullptr;
+      }
+      return;
+    }
+
+    switch (step) {
+      case SmokeStep::Start:
+        LOG_INF("SMOKE", "Starting simulator smoke test");
+        if (!CrossPointSettings::verifySleepTimeoutMigrationContract()) {
+          fail("Sleep timeout migration contract failed");
+        }
+        applyRequestedTheme();
+        activityManager.goHome();
+        queueStep("Home", SmokeStep::Home);
+        break;
+
+      case SmokeStep::Home:
+        activityManager.goToFileBrowser("/books");
+        queueStep("File Browser", SmokeStep::FileBrowser);
+        break;
+
+      case SmokeStep::FileBrowser:
+        activityManager.goToRecentBooks();
+        queueStep("Recent Books", SmokeStep::RecentBooks);
+        break;
+
+      case SmokeStep::RecentBooks:
+        activityManager.goToSettings();
+        queueStep("Settings", SmokeStep::Settings);
+        break;
+
+      case SmokeStep::Settings:
+        activityManager.replaceActivity(std::make_unique<ReaderOptionsActivity>(renderer, mappedInputManager));
+        queueStep("Reader Options", SmokeStep::ReaderOptions);
+        break;
+
+      case SmokeStep::ReaderOptions:
+        activityManager.replaceActivity(std::make_unique<EpubReaderMenuActivity>(
+            renderer, mappedInputManager, "Smoke Test", 1, 1, 0, SETTINGS.orientation, false, false, false, false));
+        queueStep("Reader Menu", SmokeStep::ReaderMenu);
+        break;
+
+      case SmokeStep::ReaderMenu:
+        activityManager.goToSleep();
+        queueStep("Sleep", SmokeStep::Sleep);
+        break;
+
+      case SmokeStep::Sleep: {
+        const char* bookPath = std::getenv("CROSSINK_SIMULATOR_SMOKE_BOOK");
+        if (bookPath == nullptr || bookPath[0] == '\0') {
+          LOG_INF("SMOKE", "Skipping Reader step; CROSSINK_SIMULATOR_SMOKE_BOOK is not set");
+          step = SmokeStep::Reader;
+          break;
+        }
+        if (!Storage.exists(bookPath)) {
+          fail("Smoke test book is missing: %s", bookPath);
+        }
+        activityManager.goToReader(bookPath, true);
+        queueStep("Reader", SmokeStep::Reader, 8);
+        break;
+      }
+
+      case SmokeStep::Reader:
+        buildReaderInputScript();
+        step = SmokeStep::ReaderInput;
+        break;
+
+      case SmokeStep::ReaderInput:
+        runReaderInputScript();
+        break;
+
+      case SmokeStep::Done:
+        LOG_INF("SMOKE", "Simulator smoke test passed");
+        std::_Exit(0);
+    }
+  }
+
+  static ScriptAction press(MappedInputManager::Button button) { return {ScriptActionType::Press, button, nullptr, 0}; }
+
+  static ScriptAction release(MappedInputManager::Button button) {
+    return {ScriptActionType::Release, button, nullptr, 0};
+  }
+
+  static ScriptAction render(const char* label, int framesToSettle = 3) {
+    return {ScriptActionType::Render, MappedInputManager::Button::Back, label, framesToSettle};
+  }
+
+  void addTap(MappedInputManager::Button button) {
+    inputScript.push_back(press(button));
+    inputScript.push_back(release(button));
+  }
+
+  void buildReaderInputScript() {
+    inputScript.clear();
+    scriptIndex = 0;
+
+    const int turns = pageTurnCount();
+    for (int i = 0; i < turns; i++) {
+      addTap(MappedInputManager::Button::PageForward);
+      inputScript.push_back(render("Reader after page forward", 4));
+    }
+
+    addTap(MappedInputManager::Button::Confirm);
+    inputScript.push_back(render("Reader Menu opened from EPUB", 4));
+
+    addTap(MappedInputManager::Button::Down);
+    inputScript.push_back(render("Reader Menu Reader Options selection", 3));
+
+    addTap(MappedInputManager::Button::Confirm);
+    inputScript.push_back(render("Reader Options opened from Reader Menu", 4));
+
+    addTap(MappedInputManager::Button::Down);
+    inputScript.push_back(render("Reader Options after navigation", 3));
+
+    addTap(MappedInputManager::Button::Confirm);
+    inputScript.push_back(render("Reader Options after toggle", 3));
+
+    addTap(MappedInputManager::Button::Back);
+    inputScript.push_back(render("Reader Menu after closing Reader Options", 4));
+
+    addTap(MappedInputManager::Button::Back);
+    inputScript.push_back(render("Reader after closing Reader Menu", 4));
+
+    LOG_INF("SMOKE", "Running reader input script with %d page turn(s)", turns);
+  }
+
+  void runReaderInputScript() {
+    if (scriptIndex >= inputScript.size()) {
+      step = SmokeStep::Done;
+      return;
+    }
+
+    const auto& action = inputScript[scriptIndex++];
+    switch (action.type) {
+      case ScriptActionType::Press:
+        mappedInputManager.simulatorInjectPress(action.button);
+        break;
+      case ScriptActionType::Release:
+        mappedInputManager.simulatorInjectRelease(action.button);
+        break;
+      case ScriptActionType::Render:
+        queueStep(action.label, SmokeStep::ReaderInput, action.settleFrames);
+        break;
+    }
+  }
+};
+
+SimulatorSmokeTest smokeTest;
+
+}  // namespace
+
+void runSimulatorSmokeTestTick() { smokeTest.tick(); }
+
+#endif
diff --git a/src/simulator/SimulatorSmokeTest.h b/src/simulator/SimulatorSmokeTest.h
new file mode 100644
index 00000000..a29fa74a
--- /dev/null
+++ b/src/simulator/SimulatorSmokeTest.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#ifdef SIMULATOR
+void runSimulatorSmokeTestTick();
+#endif
diff --git a/src/util/StringUtils.cpp b/src/util/StringUtils.cpp
index 81be07ee..1e572915 100644
--- a/src/util/StringUtils.cpp
+++ b/src/util/StringUtils.cpp
@@ -2,9 +2,53 @@
 
 #include <Utf8.h>
 
-namespace StringUtils {
+#include <algorithm>
+#include <cctype>
 
-std::string sanitizeFilename(const std::string& name, size_t maxBytes) {
+namespace {
+
+constexpr size_t MAX_EXTENSION_BYTES = 16;
+
+bool isInvalidFilenameCodepoint(uint32_t cp) {
+  return cp == '/' || cp == '\\' || cp == ':' || cp == '*' || cp == '?' || cp == '"' || cp == '<' || cp == '>' ||
+         cp == '|';
+}
+
+std::string trimFilenameEdges(const std::string& name) {
+  size_t start = 0;
+  while (start < name.size() && (name[start] == ' ' || name[start] == '.')) {
+    start++;
+  }
+
+  size_t end = name.size();
+  while (end > start && (name[end - 1] == ' ' || name[end - 1] == '.')) {
+    end--;
+  }
+
+  return name.substr(start, end - start);
+}
+
+size_t findSafeExtensionStart(const std::string& name) {
+  const size_t dot = name.find_last_of('.');
+  if (dot == std::string::npos || dot == 0 || dot + 1 >= name.size()) {
+    return std::string::npos;
+  }
+
+  const size_t extensionBytes = name.size() - dot;
+  if (extensionBytes > MAX_EXTENSION_BYTES) {
+    return std::string::npos;
+  }
+
+  for (size_t i = dot + 1; i < name.size(); i++) {
+    if (!std::isalnum(static_cast<unsigned char>(name[i]))) {
+      return std::string::npos;
+    }
+  }
+
+  return dot;
+}
+
+std::string sanitizeFilenamePart(const std::string& name, size_t maxBytes) {
   std::string result;
   result.reserve(std::min(name.size(), maxBytes));
 
@@ -20,8 +64,7 @@ std::string sanitizeFilename(const std::string& name, size_t maxBytes) {
     const auto* cpStart = text;
     uint32_t cp = utf8NextCodepoint(&text);
 
-    if (cp == '/' || cp == '\\' || cp == ':' || cp == '*' || cp == '?' || cp == '"' || cp == '<' || cp == '>' ||
-        cp == '|') {
+    if (isInvalidFilenameCodepoint(cp)) {
       // Replace illegal and control characters with '_'
       if (result.length() + 1 > maxBytes) break;
       result += '_';
@@ -43,4 +86,28 @@ std::string sanitizeFilename(const std::string& name, size_t maxBytes) {
   return result.empty() ? "book" : result;
 }
 
+}  // namespace
+
+namespace StringUtils {
+
+std::string sanitizeFilename(const std::string& name, size_t maxBytes) {
+  const std::string trimmedName = trimFilenameEdges(name);
+  const size_t extensionStart = findSafeExtensionStart(trimmedName);
+  if (extensionStart != std::string::npos) {
+    const std::string extension = trimmedName.substr(extensionStart);
+    if (extension.size() < maxBytes) {
+      const size_t baseBudget = maxBytes - extension.size();
+      std::string base = sanitizeFilenamePart(trimmedName.substr(0, extensionStart), baseBudget);
+      if (base.size() > baseBudget) {
+        base.resize(baseBudget);
+      }
+      if (!base.empty()) {
+        return base + extension;
+      }
+    }
+  }
+
+  return sanitizeFilenamePart(name, maxBytes);
+}
+
 }  // namespace StringUtils
diff --git a/src/util/StringUtils.h b/src/util/StringUtils.h
index 1fa6cc01..d1c77c3e 100644
--- a/src/util/StringUtils.h
+++ b/src/util/StringUtils.h
@@ -1,14 +1,17 @@
 #pragma once
 
+#include <cstddef>
 #include <string>
 
 namespace StringUtils {
 
+constexpr size_t kDefaultMaxFilenameBytes = 150;
+
 /**
  * Sanitize a string for use as a filename.
  * Replaces invalid characters with underscores, trims spaces/dots,
  * and limits length to maxBytes bytes.
  */
-std::string sanitizeFilename(const std::string& name, size_t maxBytes = 100);
+std::string sanitizeFilename(const std::string& name, size_t maxBytes = kDefaultMaxFilenameBytes);
 
 }  // namespace StringUtils
diff --git a/test/README b/test/README
index 9b1e87bc..fb3802bf 100644
--- a/test/README
+++ b/test/README
@@ -9,3 +9,20 @@ in the development cycle.
 
 More information about PlatformIO Unit Testing:
 - https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
+
+Simulator smoke test:
+- Run `./scripts/run_simulator_smoke_test.py` from the repo root.
+- The script builds `env:simulator`, creates a temporary `fs_`, copies a test EPUB into it, opens common screens, renders them, drives reader page/menu input, and fails on crashes or missing success output.
+- Use `--book path/to/book.epub` to choose a specific EPUB and `--page-turns 10` to change how far the reader flow navigates.
+- Use `--theme lyra-carousel` to run the flow with a specific UI theme. Supported names include `classic`, `lyra`, `lyra-extended`, `roundedraff`, and `lyra-carousel`.
+- Use `--no-build` to reuse the existing simulator binary or `--window` to show the SDL window instead of running headless.
+
+Expected coverage:
+- This is a fast regression tripwire, similar to a small browser smoke test. It proves the simulator can boot, open common screens, load the selected EPUB, turn pages, open reader menus, and exit without crashing or hanging.
+- It is useful for catching activity entry/render crashes, bad allocations, uncaught exceptions, assertions, segfaults, AddressSanitizer/UndefinedBehaviorSanitizer reports, obvious hangs, and EPUB/theme-specific failures for the exact book and theme under test.
+- It also covers a narrow scripted reader path: page forward, open the reader menu, enter Reader Options, navigate/toggle one option, and back out to the reader.
+
+Limits:
+- It does not replace hardware testing. The desktop simulator has different memory, filesystem, timing, display, sleep, button, battery, USB, Wi-Fi, and OTA behavior than the ESP32-C3 device.
+- It should not be expected to catch exact hardware heap pressure, SD-card locking/timing issues, e-ink ghosting or refresh quality, real deep-sleep wake behavior, electrical button behavior, subtle visual layout problems, or EPUB cases that are not present in the selected test book.
+- After a simulator pass, still verify important changes on hardware with the same EPUB and theme by turning pages, opening the reader menu, entering Reader Options, toggling a setting, backing out, and watching for crashes or memory-related logs.
diff --git a/test/differential_rounding/DifferentialRoundingTest.cpp b/test/differential_rounding/DifferentialRoundingTest.cpp
index fd454839..dc8ea115 100644
--- a/test/differential_rounding/DifferentialRoundingTest.cpp
+++ b/test/differential_rounding/DifferentialRoundingTest.cpp
@@ -5,6 +5,8 @@
 
 #include "lib/EpdFont/EpdFont.h"
 #include "lib/EpdFont/EpdFontData.h"
+#include "lib/EpdFont/EpdFontFamily.h"
+#include "lib/Utf8/Utf8.h"
 
 static int testsPassed = 0;
 static int testsFailed = 0;
@@ -32,7 +34,7 @@ static int testsFailed = 0;
 // ============================================================================
 // Synthetic test font
 //
-// Glyphs: 'T' (0x54), 'a' (0x61), 'o' (0x6F), 'x' (0x78)
+// Glyphs: space (0x20), 'T' (0x54), 'a' (0x61), 'o' (0x6F), 'x' (0x78)
 //   - 'x' advance is 136 FP (8.5px) -- frac = 8, exactly at the rounding
 //     boundary where absolute vs differential snapping diverges for "oo".
 //   - No U+FFFD replacement glyph, so unknown codepoints trigger the
@@ -46,17 +48,19 @@ static int testsFailed = 0;
 // clang-format off
 static const EpdGlyph kGlyphs[] = {
   // idx  width  height  advanceX  left  top  dataLength  dataOffset
-  /* 0 'T' */ { 8, 12, 137, 0, 12, 0, 0 },
-  /* 1 'a' */ { 7,  8, 130, 0,  8, 0, 0 },
-  /* 2 'o' */ { 8,  8, 145, 0,  8, 0, 0 },
-  /* 3 'x' */ { 7,  8, 136, 0,  8, 0, 0 },
+  /* 0 ' ' */ { 0,  0,  64, 0,  0, 0, 0 },
+  /* 1 'T' */ { 8, 12, 137, 0, 12, 0, 0 },
+  /* 2 'a' */ { 7,  8, 130, 0,  8, 0, 0 },
+  /* 3 'o' */ { 8,  8, 145, 0,  8, 0, 0 },
+  /* 4 'x' */ { 7,  8, 136, 0,  8, 0, 0 },
 };
 
 static const EpdUnicodeInterval kIntervals[] = {
-  { 0x54, 0x54, 0 },  // 'T' -> glyph[0]
-  { 0x61, 0x61, 1 },  // 'a' -> glyph[1]
-  { 0x6F, 0x6F, 2 },  // 'o' -> glyph[2]
-  { 0x78, 0x78, 3 },  // 'x' -> glyph[3]
+  { 0x20, 0x20, 0 },  // ' ' -> glyph[0]
+  { 0x54, 0x54, 1 },  // 'T' -> glyph[1]
+  { 0x61, 0x61, 2 },  // 'a' -> glyph[2]
+  { 0x6F, 0x6F, 3 },  // 'o' -> glyph[3]
+  { 0x78, 0x78, 4 },  // 'x' -> glyph[4]
 };
 
 static const EpdKernClassEntry kKernLeft[] = {
@@ -77,7 +81,7 @@ static const EpdFontData kTestFontData = {
   .bitmap            = nullptr,
   .glyph             = kGlyphs,
   .intervals         = kIntervals,
-  .intervalCount     = 4,
+  .intervalCount     = 5,
   .advanceY          = 16,
   .ascender          = 12,
   .descender         = 0,
@@ -98,6 +102,7 @@ static const EpdFontData kTestFontData = {
 // clang-format on
 
 static EpdFont testFont(&kTestFontData);
+static EpdFontFamily testFontFamily(&testFont);
 
 // Helper: return width from getTextDimensions
 static int textWidth(const char* str) {
@@ -346,6 +351,48 @@ void testNullGlyphAdvancePreserved() {
   PASS();
 }
 
+void testFamilyMissingGlyphUsesReplacementFallback() {
+  printf("testFamilyMissingGlyphUsesReplacementFallback...\n");
+
+  // The low-level EpdFont intentionally has no U+FFFD here, mirroring compact UI
+  // fonts. The family layer should still resolve unknown characters to a visible
+  // synthetic replacement glyph instead of measuring them as blank/null.
+  ASSERT_EQ(testFontFamily.getFallbackCodepoint('Z'), REPLACEMENT_GLYPH);
+
+  int w = 0, h = 0;
+  testFontFamily.getTextDimensions("Z", &w, &h);
+  printf("  family width(\"Z\") = %d, height = %d\n", w, h);
+
+  ASSERT_EQ(w, 9);
+  ASSERT_EQ(h, 12);
+
+  printf("  Missing family glyphs use visible replacement fallback\n");
+  PASS();
+}
+
+void testFamilySpaceGlyphsStayBlank() {
+  printf("testFamilySpaceGlyphsStayBlank...\n");
+
+  // EPUB paragraph indentation uses U+2003 EM SPACE. If the selected reading font
+  // lacks that exact glyph, it should stay blank/null like upstream, not become the
+  // visible missing-glyph marker or an ASCII space with its own extra width.
+  ASSERT_EQ(testFontFamily.getFallbackCodepoint(0x2003), 0x2003);
+
+  int w = 0, h = 0;
+  testFontFamily.getTextDimensions("\xE2\x80\x83", &w, &h);
+  printf("  family dimensions(U+2003) = %d x %d\n", w, h);
+
+  ASSERT_EQ(w, 0);
+  ASSERT_EQ(h, 0);
+
+  testFontFamily.getTextDimensions("o\xE2\x80\x83o", &w, &h);
+  printf("  family width(\"o U+2003 o\") = %d\n", w);
+  ASSERT_EQ(w, textWidth("oo"));
+
+  printf("  Unicode space fallbacks stay blank\n");
+  PASS();
+}
+
 void testHeightCalculation() {
   printf("testHeightCalculation...\n");
 
@@ -374,6 +421,8 @@ int main() {
   testKnownWidths();
   testPairConsistencyViaFont();
   testNullGlyphAdvancePreserved();
+  testFamilyMissingGlyphUsesReplacementFallback();
+  testFamilySpaceGlyphsStayBlank();
   testHeightCalculation();
 
   printf("\n=== Results: %d passed, %d failed ===\n", testsPassed, testsFailed);
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter1.xhtml b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter1.xhtml
new file mode 100644
index 00000000..0a02e782
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter1.xhtml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+  <title>Glyph Reference</title>
+  <link rel="stylesheet" type="text/css" href="styles/test.css"/>
+</head>
+<body>
+<h1>Glyph Reference</h1>
+<p class="note">This chapter covers the synthetic Unicode glyphs added in commit c4357d06.</p>
+<p class="note">Each line should show a visible glyph after the label, not an empty box or missing-character mark.</p>
+
+<h2>Solid Shapes</h2>
+<p class="sample">U+2588 FULL BLOCK: █ ███ █████</p>
+<p class="sample">U+25A0 BLACK SQUARE: ■ ■■■ ■■■■■</p>
+<p class="sample">Mixed solid run: A█B C■D █■█■█ end</p>
+<p class="sample big">Bold solid run: A█B C■D █■█■█ end</p>
+
+<h2>Greek Fallbacks</h2>
+<p class="sample">U+0393 GREEK CAPITAL GAMMA: Γ ΓΓΓ Γ test</p>
+<p class="sample">U+03B5 GREEK SMALL EPSILON: ε εεε ε test</p>
+<p class="sample">U+03C9 GREEK SMALL OMEGA: ω ωωω ω test</p>
+<p class="sample">Mixed Greek fallback run: Γ ε ω Γεω</p>
+<p class="sample big">Bold Greek fallback run: Γ ε ω Γεω</p>
+
+<h2>Alias Glyph</h2>
+<p class="sample">U+02BB MODIFIER LETTER TURNED COMMA: ʻokina ʻ single ʻ marks</p>
+<p class="sample">Compare with U+2018 LEFT SINGLE QUOTATION MARK: ‘okina ‘ single ‘ marks</p>
+
+<h2>Inline Context</h2>
+<p>The synthetic glyphs should work inside normal prose: this sentence has a full block █, a black square ■, Greek Γεω, and turned comma ʻ in one paragraph.</p>
+<p>They should also survive punctuation: [█] (■), Γ; ε, ω. The final word ends with a block: done█</p>
+</body>
+</html>
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter2.xhtml b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter2.xhtml
new file mode 100644
index 00000000..fb129cdb
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/chapter2.xhtml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+  <title>Block Stress Cases</title>
+  <link rel="stylesheet" type="text/css" href="styles/test.css"/>
+</head>
+<body>
+<h1>Block Stress Cases</h1>
+<p class="note">Use this chapter to check that solid synthetic glyphs near line and page edges do not flood out-of-bounds render logs.</p>
+
+<h2>Line Wrapping</h2>
+<p>Short words before blocks: alpha beta gamma ███████████████████████████████████████████████████████████████████ omega.</p>
+<p>Blocks before text: ███████████████████████████████████████████████████████████████████ after the long block run.</p>
+<p>Alternating solid glyphs: █■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■█■ end.</p>
+
+<h2>Dense Paragraph</h2>
+<p>████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████ ████</p>
+
+<h2>Mixed Fallbacks At Wrap Points</h2>
+<p>Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω Γεω</p>
+<p>ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina ʻokina</p>
+</body>
+</html>
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/content.opf b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/content.opf
new file mode 100644
index 00000000..07018d88
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/content.opf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://www.idpf.org/2007/opf" unique-identifier="bookid" version="3.0">
+  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
+    <dc:identifier id="bookid">urn:uuid:test-synthetic-unicode-glyphs</dc:identifier>
+    <dc:title>Test: Synthetic Unicode Glyphs</dc:title>
+    <dc:creator>CrossPoint Test Fixture</dc:creator>
+    <dc:language>en</dc:language>
+  </metadata>
+  <manifest>
+    <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+    <item id="ncx" href="toc.ncx" media-type="application/x-dtbncx+xml"/>
+    <item id="style" href="styles/test.css" media-type="text/css"/>
+    <item id="chapter1" href="chapter1.xhtml" media-type="application/xhtml+xml"/>
+    <item id="chapter2" href="chapter2.xhtml" media-type="application/xhtml+xml"/>
+  </manifest>
+  <spine toc="ncx">
+    <itemref idref="chapter1"/>
+    <itemref idref="chapter2"/>
+  </spine>
+</package>
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/nav.xhtml b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/nav.xhtml
new file mode 100644
index 00000000..ced747ff
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/nav.xhtml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+<head>
+  <title>Test: Synthetic Unicode Glyphs</title>
+  <link rel="stylesheet" type="text/css" href="styles/test.css"/>
+</head>
+<body>
+  <nav epub:type="toc" id="toc">
+    <h1>Contents</h1>
+    <ol>
+      <li><a href="chapter1.xhtml">Glyph Reference</a></li>
+      <li><a href="chapter2.xhtml">Block Stress Cases</a></li>
+    </ol>
+  </nav>
+</body>
+</html>
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/styles/test.css b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/styles/test.css
new file mode 100644
index 00000000..82c69052
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/styles/test.css
@@ -0,0 +1,19 @@
+body {
+  line-height: 1.35;
+}
+
+p {
+  margin: 0 0 0.75em 0;
+}
+
+.note {
+  font-style: italic;
+}
+
+.sample {
+  margin-bottom: 0.5em;
+}
+
+.big {
+  font-weight: bold;
+}
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/toc.ncx b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/toc.ncx
new file mode 100644
index 00000000..7d79a39e
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/OEBPS/toc.ncx
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
+  <head>
+    <meta name="dtb:uid" content="urn:uuid:test-synthetic-unicode-glyphs"/>
+    <meta name="dtb:depth" content="1"/>
+    <meta name="dtb:totalPageCount" content="0"/>
+    <meta name="dtb:maxPageNumber" content="0"/>
+  </head>
+  <docTitle>
+    <text>Test: Synthetic Unicode Glyphs</text>
+  </docTitle>
+  <navMap>
+    <navPoint id="navPoint-1" playOrder="1">
+      <navLabel><text>Glyph Reference</text></navLabel>
+      <content src="chapter1.xhtml"/>
+    </navPoint>
+    <navPoint id="navPoint-2" playOrder="2">
+      <navLabel><text>Block Stress Cases</text></navLabel>
+      <content src="chapter2.xhtml"/>
+    </navPoint>
+  </navMap>
+</ncx>
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/README.md b/test/epubs-src/test_synthetic_unicode_glyphs/README.md
new file mode 100644
index 00000000..5c061b52
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/README.md
@@ -0,0 +1,29 @@
+# Test: Synthetic Unicode Glyphs
+
+Source files for [`test/epubs/test_synthetic_unicode_glyphs.epub`](../../epubs/test_synthetic_unicode_glyphs.epub).
+
+This fixture covers the synthetic glyph paths added in commit `c4357d06e81e836c14126ff0fbd8adfc99e5da67`:
+
+- `U+2588` FULL BLOCK
+- `U+25A0` BLACK SQUARE
+- `U+0393` GREEK CAPITAL GAMMA
+- `U+03B5` GREEK SMALL EPSILON
+- `U+03C9` GREEK SMALL OMEGA
+- `U+02BB` MODIFIER LETTER TURNED COMMA, aliased to `U+2018`
+
+Quick manual verification:
+
+1. Flash or run the build you want to test.
+2. Open `test_synthetic_unicode_glyphs.epub`.
+3. Check chapter 1 for labeled single-glyph and mixed inline samples.
+4. Check chapter 2 for dense block runs near line wraps.
+5. Watch logs while opening/rendering chapter 2; synthetic glyphs should not flood `GFX !! Outside range` messages.
+
+Rebuild the `.epub` after editing the source tree:
+
+```sh
+cd test/epubs-src/test_synthetic_unicode_glyphs
+rm -f ../../epubs/test_synthetic_unicode_glyphs.epub
+zip -X0 ../../epubs/test_synthetic_unicode_glyphs.epub mimetype
+zip -Xr9D ../../epubs/test_synthetic_unicode_glyphs.epub META-INF OEBPS
+```
diff --git a/test/epubs-src/test_synthetic_unicode_glyphs/mimetype b/test/epubs-src/test_synthetic_unicode_glyphs/mimetype
new file mode 100644
index 00000000..403c4f02
--- /dev/null
+++ b/test/epubs-src/test_synthetic_unicode_glyphs/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/test/epubs/test_synthetic_unicode_glyphs.epub b/test/epubs/test_synthetic_unicode_glyphs.epub
new file mode 100644
index 00000000..3d64e6ae
Binary files /dev/null and b/test/epubs/test_synthetic_unicode_glyphs.epub differ
diff --git a/test/hyphenation_eval/HyphenationEvaluationTest.cpp b/test/hyphenation_eval/HyphenationEvaluationTest.cpp
index a56467a9..27b9fff3 100644
--- a/test/hyphenation_eval/HyphenationEvaluationTest.cpp
+++ b/test/hyphenation_eval/HyphenationEvaluationTest.cpp
@@ -44,6 +44,7 @@ const std::vector<LanguageConfig> kSupportedLanguages = {
     {"russian", "test/hyphenation_eval/resources/russian_hyphenation_tests.txt", "ru"},
     {"spanish", "test/hyphenation_eval/resources/spanish_hyphenation_tests.txt", "es"},
     {"italian", "test/hyphenation_eval/resources/italian_hyphenation_tests.txt", "it"},
+    {"polish", "test/hyphenation_eval/resources/polish_hyphenation_tests.txt", "pl"},
 };
 
 std::vector<size_t> expectedPositionsFromAnnotatedWord(const std::string& annotated) {
diff --git a/test/hyphenation_eval/resources/generate_hyphenation_test_data.py b/test/hyphenation_eval/resources/generate_hyphenation_test_data.py
index ec38ee67..288336e1 100644
--- a/test/hyphenation_eval/resources/generate_hyphenation_test_data.py
+++ b/test/hyphenation_eval/resources/generate_hyphenation_test_data.py
@@ -16,7 +16,6 @@
 import argparse
 import re
 from collections import Counter
-import pyphen
 from pathlib import Path
 import zipfile
 
@@ -75,6 +74,8 @@ def generate_hyphenation_data(
         min_prefix: Minimum characters allowed before the first hyphen (default: 2)
         min_suffix: Minimum characters allowed after the last hyphen (default: 2)
     """
+    import pyphen
+
     print(f"Reading from: {input_file}")
 
     # Read the input file
diff --git a/test/hyphenation_eval/resources/polish_hyphenation_tests.txt b/test/hyphenation_eval/resources/polish_hyphenation_tests.txt
new file mode 100644
index 00000000..5bc8738f
--- /dev/null
+++ b/test/hyphenation_eval/resources/polish_hyphenation_tests.txt
@@ -0,0 +1,5012 @@
+# Hyphenation Test Data
+# Source: Władysław Stanisław Reymont, Chlopi.epub
+# Language: pl_PL
+# Min prefix: 2
+# Min suffix: 2
+# Total words: 5000
+# Format: word | hyphenated_form | frequency_in_source
+#
+# Hyphenation points are marked with '='
+# Example: Silbentrennung -> Sil=ben=tren=nung
+#
+
+edytorski|edy=tor=ski|3556
+przypis|przy=pis|3556
+jeszcze|jesz=cze|1046
+wszystko|wszyst=ko|411
+któren|któ=ren|292
+będzie|bę=dzie|285
+ledwie|le=d=wie|267
+wszystkie|wszyst=kie|259
+chałupy|cha=łu=py|252
+ludzie|lu=dzie|245
+cięgiem|cię=giem|240
+dzieci|dzie=ci|239
+dobrze|do=brze|228
+siebie|sie=bie|218
+dopiero|do=pie=ro|212
+Mateusz|Ma=te=usz|210
+całkiem|cał=kiem|200
+Boryna|Bo=ry=na|199
+prawie|pra=wie|195
+wszystkich|wszyst=kich|191
+świecie|świe=cie|183
+dzisiaj|dzi=siaj|164
+choćby|choć=by|161
+roboty|ro=bo=ty|161
+chałupie|cha=łu=pie|158
+drzewa|drze=wa|153
+drugie|dru=gie|151
+słońce|słoń=ce|150
+powiedział|po=wie=dział|149
+wszyscy|wszy=scy|148
+Jagustynka|Ja=gu=styn=ka|146
+poszedł|po=szedł|145
+kobiety|ko=bie=ty|143
+ździebko|ździeb=ko|142
+ksiądz|ksiądz|140
+barzej|ba=rzej|139
+jakieś|ja=kieś|139
+między|mię=dzy|139
+niekiedy|nie=kie=dy|138
+oczami|ocza=mi|137
+chciał|chciał|134
+Jagusia|Ja=gu=sia|134
+ziemię|zie=mię|128
+chociaż|cho=ciaż|123
+więcej|wię=cej|122
+gdzieś|gdzieś|120
+ciężko|cięż=ko|117
+drodze|dro=dze|115
+wszystkim|wszyst=kim|115
+bowiem|bo=wiem|114
+stronę|stro=nę|113
+wielce|wiel=ce|113
+poszła|po=szła|111
+kościoła|ko=ścio=ła|109
+przecież|prze=cież|109
+często|czę=sto|107
+wiater|wia=ter|105
+czasem|cza=sem|103
+prosto|pro=sto|101
+rzucił|rzu=cił|101
+szepnął|szep=nął|101
+głowie|gło=wie|99
+jakoby|ja=ko=by|99
+Grzela|Grze=la|98
+potrza|po=trza|97
+zaczął|za=czął|97
+każden|każ=den|96
+Szymek|Szy=mek|96
+gdziesik|gdzie=sik|94
+gdzieniegdzie|gdzie=nie=gdzie|93
+Jambroży|Jam=bro=ży|93
+ściany|ścia=ny|93
+człowiek|czło=wiek|92
+Prawda|Praw=da|91
+ktosik|kto=sik|90
+prędko|pręd=ko|90
+ciebie|cie=bie|89
+karczmy|karcz=my|89
+Dominikowa|Do=mi=ni=ko=wa|88
+kościele|ko=ście=le|88
+pacierz|pa=cierz|88
+szepnęła|szep=nę=ła|88
+rzekła|rze=kła|87
+właśnie|wła=śnie|87
+dziedzic|dzie=dzic|86
+jednak|jed=nak|86
+prawda|praw=da|85
+drogach|dro=gach|84
+siedział|sie=dział|84
+miejsca|miej=sca|83
+drugich|dru=gich|82
+narodu|na=ro=du|82
+Pietrek|Pie=trek|82
+pilnie|pil=nie|80
+przódzi|przó=dzi|80
+zawołał|za=wo=łał|80
+ziemia|zie=mia|80
+głosem|gło=sem|79
+przeciek|prze=ciek|79
+srodze|sro=dze|79
+krzyknął|krzyk=nął|78
+oczyma|oczy=ma|78
+pewnie|pew=nie|78
+rychło|ry=chło|78
+lepiej|le=piej|77
+piersi|pier=si|77
+żałośnie|ża=ło=śnie|76
+niekaj|nie=kaj|75
+wszędy|wszę=dy|75
+trochę|tro=chę|74
+trzeba|trze=ba|74
+chałupach|cha=łu=pach|73
+pierwszy|pierw=szy|73
+wiedział|wie=dział|73
+gorąco|go=rą=co|72
+swojego|swo=je=go|72
+złości|zło=ści|72
+wskroś|wskroś|71
+karczmie|karcz=mie|69
+którym|któ=rym|69
+prędzej|prę=dzej|69
+płaczem|pła=czem|69
+wczoraj|wczo=raj|69
+dziwnie|dziw=nie|68
+Jagusi|Ja=gu=si|68
+zaczęła|za=czę=ła|68
+niezgorzej|nie=zgo=rzej|67
+swoich|swo=ich|67
+ślepiami|śle=pia=mi|67
+krzykiem|krzy=kiem|66
+musiał|mu=siał|66
+przeciech|prze=ciech|66
+przyszedł|przy=szedł|66
+słońcu|słoń=cu|66
+deszcz|deszcz|65
+oczach|oczach|65
+sielnie|siel=nie|65
+wyszedł|wy=szedł|65
+ziemniaki|ziem=nia=ki|64
+Borynów|Bo=ry=nów|63
+cichości|ci=cho=ści|63
+Dopiero|Do=pie=ro|63
+których|któ=rych|63
+podniósł|pod=niósł|63
+polach|po=lach|63
+słychać|sły=chać|63
+twarzy|twa=rzy|63
+chłopaki|chło=pa=ki|62
+dokoła|do=ko=ła|62
+drzewo|drze=wo|62
+Lipcach|Lip=cach|62
+WolneLektury|Wol=ne=Lek=tu=ry|62
+światła|świa=tła|62
+której|któ=rej|61
+spokojnie|spo=koj=nie|61
+starego|sta=re=go|61
+wesoło|we=so=ło|61
+widział|wi=dział|61
+wszystkiego|wszyst=kie=go|61
+głośno|gło=śno|60
+niekiej|nie=kiej|60
+śmierć|śmierć|60
+chciała|chcia=ła|59
+ciągle|cią=gle|59
+kobiet|ko=biet|59
+leżały|le=ża=ły|59
+bacząc|ba=cząc|58
+cichość|ci=chość|58
+samego|sa=me=go|58
+siedziała|sie=dzia=ła|58
+zawsze|za=wsze|58
+gospodarz|go=spo=darz|57
+nieraz|nie=raz|57
+nikogo|ni=ko=go|57
+sposób|spo=sób|57
+Słońce|Słoń=ce|57
+niecoś|nie=coś|56
+radośnie|ra=do=śnie|56
+strony|stro=ny|56
+trzęsły|trzę=sły|56
+wszyćko|wszyć=ko|56
+zapłać|za=płać|56
+chałupę|cha=łu=pę|55
+chłopy|chło=py|55
+niczego|ni=cze=go|55
+opłotkach|opłot=kach|55
+Pewnie|Pew=nie|55
+szeptał|szep=tał|55
+ciszej|ci=szej|54
+gospodarze|go=spo=da=rze|54
+jednego|jed=ne=go|54
+krzywdy|krzyw=dy|54
+niebie|nie=bie|54
+niejeden|nie=je=den|54
+stawem|sta=wem|54
+czerwone|czer=wo=ne|53
+Dominikowej|Do=mi=ni=ko=wej|53
+drugiej|dru=giej|53
+kobieta|ko=bie=ta|53
+opłotki|opłot=ki|53
+przyjdzie|przyj=dzie|53
+siedzieli|sie=dzie=li|53
+stojał|sto=jał|53
+strach|strach|53
+takiego|ta=kie=go|53
+chłopa|chło=pa|52
+ciężkie|cięż=kie|52
+księdza|księ=dza|52
+miasta|mia=sta|52
+chłopak|chło=pak|51
+długie|dłu=gie|51
+któryś|któ=ryś|51
+ruszył|ru=szył|51
+wieczór|wie=czór|51
+zawżdy|za=wż=dy|51
+śmierci|śmier=ci|51
+chałupą|cha=łu=pą|50
+chwili|chwi=li|50
+dobrodziej|do=bro=dziej|50
+powietrzu|po=wie=trzu|50
+pójdzie|pój=dzie|50
+robota|ro=bo=ta|50
+stronie|stro=nie|50
+trudno|trud=no|50
+trwożnie|trwoż=nie|50
+chodził|cho=dził|49
+Dobrze|Do=brze|49
+zacząć|za=cząć|49
+zaczęli|za=czę=li|49
+chłopów|chło=pów|48
+leciały|le=cia=ły|48
+osobna|osob=na|48
+pieniądze|pie=nią=dze|48
+wzięła|wzię=ła|48
+drugiego|dru=gie=go|47
+jeszczek|jesz=czek|47
+którego|któ=re=go|47
+mruknął|mruk=nął|47
+młynarz|mły=narz|47
+naprzeciw|na=prze=ciw|47
+poszli|po=szli|47
+powietrze|po=wie=trze|47
+swojej|swo=jej|47
+wiadomo|wia=do=mo|47
+wreszcie|wresz=cie|47
+zapytał|za=py=tał|47
+święta|świę=ta|47
+chciało|chcia=ło|46
+każdego|każ=de=go|46
+miejscu|miej=scu|46
+myślał|my=ślał|46
+podnosił|pod=no=sił|46
+powiedziała|po=wie=dzia=ła|46
+stajni|staj=ni|46
+wszedł|wszedł|46
+zarówno|za=rów=no|46
+dojrzał|doj=rzał|45
+dziecko|dziec=ko|45
+jakimś|ja=kimś|45
+Jeszcze|Jesz=cze|45
+każdym|każ=dym|45
+przysiadł|przy=siadł|45
+sadach|sa=dach|45
+siedzi|sie=dzi|45
+wesele|we=se=le|45
+drugimi|dru=gi=mi|44
+Kłębów|Kłę=bów|44
+ludźmi|ludź=mi|44
+pacierze|pa=cie=rze|44
+patrzeć|pa=trzeć|44
+poredzić|po=re=dzić|44
+Płoszka|Płosz=ka|44
+radości|ra=do=ści|44
+wiecie|wie=cie|44
+wszystek|wszy=stek|44
+zrobił|zro=bił|44
+złotych|zło=tych|44
+złością|zło=ścią|44
+śmiechem|śmie=chem|44
+bardziej|bar=dziej|43
+dziwota|dzi=wo=ta|43
+Jambroż|Jam=broż|43
+prawdę|praw=dę|43
+sadzie|sa=dzie|43
+zaczęły|za=czę=ły|43
+światem|świa=tem|43
+chodzi|cho=dzi|42
+cichuśko|ci=chuś=ko|42
+gospodarzy|go=spo=da=rzy|42
+każdemu|każ=de=mu|42
+krzyczał|krzy=czał|42
+leciał|le=ciał|42
+Michał|Mi=chał|42
+myślała|my=śla=ła|42
+mówili|mó=wi=li|42
+przyszła|przy=szła|42
+sprawy|spra=wy|42
+swojemu|swo=je=mu|42
+szukać|szu=kać|42
+słowem|sło=wem|42
+wszędzie|wszę=dzie|42
+świata|świa=ta|42
+światło|świa=tło|42
+drugim|dru=gim|41
+krzyczeć|krzy=czeć|41
+krzyki|krzy=ki|41
+leżała|le=ża=ła|41
+patrzył|pa=trzył|41
+patrząc|pa=trząc|41
+pieniędzy|pie=nię=dzy|41
+próżno|próż=no|41
+sprawa|spra=wa|41
+grosza|gro=sza|40
+Kozłowa|Ko=zło=wa|40
+lubością|lu=bo=ścią|40
+Maciej|Ma=ciej|40
+pięściami|pię=ścia=mi|40
+poleciał|po=le=ciał|40
+przyszło|przy=szło|40
+radością|ra=do=ścią|40
+skoczył|sko=czył|40
+ścianą|ścia=ną|40
+bliżej|bli=żej|39
+Jagusię|Ja=gu=się|39
+jestem|je=stem|39
+kominem|ko=mi=nem|39
+komory|ko=mo=ry|39
+krzyknęła|krzyk=nę=ła|39
+któraś|któ=raś|39
+niemało|nie=ma=ło|39
+powiadał|po=wia=dał|39
+radość|ra=dość|39
+szeroko|sze=ro=ko|39
+słońca|słoń=ca|39
+zawołała|za=wo=ła=ła|39
+śniegi|śnie=gi|39
+Boryny|Bo=ry=ny|38
+daleko|da=le=ko|38
+dworze|dwo=rze|38
+dzieje|dzie=je|38
+dziećmi|dzieć=mi|38
+groźnie|groź=nie|38
+jednej|jed=nej|38
+miejsce|miej=sce|38
+milczeniu|mil=cze=niu|38
+niczym|ni=czym|38
+potrzeba|po=trze=ba|38
+rzeczy|rze=czy|38
+strachu|stra=chu|38
+westchnął|wes=tchnął|38
+Wiecie|Wie=cie|38
+wiedząc|wie=dząc|38
+ziemniaków|ziem=nia=ków|38
+zrobić|zro=bić|38
+chałup|cha=łup|37
+chwila|chwi=la|37
+dobrego|do=bre=go|37
+każdej|każ=dej|37
+musiała|mu=sia=ła|37
+Nastka|Na=st=ka|37
+nowego|no=we=go|37
+podwórze|po=dwó=rze|37
+robotę|ro=bo=tę|37
+różnych|róż=nych|37
+stodoły|sto=do=ły|37
+słuchał|słu=chał|37
+zaglądał|za=glą=dał|37
+ziemie|zie=mie|37
+zwiesnę|zwie=snę|37
+bardzo|bar=dzo|36
+całego|ca=łe=go|36
+czasami|cza=sa=mi|36
+dojrzawszy|doj=rzaw=szy|36
+powiada|po=wia=da|36
+pośrodku|po=środ=ku|36
+strasznie|strasz=nie|36
+wszystkimi|wszyst=ki=mi|36
+wywarte|wy=war=te|36
+zajrzał|zaj=rzał|36
+Bogiem|Bo=giem|35
+chwilę|chwi=lę|35
+chłopaków|chło=pa=ków|35
+czarne|czar=ne|35
+cztery|czte=ry|35
+głupie|głu=pie|35
+jednym|jed=nym|35
+Ksiądz|Ksiądz|35
+morgów|mor=gów|35
+ostała|osta=ła|35
+pierwsze|pierw=sze|35
+poradzić|po=ra=dzić|35
+poredzi|po=re=dzi|35
+powiem|po=wiem|35
+powrotem|po=wro=tem|35
+prawił|pra=wił|35
+różności|róż=no=ści|35
+smutnie|smut=nie|35
+strachem|stra=chem|35
+szmaty|szma=ty|35
+słyszał|sły=szał|35
+takich|ta=kich|35
+takiej|ta=kiej|35
+trzęsła|trzę=sła|35
+zrobiło|zro=bi=ło|35
+ścianę|ścia=nę|35
+ślepie|śle=pie|35
+święty|świę=ty|35
+chyłkiem|chył=kiem|34
+czegoś|cze=goś|34
+dzieuchy|dzieu=chy|34
+dziewczyny|dziew=czy=ny|34
+galanto|ga=lan=to|34
+Jagusią|Ja=gu=sią|34
+nikomu|ni=ko=mu|34
+nogami|no=ga=mi|34
+patrzy|pa=trzy|34
+Tereska|Te=re=ska|34
+zawzięcie|za=wzię=cie|34
+zwyczajnie|zwy=czaj=nie|34
+śniegu|śnie=gu|34
+chleba|chle=ba|33
+czasie|cza=sie|33
+Jędrzych|Ję=drzych|33
+kulasy|ku=la=sy|33
+Mateusza|Ma=te=usza|33
+mówiła|mó=wi=ła|33
+niedzielę|nie=dzie=lę|33
+organista|or=ga=ni=sta|33
+parobek|pa=ro=bek|33
+podniesła|pod=nie=sła|33
+poleciała|po=le=cia=ła|33
+puścił|pu=ścił|33
+resztę|resz=tę|33
+rozglądając|roz=glą=da=jąc|33
+Właśnie|Wła=śnie|33
+chałupami|cha=łu=pa=mi|32
+czekał|cze=kał|32
+drzewami|drze=wa=mi|32
+kiejby|kiej=by|32
+kościołem|ko=ścio=łem|32
+muzyka|mu=zy=ka|32
+nieśmiało|nie=śmia=ło|32
+organistów|or=ga=ni=stów|32
+organiścina|or=ga=ni=ści=na|32
+owdzie|owdzie|32
+parobków|pa=rob=ków|32
+patrzał|pa=trzał|32
+powiedzieć|po=wie=dzieć|32
+prosił|pro=sił|32
+Przeciech|Prze=ciech|32
+ramiona|ra=mio=na|32
+rychtyk|rych=tyk|32
+Stacho|Sta=cho|32
+tylachna|ty=lach=na|32
+uciechy|ucie=chy|32
+wysoko|wy=so=ko|32
+wyszła|wy=szła|32
+Zdrowaś|Zdro=waś|32
+ziemią|zie=mią|32
+świętą|świę=tą|32
+gałęzie|ga=łę=zie|31
+głównie|głów=nie|31
+Jankiel|Jan=kiel|31
+kamień|ka=mień|31
+kościół|ko=ściół|31
+Kłębowa|Kłę=bo=wa|31
+miejscami|miej=sca=mi|31
+niesły|nie=sły|31
+ogniem|ogniem|31
+ruchać|ru=chać|31
+spiesznie|spiesz=nie|31
+stanął|sta=nął|31
+szeptała|szep=ta=ła|31
+wcześniej|wcze=śniej|31
+westchnęła|wes=tchnę=ła|31
+wrzask|wrzask|31
+wzdychał|wzdy=chał|31
+akuratnie|aku=rat=nie|30
+chodziła|cho=dzi=ła|30
+chycił|chy=cił|30
+ciepło|cie=pło|30
+garści|gar=ści|30
+gwiazdy|gwiaz=dy|30
+głęboko|głę=bo=ko|30
+kamienie|ka=mie=nie|30
+kominie|ko=mi=nie|30
+młynarza|mły=na=rza|30
+rzuciła|rzu=ci=ła|30
+widząc|wi=dząc|30
+wieczora|wie=czo=ra|30
+wiedziała|wie=dzia=ła|30
+wkrótce|wkrót=ce|30
+wrzaski|wrza=ski|30
+zajadle|za=ja=dle|30
+zarazem|za=ra=zem|30
+zdziebko|zdzieb=ko|30
+zmierzchu|zmierz=chu|30
+święte|świę=te|30
+buchnęła|buch=nę=ła|29
+Bylica|By=li=ca|29
+cienie|cie=nie|29
+ciągnął|cią=gnął|29
+czynił|czy=nił|29
+dobrodzieja|do=bro=dzie=ja|29
+galancie|ga=lan=cie|29
+godzinę|go=dzi=nę|29
+gorzałki|go=rzał=ki|29
+głośniej|gło=śniej|29
+kieliszek|kie=li=szek|29
+kolana|ko=la=na|29
+nasłuchując|na=słu=chu=jąc|29
+pazurami|pa=zu=ra=mi|29
+pięścią|pię=ścią|29
+podwórzu|po=dwó=rzu|29
+pojechał|po=je=chał|29
+poredziła|po=re=dzi=ła|29
+prosiła|pro=si=ła|29
+przystawał|przy=sta=wał|29
+robocie|ro=bo=cie|29
+sołtys|soł=tys|29
+spojrzał|spoj=rzał|29
+spytała|spy=ta=ła|29
+stanie|sta=nie|29
+stanęła|sta=nę=ła|29
+słuchać|słu=chać|29
+urągliwie|urą=gli=wie|29
+weźmie|weź=mie|29
+widziało|wi=dzia=ło|29
+wiedzą|wie=dzą|29
+wielkim|wiel=kim|29
+wrócił|wró=cił|29
+wzięli|wzię=li|29
+wójtowa|wój=to=wa|29
+zapamiętale|za=pa=mię=ta=le|29
+śpiewał|śpie=wał|29
+boleśnie|bo=le=śnie|28
+częściej|czę=ściej|28
+człowieka|czło=wie=ka|28
+drudzy|dru=dzy|28
+drzwiami|drzwia=mi|28
+dziesięć|dzie=sięć|28
+gospodyni|go=spo=dy=ni|28
+jeszczech|jesz=czech|28
+którzy|któ=rzy|28
+Macieju|Ma=cie=ju|28
+odrzekł|od=rzekł|28
+ozwała|ozwa=ła|28
+pierwsza|pierw=sza|28
+pierzynę|pie=rzy=nę|28
+pieski|pie=ski|28
+podnosząc|pod=no=sząc|28
+pokrótce|po=krót=ce|28
+przeszedł|prze=szedł|28
+przyleciał|przy=le=ciał|28
+spokój|spo=kój|28
+spowiedzi|spo=wie=dzi|28
+starszy|star=szy|28
+uciekać|ucie=kać|28
+wicher|wi=cher|28
+zwiesna|zwie=sna|28
+śmiała|śmia=ła|28
+śpiesznie|śpiesz=nie|28
+świnie|świ=nie|28
+dziewczyna|dziew=czy=na|27
+gorzałkę|go=rzał=kę|27
+głupia|głu=pia|27
+Jasiek|Ja=siek|27
+koniec|ko=niec|27
+koszuli|ko=szu=li|27
+Lipiec|Li=piec|27
+ludziach|lu=dziach|27
+naprzód|na=przód|27
+Nastusia|Na=stu=sia|27
+odrzekła|od=rze=kła|27
+pacierza|pa=cie=rza|27
+powiadali|po=wia=da=li|27
+przeciw|prze=ciw|27
+płacze|pła=cze|27
+Płoszkowa|Płosz=ko=wa|27
+sercem|ser=cem|27
+starym|sta=rym|27
+widziała|wi=dzia=ła|27
+wieczorem|wie=czo=rem|27
+Wszystkie|Wszyst=kie|27
+wykrzyknął|wy=krzyk=nął|27
+znowuj|zno=wuj|27
+świętej|świę=tej|27
+białych|bia=łych|26
+brakowało|bra=ko=wa=ło|26
+buchnął|buch=nął|26
+byście|by=ście|26
+będziesz|bę=dziesz|26
+chmury|chmu=ry|26
+dziedzica|dzie=dzi=ca|26
+dzisia|dzi=sia|26
+kapoty|ka=po=ty|26
+krzywda|krzyw=da|26
+obrazy|ob=ra=zy|26
+pomocy|po=mo=cy|26
+porwał|po=rwał|26
+proboszcz|pro=boszcz|26
+rzucał|rzu=cał|26
+sprawę|spra=wę|26
+szybko|szyb=ko|26
+twardo|twar=do|26
+wrzaskiem|wrza=skiem|26
+wychodził|wy=cho=dził|26
+zagony|za=go=ny|26
+zerwał|ze=rwał|26
+śmiechu|śmie=chu|26
+śmiechy|śmie=chy|26
+bezwolnie|bez=wol=nie|25
+cichym|ci=chym|25
+czerwonych|czer=wo=nych|25
+dookoła|do=oko=ła|25
+gotowa|go=to=wa|25
+głowami|gło=wa=mi|25
+komina|ko=mi=na|25
+krzywdę|krzyw=dę|25
+krzyżem|krzy=żem|25
+mrokach|mro=kach|25
+mruczał|mru=czał|25
+najbarzej|naj=ba=rzej|25
+nazajutrz|na=za=jutrz|25
+niespokojnie|nie=spo=koj=nie|25
+ostatnie|ostat=nie|25
+ostatnią|ostat=nią|25
+ostrożnie|ostroż=nie|25
+pamięci|pa=mię=ci|25
+patrzała|pa=trza=ła|25
+pewnikiem|pew=ni=kiem|25
+pierwszą|pierw=szą|25
+Pietrka|Pietr=ka|25
+przeżegnał|prze=że=gnał|25
+później|póź=niej|25
+reszta|resz=ta|25
+rozlegał|roz=le=gał|25
+sieniach|sie=niach|25
+Weronka|We=ron=ka|25
+wszystkiemu|wszyst=kie=mu|25
+wyrwał|wy=rwał|25
+zapaskę|za=pa=skę|25
+śniegiem|śnie=giem|25
+Bartek|Bar=tek|24
+bliska|bli=ska|24
+bronił|bro=nił|24
+buchały|bu=cha=ły|24
+cieniu|cie=niu|24
+cierpliwie|cier=pli=wie|24
+dzieciom|dzie=ciom|24
+dłużej|dłu=żej|24
+grzech|grzech|24
+indziej|in=dziej|24
+kochany|ko=cha=ny|24
+kożuch|ko=żuch|24
+kątach|ką=tach|24
+leciała|le=cia=ła|24
+lękliwie|lę=kli=wie|24
+niechby|niech=by|24
+ogromne|ogrom=ne|24
+poradzi|po=ra=dzi|24
+przystanął|przy=sta=nął|24
+przyszli|przy=szli|24
+robiła|ro=bi=ła|24
+rozumu|ro=zu=mu|24
+trzyma|trzy=ma|24
+trzymał|trzy=mał|24
+wielki|wiel=ki|24
+wisiało|wi=sia=ło|24
+wodzie|wo=dzie|24
+wprost|wprost|24
+wypowiedzieć|wy=po=wie=dzieć|24
+wójtów|wój=tów|24
+zabrał|za=brał|24
+ścianami|ścia=na=mi|24
+środku|środ=ku|24
+bieżyć|bie=żyć|23
+bociek|bo=ciek|23
+błocie|bło=cie|23
+chocia|cho=cia|23
+ciepły|cie=pły|23
+drzewiny|drze=wi=ny|23
+Jagustynki|Ja=gu=styn=ki|23
+jęknęła|jęk=nę=ła|23
+kochane|ko=cha=ne|23
+mocniej|moc=niej|23
+oglądać|oglą=dać|23
+organy|or=ga=ny|23
+ostatni|ostat=ni|23
+pacierzy|pa=cie=rzy|23
+papierosa|pa=pie=ro=sa|23
+pazury|pa=zu=ry|23
+portki|por=t=ki|23
+powrócił|po=wró=cił|23
+południe|po=łu=dnie|23
+przyniósł|przy=niósł|23
+płotem|pło=tem|23
+rzeknę|rzek=nę|23
+siarczyście|siar=czy=ście|23
+siedzą|sie=dzą|23
+stawie|sta=wie|23
+trzech|trzech|23
+twarze|twa=rze|23
+tydzień|ty=dzień|23
+wykrzyknęła|wy=krzyk=nę=ła|23
+wynosił|wy=no=sił|23
+wytrzymać|wy=trzy=mać|23
+zakrzyczał|za=krzy=czał|23
+zdołać|zdo=łać|23
+zdrowie|zdro=wie|23
+świeciło|świe=ci=ło|23
+świtania|świ=ta=nia|23
+Antkowi|Ant=ko=wi|22
+bronić|bro=nić|22
+chcieli|chcie=li|22
+czapkę|czap=kę|22
+dzwony|dzwo=ny|22
+gotowy|go=to=wy|22
+głosów|gło=sów|22
+głucho|głu=cho|22
+Głupiś|Głu=piś|22
+inaczej|ina=czej|22
+innego|in=ne=go|22
+inszego|in=sze=go|22
+kiedyś|kie=dyś|22
+kowala|ko=wa=la|22
+krzyczała|krzy=cza=ła|22
+kurzawy|ku=rza=wy|22
+Ludzie|Lu=dzie|22
+niechta|nie=chta|22
+niejednemu|nie=jed=ne=mu|22
+ojcowej|oj=co=wej|22
+organisty|or=ga=ni=sty|22
+pomiędzy|po=mię=dzy|22
+poredził|po=re=dził|22
+poszły|po=szły|22
+Prawdę|Praw=dę|22
+przodem|przo=dem|22
+przychodzi|przy=cho=dzi|22
+płotów|pło=tów|22
+roznosiły|roz=no=si=ły|22
+rychlej|ry=chlej|22
+również|rów=nież|22
+szkoda|szko=da|22
+topolowej|to=po=lo=wej|22
+wojska|woj=ska|22
+wołała|wo=ła=ła|22
+żadnej|żad=nej|22
+chodziły|cho=dzi=ły|21
+chorego|cho=re=go|21
+chycić|chy=cić|21
+chłopaka|chło=pa=ka|21
+czerwony|czer=wo=ny|21
+dobrym|do=brym|21
+Dominikową|Do=mi=ni=ko=wą|21
+działo|dzia=ło|21
+dziedzicem|dzie=dzi=cem|21
+gromadą|gro=ma=dą|21
+jakiejś|ja=kiejś|21
+jednako|jed=na=ko|21
+komorze|ko=mo=rze|21
+kręcił|krę=cił|21
+latały|la=ta=ły|21
+ludziom|lu=dziom|21
+nabożeństwo|na=bo=żeń=stwo|21
+nasłuchiwał|na=słu=chi=wał|21
+odpowiadał|od=po=wia=dał|21
+ogromny|ogrom=ny|21
+plebanię|ple=ba=nię|21
+począć|po=cząć|21
+poniektóre|po=nie=któ=re|21
+przerwał|prze=rwał|21
+przystając|przy=sta=jąc|21
+rozeznać|ro=ze=znać|21
+rozlegały|roz=le=ga=ły|21
+ruszyli|ru=szy=li|21
+skrzydłami|skrzy=dła=mi|21
+stawał|sta=wał|21
+uważnie|uważ=nie|21
+wargami|war=ga=mi|21
+wniebogłosy|wnie=bo=gło=sy|21
+wracają|wra=ca=ją|21
+wrzasnął|wrza=snął|21
+wrzasnęła|wrza=snę=ła|21
+wyniósł|wy=niósł|21
+wyraźnie|wy=raź=nie|21
+zagonach|za=go=nach|21
+zajrzeć|zaj=rzeć|21
+zapomnieć|za=po=mnieć|21
+śniegów|śnie=gów|21
+śpiewały|śpie=wa=ły|21
+świnia|świ=nia|21
+całował|ca=ło=wał|20
+chodzili|cho=dzi=li|20
+ciężki|cięż=ki|20
+czekać|cze=kać|20
+daleka|da=le=ka|20
+dalekie|da=le=kie|20
+dorzucił|do=rzu=cił|20
+dzieciątko|dzie=ciąt=ko|20
+gałęzi|ga=łę=zi|20
+historie|hi=sto=rie|20
+jakiego|ja=kie=go|20
+jarmarku|jar=mar=ku|20
+jaskółki|ja=skół=ki|20
+kapotę|ka=po=tę|20
+kiełbasy|kieł=ba=sy|20
+kolacji|ko=la=cji|20
+kowalowa|ko=wa=lo=wa|20
+krótko|krót=ko|20
+lecieć|le=cieć|20
+naczelnik|na=czel=nik|20
+nieustannie|nie=ustan=nie|20
+odwrócił|od=wró=cił|20
+oknami|okna=mi|20
+ostało|osta=ło|20
+pamięć|pa=mięć|20
+pijany|pi=ja=ny|20
+podnosiła|pod=no=si=ła|20
+podnosiły|pod=no=si=ły|20
+podwórza|po=dwó=rza|20
+pomagać|po=ma=gać|20
+pomarł|po=marł|20
+powieda|po=wie=da|20
+powstał|po=wstał|20
+południa|po=łu=dnia|20
+rozglądał|roz=glą=dał|20
+rękach|rę=kach|20
+skrzyni|skrzy=ni|20
+smętarz|smę=tarz|20
+sprawiedliwości|spra=wie=dli=wo=ści|20
+starczyło|star=czy=ło|20
+szukał|szu=kał|20
+topoli|to=po=li|20
+trzasnął|trza=snął|20
+trzydzieści|trzy=dzie=ści|20
+ukradkiem|ukrad=kiem|20
+uroczyście|uro=czy=ście|20
+wiedzieć|wie=dzieć|20
+Witkiem|Wit=kiem|20
+wodził|wo=dził|20
+wsiach|wsiach|20
+Wszystko|Wszyst=ko|20
+wyciągnął|wy=cią=gnął|20
+wójtem|wój=tem|20
+zaśmiał|za=śmiał|20
+zielone|zie=lo=ne|20
+Antkiem|Ant=kiem|19
+blisko|bli=sko|19
+borowy|bo=ro=wy|19
+buchał|bu=chał|19
+całować|ca=ło=wać|19
+Cichoj|Ci=choj|19
+cmentarz|cmen=tarz|19
+czterech|czte=rech|19
+czyste|czy=ste|19
+garście|gar=ście|19
+gdzież|gdzież|19
+gniewnie|gniew=nie|19
+godziny|go=dzi=ny|19
+Grzeli|Grze=li|19
+głuche|głu=che|19
+głuchy|głu=chy|19
+Jambroża|Jam=bro=ża|19
+kancelarii|kan=ce=la=rii|19
+Kobiety|Ko=bie=ty|19
+kreminale|kre=mi=na=le|19
+kroków|kro=ków|19
+kużden|kuż=den|19
+lipeckie|li=pec=kie|19
+Mateuszem|Ma=te=uszem|19
+Moiściewy|Mo=iście=wy|19
+młynem|mły=nem|19
+narodem|na=ro=dem|19
+Nastuś|Na=stuś|19
+nogach|no=gach|19
+obejrzał|obej=rzał|19
+obiedzie|obie=dzie|19
+pobiegła|po=bie=gła|19
+poczciwie|po=czci=wie|19
+poczuła|po=czu=ła|19
+polami|po=la=mi|19
+poniesła|po=nie=sła|19
+przebierać|prze=bie=rać|19
+przechodził|prze=cho=dził|19
+przedzie|prze=dzie|19
+przejmował|przej=mo=wał|19
+puszczą|pusz=czą|19
+płynął|pły=nął|19
+rozgłośnie|roz=gło=śnie|19
+rozległ|roz=legł|19
+rozmowy|roz=mo=wy|19
+rozpalone|roz=pa=lo=ne|19
+rękoma|rę=ko=ma|19
+samych|sa=mych|19
+serdecznie|ser=decz=nie|19
+skończyła|skoń=czy=ła|19
+starszych|star=szych|19
+turbacji|tur=ba=cji|19
+urzędu|urzę=du|19
+wichurą|wi=chu=rą|19
+widzieli|wi=dzie=li|19
+wiosna|wio=sna|19
+większy|więk=szy|19
+wymiarkować|wy=miar=ko=wać|19
+wyniesła|wy=nie=sła|19
+zajrzała|zaj=rza=ła|19
+zakrzyczała|za=krzy=cza=ła|19
+znajdzie|znaj=dzie|19
+zrobiła|zro=bi=ła|19
+łacniej|łac=niej|19
+ściskał|ści=skał|19
+śniegach|śnie=gach|19
+bierze|bie=rze|18
+Borynie|Bo=ry=nie|18
+błyskały|bły=ska=ły|18
+chcecie|chce=cie|18
+chłopami|chło=pa=mi|18
+cieniach|cie=niach|18
+ciągnęły|cią=gnę=ły|18
+czytał|czy=tał|18
+Dajcie|Daj=cie|18
+deliberować|de=li=be=ro=wać|18
+dobrodziejowi|do=bro=dzie=jo=wi|18
+dwadzieścia|dwa=dzie=ścia|18
+dworskie|dwor=skie|18
+dzwoniły|dzwo=ni=ły|18
+gorzały|go=rza=ły|18
+gorzej|go=rzej|18
+grontu|gron=tu|18
+Jagnie|Ja=gnie|18
+jakiegoś|ja=kie=goś|18
+Jantoś|Jan=toś|18
+książki|książ=ki|18
+księdzem|księ=dzem|18
+księżyc|księ=życ|18
+mojego|mo=je=go|18
+mruknęła|mruk=nę=ła|18
+musieli|mu=sie=li|18
+młynie|mły=nie|18
+należy|na=le=ży|18
+nieprawda|nie=praw=da|18
+obaczysz|oba=czysz|18
+oczymgnienie|oczym=gnie=nie|18
+odszedł|od=szedł|18
+ogarniał|ogar=niał|18
+otwarte|otwar=te|18
+papier|pa=pier|18
+patrzyła|pa=trzy=ła|18
+pierwszej|pierw=szej|18
+pierzyną|pie=rzy=ną|18
+pieśnie|pie=śnie|18
+pisarz|pi=sarz|18
+plecach|ple=cach|18
+poczuł|po=czuł|18
+Podlesie|Pod=le=sie|18
+Podlesiu|Pod=le=siu|18
+podniosła|pod=nio=sła|18
+pogadywał|po=ga=dy=wał|18
+pokornie|po=kor=nie|18
+powróci|po=wró=ci|18
+południu|po=łu=dniu|18
+progiem|pro=giem|18
+prosić|pro=sić|18
+Przecież|Prze=cież|18
+przejął|prze=jął|18
+przyjść|przyjść|18
+przysiadła|przy=sia=dła|18
+ptaszek|pta=szek|18
+pytała|py=ta=ła|18
+robiło|ro=bi=ło|18
+rzadka|rzad=ka|18
+rękami|rę=ka=mi|18
+skamlał|skam=lał|18
+stworzenie|stwo=rze=nie|18
+swoimi|swo=imi|18
+szczekał|szcze=kał|18
+szepty|szep=ty|18
+słuchali|słu=cha=li|18
+słyszała|sły=sza=ła|18
+trząsł|trząsł|18
+uciekła|ucie=kła|18
+uczynił|uczy=nił|18
+wesela|we=se=la|18
+wełniaki|weł=nia=ki|18
+widziały|wi=dzia=ły|18
+wielgachne|wiel=gach=ne|18
+wielkie|wiel=kie|18
+wlekły|wle=kły|18
+wyszło|wy=szło|18
+wzieni|wzie=ni|18
+zapomniał|za=po=mniał|18
+zapytała|za=py=ta=ła|18
+ziemiach|zie=miach|18
+zrywał|zry=wał|18
+ścierwy|ścier=wy|18
+środkiem|środ=kiem|18
+świece|świe=ce|18
+świętym|świę=tym|18
+żywego|ży=we=go|18
+bezwiednie|bez=wied=nie|17
+Borynowej|Bo=ry=no=wej|17
+Borynę|Bo=ry=nę|17
+Będzie|Bę=dzie|17
+chustkę|chust=kę|17
+chwilami|chwi=la=mi|17
+cisnąc|ci=snąc|17
+czekając|cze=ka=jąc|17
+dalejże|da=lej=że|17
+daruję|da=ru=ję|17
+dodała|do=da=ła|17
+dziecińskie|dzie=ciń=skie|17
+Dziedzic|Dzie=dzic|17
+dziwną|dziw=ną|17
+frasobliwie|fra=so=bli=wie|17
+gardziel|gar=dziel|17
+gardzieli|gar=dzie=li|17
+gospodynie|go=spo=dy=nie|17
+gromadzie|gro=ma=dzie|17
+huczał|hu=czał|17
+jarmark|jar=mark|17
+jesteście|je=ste=ście|17
+kamieniem|ka=mie=niem|17
+karczmę|karcz=mę|17
+kryjomo|kry=jo=mo|17
+krzykał|krzy=kał|17
+krótkie|krót=kie|17
+księży|księ=ży|17
+kłótni|kłót=ni|17
+ludzkie|ludz=kie|17
+mamrotał|mam=ro=tał|17
+myśląc|my=śląc|17
+najgorsze|naj=gor=sze|17
+niecierpliwie|nie=cier=pli=wie|17
+niełacno|nie=łac=no|17
+nijakiej|ni=ja=kiej|17
+ochotnie|ochot=nie|17
+ostanie|osta=nie|17
+ostatku|ostat=ku|17
+ołtarzem|oł=ta=rzem|17
+padały|pa=da=ły|17
+plebanii|ple=ba=nii|17
+podniesły|pod=nie=sły|17
+pognał|po=gnał|17
+poredzę|po=re=dzę|17
+posobnie|po=sob=nie|17
+poważnie|po=waż=nie|17
+powiadają|po=wia=da=ją|17
+Przeciek|Prze=ciek|17
+przeszło|prze=szło|17
+przykład|przy=kład|17
+rozeznał|ro=ze=znał|17
+ruszyć|ru=szyć|17
+skończyli|skoń=czy=li|17
+spoglądał|spo=glą=dał|17
+spozierając|spo=zie=ra=jąc|17
+sprawiedliwość|spra=wie=dli=wość|17
+stanęło|sta=nę=ło|17
+szczęścia|szczę=ścia|17
+słomiane|sło=mia=ne|17
+topolową|to=po=lo=wą|17
+trudem|tru=dem|17
+trwogą|trwo=gą|17
+urodna|urod=na|17
+Wieczór|Wie=czór|17
+wielkiej|wiel=kiej|17
+wisiały|wi=sia=ły|17
+wolniej|wol=niej|17
+wrzeszczała|wrzesz=cza=ła|17
+wszelkie|wszel=kie|17
+wszystkiej|wszyst=kiej|17
+wyciągał|wy=cią=gał|17
+wynosiły|wy=no=si=ły|17
+wyrzekła|wy=rze=kła|17
+wzdłuż|wzdłuż|17
+zaklął|za=klął|17
+zaśmiała|za=śmia=ła|17
+zbierać|zbie=rać|17
+zbierał|zbie=rał|17
+zbrakło|zbra=kło|17
+zielonych|zie=lo=nych|17
+śniadaniu|śnia=da=niu|17
+światłem|świa=tłem|17
+świeciły|świe=ci=ły|17
+żałości|ża=ło=ści|17
+ambony|am=bo=ny|16
+bezradnie|bez=rad=nie|16
+biedota|bie=do=ta|16
+Boryną|Bo=ry=ną|16
+broniła|bro=ni=ła|16
+bywało|by=wa=ło|16
+chłopi|chło=pi|16
+ciągnęli|cią=gnę=li|16
+czerwoną|czer=wo=ną|16
+człowieku|czło=wie=ku|16
+dojrzała|doj=rza=ła|16
+domowi|do=mo=wi|16
+długim|dłu=gim|16
+gospodarstwo|go=spo=dar=stwo|16
+granie|gra=nie|16
+grzechu|grze=chu|16
+gwałtownie|gwał=tow=nie|16
+głębokim|głę=bo=kim|16
+jakiej|ja=kiej|16
+kamieniami|ka=mie=nia=mi|16
+karczma|karcz=ma|16
+kałuże|ka=łu=że|16
+kochanie|ko=cha=nie|16
+kreminału|kre=mi=na=łu|16
+którymi|któ=ry=mi|16
+kwiaty|kwia=ty|16
+markotno|mar=kot=no|16
+Modlicy|Mo=dli=cy|16
+modlitwy|mo=dli=twy|16
+niebądź|nie=bądź|16
+odeszła|ode=szła|16
+opadły|opa=dły|16
+opowiadać|opo=wia=dać|16
+ostanę|osta=nę|16
+ostatniej|ostat=niej|16
+ołtarza|oł=ta=rza|16
+parobka|pa=rob=ka|16
+parobki|pa=rob=ki|16
+pierwszego|pierw=sze=go|16
+pierzyny|pie=rzy=ny|16
+pilnować|pil=no=wać|16
+pięknie|pięk=nie|16
+postawił|po=sta=wił|16
+pościeli|po=ście=li|16
+przeciągał|prze=cią=gał|16
+przyjacielstwa|przy=ja=ciel=stwa|16
+przyjdą|przyj=dą|16
+przyniesła|przy=nie=sła|16
+płachtą|płach=tą|16
+płótno|płót=no|16
+rankiem|ran=kiem|16
+rozmysłem|roz=my=słem|16
+rozumiesz|ro=zu=miesz|16
+ruszać|ru=szać|16
+siedziały|sie=dzia=ły|16
+sielny|siel=ny|16
+spoglądając|spo=glą=da=jąc|16
+stojała|sto=ja=ła|16
+strażników|straż=ni=ków|16
+szkołę|szko=łę|16
+trwogi|trwo=gi|16
+tłumaczył|tłu=ma=czył|16
+wiedli|wie=dli|16
+wodząc|wo=dząc|16
+wrzeszczał|wrzesz=czał|16
+wróble|wró=ble|16
+wychodzili|wy=cho=dzi=li|16
+wzięły|wzię=ły|16
+zachodu|za=cho=du|16
+zagadnął|za=gad=nął|16
+zapachy|za=pa=chy|16
+zatrząsł|za=trząsł|16
+zauważył|za=uwa=żył|16
+znaczenie|zna=cze=nie|16
+zważał|zwa=żał|16
+śpiewy|śpie=wy|16
+świtaniu|świ=ta=niu|16
+bierąc|bie=rąc|15
+boskiej|bo=skiej|15
+chałupa|cha=łu=pa|15
+chmura|chmu=ra|15
+Chodźcie|Chodź=cie|15
+chłopu|chło=pu|15
+ciemności|ciem=no=ści|15
+ciężkim|cięż=kim|15
+cudeńka|cu=deń=ka|15
+czekają|cze=ka=ją|15
+czekała|cze=ka=ła|15
+czysta|czy=sta|15
+dobrej|do=brej|15
+dobrością|do=bro=ścią|15
+dostał|do=stał|15
+drzewem|drze=wem|15
+drzwiach|drzwiach|15
+dzieuch|dzieuch|15
+dzieucha|dzieu=cha|15
+gankiem|gan=kiem|15
+gałęziami|ga=łę=zia=mi|15
+grdykę|grdy=kę|15
+grzechy|grze=chy|15
+Jagustynką|Ja=gu=styn=ką|15
+kapustę|ka=pu=stę|15
+kowalem|ko=wa=lem|15
+kromie|kro=mie|15
+krzepko|krzep=ko|15
+kulasami|ku=la=sa=mi|15
+kwiatów|kwia=tów|15
+Laboga|La=bo=ga|15
+laczego|la=cze=go|15
+maciorę|ma=cio=rę|15
+miarkując|miar=ku=jąc|15
+miedzach|mie=dzach|15
+milczenie|mil=cze=nie|15
+Muzyka|Mu=zy=ka|15
+najlepiej|naj=le=piej|15
+napity|na=pi=ty|15
+niedziele|nie=dzie=le|15
+niedługo|nie=dłu=go|15
+Niemcy|Niem=cy|15
+nigdzie|ni=g=dzie|15
+obejścia|obej=ścia|15
+odpust|od=pust|15
+ozorem|ozo=rem|15
+pacierzem|pa=cie=rzem|15
+palcami|pal=ca=mi|15
+patrzą|pa=trzą|15
+piaskiem|pia=skiem|15
+piersiach|pier=siach|15
+pociągał|po=cią=gał|15
+pogadywali|po=ga=dy=wa=li|15
+pokazał|po=ka=zał|15
+pomagał|po=ma=gał|15
+pomogło|po=mo=gło|15
+pomoże|po=mo=że|15
+porządnie|po=rząd=nie|15
+powiedają|po=wie=da=ją|15
+powiódł|po=wiódł|15
+profit|pro=fit|15
+przeciwić|prze=ciw=ić|15
+przejdzie|przej=dzie|15
+przeszła|prze=szła|15
+przyjdę|przyj=dę|15
+przykazał|przy=ka=zał|15
+przędła|przę=dła|15
+próżnicy|próż=ni=cy|15
+pustych|pu=stych|15
+północka|pół=noc=ka|15
+płaczu|pła=czu|15
+płakać|pła=kać|15
+płakała|pła=ka=ła|15
+płotami|pło=ta=mi|15
+radził|ra=dził|15
+ramionami|ra=mio=na=mi|15
+rwetes|rwe=tes|15
+rzekłem|rze=kłem|15
+sierota|sie=ro=ta|15
+sieroty|sie=ro=ty|15
+skończył|skoń=czył|15
+składowano|skła=do=wa=no|15
+spojrzała|spoj=rza=ła|15
+stając|sta=jąc|15
+staremu|sta=re=mu|15
+starsze|star=sze|15
+stojały|sto=ja=ły|15
+surowo|su=ro=wo|15
+słupach|słu=pach|15
+takiemu|ta=kie=mu|15
+tartaku|tar=ta=ku|15
+uciekł|uciekł|15
+warknęła|wark=nę=ła|15
+wełniak|weł=niak|15
+wiatru|wia=tru|15
+wpatrzony|wpa=trzo=ny|15
+wrzawa|wrza=wa|15
+wychodziła|wy=cho=dzi=ła|15
+wyciągać|wy=cią=gać|15
+wysokie|wy=so=kie|15
+zabawiali|za=ba=wia=li|15
+zabawy|za=ba=wy|15
+zabrała|za=bra=ła|15
+zachodzie|za=cho=dzie|15
+zadaszenie|za=da=sze=nie|15
+zaglądała|za=glą=da=ła|15
+zaprzeszłego|za=prze=szłe=go|15
+zdążył|zdą=żył|15
+zmiłowania|zmi=ło=wa=nia|15
+zwyczaju|zwy=cza=ju|15
+środka|środ=ka|15
+święto|świę=to|15
+alkierza|al=kie=rza|14
+baczenie|ba=cze=nie|14
+baczył|ba=czył|14
+Balcerkowa|Bal=cer=ko=wa|14
+białymi|bia=ły=mi|14
+bojała|bo=ja=ła|14
+brzega|brze=ga|14
+całych|ca=łych|14
+całymi|ca=ły=mi|14
+chodzą|cho=dzą|14
+chwiały|chwia=ły|14
+chłopakami|chło=pa=ka=mi|14
+ciekawie|cie=ka=wie|14
+ciołek|cio=łek|14
+cisnęła|ci=snę=ła|14
+cisnęły|ci=snę=ły|14
+czekali|cze=ka=li|14
+czynić|czy=nić|14
+człowiekowi|czło=wie=ko=wi|14
+dachów|da=chów|14
+dlaczego|dla=cze=go|14
+drogami|dro=ga=mi|14
+dziady|dzia=dy|14
+galanty|ga=lan=ty|14
+godnie|god=nie|14
+gorsze|gor=sze|14
+Gospodarz|Go=spo=darz|14
+gospodynią|go=spo=dy=nią|14
+gotowe|go=to=we|14
+groszy|gro=szy|14
+górnie|gór=nie|14
+gęściej|gę=ściej|14
+głodem|gło=dem|14
+innych|in=nych|14
+Jagusine|Ja=gu=si=ne|14
+jesienią|je=sie=nią|14
+jesteś|je=steś|14
+kapusty|ka=pu=sty|14
+kilkanaście|kil=ka=na=ście|14
+kobietę|ko=bie=tę|14
+krzywd|krzywd|14
+któremu|któ=re=mu|14
+kurzawa|ku=rza=wa|14
+kłótnie|kłót=nie|14
+lepsze|lep=sze|14
+liście|li=ście|14
+Loboga|Lo=bo=ga|14
+Miemcy|Miem=cy|14
+mieście|mie=ście|14
+modlił|mo=dlił|14
+mądrze|mą=drze|14
+młodych|mło=dych|14
+najbardziej|naj=bar=dziej|14
+narodowi|na=ro=do=wi|14
+Nastusi|Na=stu=si|14
+nauczał|na=uczał|14
+nawrotem|na=wro=tem|14
+niejedna|nie=jed=na|14
+niektóre|nie=któ=re|14
+nieprzytomny|nie=przy=tom=ny|14
+niesła|nie=sła|14
+odwieczerzu|od=wie=cze=rzu|14
+ogarnęła|ogar=nę=ła|14
+oglądając|oglą=da=jąc|14
+oglądał|oglą=dał|14
+oparte|opar=te|14
+ostały|osta=ły|14
+otworzył|otwo=rzył|14
+pięście|pię=ście|14
+pociekły|po=cie=kły|14
+podobno|po=dob=no|14
+pomyślał|po=my=ślał|14
+poniósł|po=niósł|14
+poruszył|po=ru=szył|14
+powietrza|po=wie=trza|14
+prawdzie|praw=dzie|14
+przebierał|prze=bie=rał|14
+przednówek|przed=nó=wek|14
+przestał|prze=stał|14
+prześmiechem|prze=śmie=chem|14
+przychodził|przy=cho=dził|14
+przycichło|przy=ci=chło|14
+przyszły|przy=szły|14
+puszczał|pusz=czał|14
+radzili|ra=dzi=li|14
+rozmyślał|roz=my=ślał|14
+rozpowiadać|roz=po=wia=dać|14
+ruszyła|ru=szy=ła|14
+ryknął|ryk=nął|14
+rzetelnie|rze=tel=nie|14
+rzewliwie|rzew=li=wie|14
+rzucić|rzu=cić|14
+senność|sen=ność|14
+siadła|sia=dła|14
+splunął|splu=nął|14
+spojrzenia|spoj=rze=nia|14
+społem|spo=łem|14
+sprzed|sprzed|14
+spytał|spy=tał|14
+srogie|sro=gie|14
+starczy|star=czy|14
+statki|stat=ki|14
+strasznym|strasz=nym|14
+szczęście|szczę=ście|14
+szczęśliwości|szczę=śli=wo=ści|14
+szkody|szko=dy|14
+słodko|słod=ko|14
+tamten|tam=ten|14
+toczyły|to=czy=ły|14
+tygodnie|ty=go=dnie|14
+tłukła|tłu=kła|14
+uciekał|ucie=kał|14
+utrudzenia|utru=dze=nia|14
+wiatrem|wia=trem|14
+wieczorami|wie=czo=ra=mi|14
+wielką|wiel=ką|14
+wlekła|wle=kła|14
+wpadła|wpa=dła|14
+wrychle|wry=chle|14
+wróciła|wró=ci=ła|14
+Wszyscy|Wszy=scy|14
+wszystką|wszyst=ką|14
+wychodzić|wy=cho=dzić|14
+wyjścia|wyj=ścia|14
+wykrzykiwał|wy=krzy=ki=wał|14
+zakręcił|za=krę=cił|14
+zapach|za=pach|14
+zapatrzona|za=pa=trzo=na|14
+zapomniała|za=po=mnia=ła|14
+zapraszał|za=pra=szał|14
+zawrócił|za=wró=cił|14
+zaśpiewały|za=śpie=wa=ły|14
+zbytnio|zbyt=nio|14
+ziarna|ziar=na|14
+zjawił|zja=wił|14
+zmiłowanie|zmi=ło=wa=nie|14
+zrobię|zro=bię|14
+zupełnie|zu=peł=nie|14
+ścierwo|ścier=wo|14
+śmiechów|śmie=chów|14
+śmiejąc|śmie=jąc|14
+święconą|świę=co=ną|14
+żeście|że=ście|14
+baczyć|ba=czyć|13
+bezustannie|bez=u=stan=nie|13
+biorąc|bio=rąc|13
+brzuch|brzuch|13
+buchnęły|buch=nę=ły|13
+bójcie|bój=cie|13
+ciasno|cia=sno|13
+ciemno|ciem=no|13
+cieniów|cie=niów|13
+ciągnęła|cią=gnę=ła|13
+ciągnęło|cią=gnę=ło|13
+ciężej|cię=żej|13
+ciężka|cięż=ka|13
+cofnął|cof=nął|13
+czerniały|czer=nia=ły|13
+czerwieniały|czer=wie=nia=ły|13
+czyniąc|czy=niąc|13
+dobrości|do=bro=ści|13
+drugiemu|dru=gie=mu|13
+dworem|dwo=rem|13
+Dzieci|Dzie=ci|13
+dziesiątkę|dzie=siąt=kę|13
+dziwno|dziw=no|13
+godzina|go=dzi=na|13
+gorzałka|go=rzał=ka|13
+gorzałką|go=rzał=ką|13
+gorące|go=rą=ce|13
+gospodarstwie|go=spo=dar=stwie|13
+grzbiet|grzbiet|13
+gęstwą|gę=stwą|13
+huczały|hu=cza=ły|13
+kijami|ki=ja=mi|13
+kolację|ko=la=cję|13
+koniom|ko=niom|13
+krzyczy|krzy=czy|13
+krótki|krót=ki|13
+książce|książ=ce|13
+kwiatem|kwia=tem|13
+lipeckich|li=pec=kich|13
+miłosierny|mi=ło=sier=ny|13
+mroków|mro=ków|13
+muzyki|mu=zy=ki|13
+najlepsze|naj=lep=sze|13
+namiętnie|na=mięt=nie|13
+nasienie|na=sie=nie|13
+niechętnie|nie=chęt=nie|13
+niedziela|nie=dzie=la|13
+niespodzianie|nie=spo=dzia=nie|13
+niestrudzenie|nie=stru=dze=nie|13
+niewymłócone|nie=wy=młó=co=ne|13
+niezgorszy|nie=zgor=szy|13
+niskie|ni=skie|13
+nocami|no=ca=mi|13
+nowina|no=wi=na|13
+obejściach|obej=ściach|13
+obejściu|obej=ściu|13
+oborze|obo=rze|13
+obrazów|ob=ra=zów|13
+odchodnym|od=chod=nym|13
+oderwać|ode=rwać|13
+odparła|od=par=ła|13
+ogromnym|ogrom=nym|13
+ogromną|ogrom=ną|13
+ojciec|oj=ciec|13
+ojcowe|oj=co=we|13
+oknach|oknach|13
+parobcy|pa=rob=cy|13
+Pańskiego|Pań=skie=go|13
+piekła|pie=kła|13
+piersiami|pier=sia=mi|13
+pochowek|po=cho=wek|13
+poganiał|po=ga=niał|13
+pomyśleć|po=my=śleć|13
+popadło|po=pa=dło|13
+poredzając|po=re=dza=jąc|13
+porwała|po=rwa=ła|13
+porządki|po=rząd=ki|13
+porządku|po=rząd=ku|13
+posypały|po=sy=pa=ły|13
+powlókł|po=wlókł|13
+przejęty|prze=ję=ty|13
+przyjechał|przy=je=chał|13
+przyodziewy|przy=odzie=wy|13
+przypiekało|przy=pie=ka=ło|13
+puścili|pu=ści=li|13
+puściła|pu=ści=ła|13
+płakał|pła=kał|13
+płotach|pło=tach|13
+płynęły|pły=nę=ły|13
+Rochem|Ro=chem|13
+rozeszli|ro=ze=szli|13
+rozlegało|roz=le=ga=ło|13
+rozmyślać|roz=my=ślać|13
+rozumiejąc|ro=zu=mie=jąc|13
+rzekli|rze=kli|13
+różnie|róż=nie|13
+samemu|sa=me=mu|13
+sennie|sen=nie|13
+Siadajcie|Sia=daj=cie|13
+siedzieć|sie=dzieć|13
+silnie|sil=nie|13
+skończy|skoń=czy|13
+smutek|smu=tek|13
+spieka|spie=ka|13
+sposobu|spo=so=bu|13
+spotkał|spo=tkał|13
+stadami|sta=da=mi|13
+strachliwie|stra=chli=wie|13
+straszne|strasz=ne|13
+strugi|stru=gi|13
+szerokie|sze=ro=kie|13
+Szymka|Szym=ka|13
+słoniny|sło=ni=ny|13
+słuchała|słu=cha=ła|13
+tartak|tar=tak|13
+trocha|tro=cha|13
+turkotał|tur=ko=tał|13
+twarzą|twa=rzą|13
+tysiące|ty=sią=ce|13
+tłumaczyła|tłu=ma=czy=ła|13
+waliła|wa=li=ła|13
+weselem|we=se=lem|13
+wiedzieli|wie=dzie=li|13
+wieprzka|wie=prz=ka|13
+wschodu|wscho=du|13
+wybuchnął|wy=buch=nął|13
+wzrokiem|wzro=kiem|13
+zaczęło|za=czę=ło|13
+zapamiętał|za=pa=mię=tał|13
+zauważyła|za=uwa=ży=ła|13
+zazdrość|za=zdrość|13
+ziarno|ziar=no|13
+zwiesny|zwie=sny|13
+zwłaszcza|zwłasz=cza|13
+zębach|zę=bach|13
+zębami|zę=ba=mi|13
+złodziej|zło=dziej|13
+złotówkę|zło=tów=kę|13
+złoście|zło=ście|13
+łakomie|ła=ko=mie|13
+ścierwa|ścier=wa|13
+śpiewać|śpie=wać|13
+światy|świa=ty|13
+świąteczne|świą=tecz=ne|13
+świętych|świę=tych|13
+żelazo|że=la=zo|13
+barłogu|bar=ło=gu|12
+beczki|becz=ki|12
+bełkotał|beł=ko=tał|12
+biedro|bie=dro|12
+będziecie|bę=dzie=cie|12
+będziemy|bę=dzie=my|12
+chcesz|chcesz|12
+chodzić|cho=dzić|12
+chytrze|chy=trze|12
+Chłopi|Chło=pi|12
+ciemnościach|ciem=no=ściach|12
+cisnął|ci=snął|12
+ciężkiej|cięż=kiej|12
+czując|czu=jąc|12
+Częstochowy|Czę=sto=cho=wy|12
+częstował|czę=sto=wał|12
+Człowiek|Czło=wiek|12
+dalekich|da=le=kich|12
+deszczu|desz=czu|12
+Dobrodziej|Do=bro=dziej|12
+domami|do=ma=mi|12
+dworowi|dwo=ro=wi|12
+dworskich|dwor=skich|12
+dziewczyn|dziew=czyn|12
+dziewka|dziew=ka|12
+dziewki|dziew=ki|12
+godzinie|go=dzi=nie|12
+gorąca|go=rą=ca|12
+gospodarzu|go=spo=da=rzu|12
+gwiazdami|gwiaz=da=mi|12
+głodny|głod=ny|12
+głucha|głu=cha|12
+głęboka|głę=bo=ka|12
+Idźcie|Idź=cie|12
+inwentarz|in=wen=tarz|12
+Jagata|Ja=ga=ta|12
+jękiem|ję=kiem|12
+kijaszkiem|ki=jasz=kiem|12
+komornice|ko=mor=ni=ce|12
+komorników|ko=mor=ni=ków|12
+koniczyny|ko=ni=czy=ny|12
+Kozioł|Ko=zioł|12
+krowie|kro=wie|12
+krwawe|krwa=we|12
+krzyczeli|krzy=cze=li|12
+krzywą|krzy=wą|12
+księdzu|księ=dzu|12
+kupować|ku=po=wać|12
+kurzawie|ku=rza=wie|12
+Lektur|Lek=tur|12
+Lektury|Lek=tu=ry|12
+ludzką|ludz=ką|12
+lśniły|lśni=ły|12
+mgnienie|mgnie=nie|12
+miedzami|mie=dza=mi|12
+Miemców|Miem=ców|12
+myśleć|my=śleć|12
+nagrzane|na=grza=ne|12
+najgłośniej|naj=gło=śniej|12
+najpierwsze|naj=pierw=sze|12
+Nastki|Na=st=ki|12
+niekajś|nie=kajś|12
+niezgorsze|nie=zgor=sze|12
+nozdrzach|noz=drzach|12
+obrządków|ob=rząd=ków|12
+oczywiście|oczy=wi=ście|12
+odmianę|od=mia=nę|12
+odpowiadała|od=po=wia=da=ła|12
+odpuście|od=pu=ście|12
+odwracając|od=wra=ca=jąc|12
+ogarniała|ogar=nia=ła|12
+okazji|oka=zji|12
+opłotków|opłot=ków|12
+orzydle|orzy=dle|12
+ostali|osta=li|12
+oszalałe|osza=la=łe|12
+otwarty|otwar=ty|12
+ołtarz|oł=tarz|12
+pacierzów|pa=cie=rzów|12
+paliły|pa=li=ły|12
+parobkami|pa=rob=ka=mi|12
+pierwszym|pierw=szym|12
+piorun|pio=run|12
+plecami|ple=ca=mi|12
+pochylił|po=chy=lił|12
+pochylone|po=chy=lo=ne|12
+pociągnął|po=cią=gnął|12
+poczęły|po=czę=ły|12
+podziwem|po=dzi=wem|12
+podłogę|pod=ło=gę|12
+pojechali|po=je=cha=li|12
+ponosiło|po=no=si=ło|12
+portkach|por=t=kach|12
+porządny|po=rząd=ny|12
+poszło|po=szło|12
+powiał|po=wiał|12
+powiedzą|po=wie=dzą|12
+powoli|po=wo=li|12
+powracał|po=wra=cał|12
+powrotu|po=wro=tu|12
+powstając|po=wsta=jąc|12
+położyła|po=ło=ży=ła|12
+pościele|po=ście=le|12
+prawić|pra=wić|12
+przeciwko|prze=ciw=ko|12
+przejść|przejść|12
+przeróżne|prze=róż=ne|12
+przychodziło|przy=cho=dzi=ło|12
+przychodziły|przy=cho=dzi=ły|12
+przygięte|przy=gię=te|12
+przyleciała|przy=le=cia=ła|12
+przystanęła|przy=sta=nę=ła|12
+ptactwo|ptac=two|12
+rozchodzić|roz=cho=dzić|12
+rozpowiadał|roz=po=wia=dał|12
+rozważał|roz=wa=żał|12
+skowronki|skow=ron=ki|12
+skręcił|skrę=cił|12
+spokoju|spo=ko=ju|12
+społecznie|spo=łecz=nie|12
+sprzedał|sprze=dał|12
+stanęły|sta=nę=ły|12
+stronami|stro=na=mi|12
+sygnaturka|sy=gna=tur=ka|12
+szykować|szy=ko=wać|12
+sąsiadów|są=sia=dów|12
+słodkim|słod=kim|12
+topole|to=po=le|12
+trzaskał|trza=skał|12
+twarzach|twa=rzach|12
+uderzył|ude=rzył|12
+uśmiechem|uśmie=chem|12
+wesołe|we=so=łe|12
+wespół|we=spół|12
+Wiater|Wia=ter|12
+wichry|wi=chry|12
+widzisz|wi=dzisz|12
+Widzisz|Wi=dzisz|12
+wieczerzy|wie=cze=rzy|12
+winowaty|wi=no=wa=ty|12
+większą|więk=szą|12
+Wolnych|Wol=nych|12
+wołali|wo=ła=li|12
+wrzasków|wrza=sków|12
+wrzało|wrza=ło|12
+wstawał|wsta=wał|12
+wstydu|wsty=du|12
+wyglądał|wy=glą=dał|12
+wyjdzie|wyj=dzie|12
+wyniesło|wy=nie=sło|12
+wynieśli|wy=nie=śli|12
+wyrozumieć|wy=ro=zu=mieć|12
+wyrwać|wy=rwać|12
+wyrzekał|wy=rze=kał|12
+wyrzekł|wy=rzekł|12
+wytrzymania|wy=trzy=ma=nia|12
+wywarła|wy=war=ła|12
+wzmagał|wzma=gał|12
+zabierając|za=bie=ra=jąc|12
+zachód|za=chód|12
+zagadywał|za=ga=dy=wał|12
+zagona|za=go=na|12
+zapadał|za=pa=dał|12
+zapaską|za=pa=ską|12
+zawziętość|za=wzię=tość|12
+zgrozy|zgro=zy|12
+zmilkła|zmil=kła|12
+zrobili|zro=bi=li|12
+zrozumieć|zro=zu=mieć|12
+zwalił|zwa=lił|12
+zwaliła|zwa=li=ła|12
+złapać|zła=pać|12
+złodzieje|zło=dzie=je|12
+śniadania|śnia=da=nia|12
+śniadanie|śnia=da=nie|12
+śpiewania|śpie=wa=nia|12
+świateł|świa=teł|12
+żałosne|ża=ło=sne|12
+Antków|Ant=ków|11
+barany|ba=ra=ny|11
+Borynowe|Bo=ry=no=we|11
+Bożego|Bo=że=go|11
+brakło|bra=kło|11
+brogiem|bro=giem|11
+brzaski|brza=ski|11
+bystro|by=stro|11
+całując|ca=łu=jąc|11
+chorągwie|cho=rą=gwie|11
+chwycił|chwy=cił|11
+chwytał|chwy=tał|11
+Chłopy|Chło=py|11
+Cichojta|Ci=choj=ta|11
+ciemna|ciem=na|11
+ciepnąć|ciep=nąć|11
+ciężarem|cię=ża=rem|11
+czerwieniły|czer=wie=ni=ły|11
+czystą|czy=stą|11
+dawała|da=wa=ła|11
+dawnego|daw=ne=go|11
+dobroci|do=bro=ci|11
+dochodził|do=cho=dził|11
+dorzuciła|do=rzu=ci=ła|11
+dygotał|dy=go=tał|11
+dziewucha|dzie=wu=cha|11
+elegancko|ele=ganc=ko|11
+gniewem|gnie=wem|11
+gniewu|gnie=wu|11
+gospodarka|go=spo=dar=ka|11
+gospodarza|go=spo=da=rza|11
+gruchnęła|gruch=nę=ła|11
+gąszczach|gąsz=czach|11
+głosami|gło=sa=mi|11
+głęboką|głę=bo=ką|11
+jajków|jaj=ków|11
+jakich|ja=kich|11
+jarzyły|ja=rzy=ły|11
+jechać|je=chać|11
+jesieni|je=sie=ni|11
+jękliwie|ję=kli=wie|11
+jęknął|jęk=nął|11
+karczmą|karcz=mą|11
+kazała|ka=za=ła|11
+kałdun|kał=dun|11
+kobietom|ko=bie=tom|11
+kochania|ko=cha=nia|11
+korale|ko=ra=le|11
+kożuchem|ko=żu=chem|11
+krzepki|krzep=ki|11
+krzyża|krzy=ża|11
+księże|księ=że|11
+kwardy|kwar=dy|11
+kwiatami|kwia=ta=mi|11
+kładły|kła=dły|11
+Kłębowej|Kłę=bo=wej|11
+ludzki|ludz=ki|11
+Macieja|Ma=cie=ja|11
+martwe|mar=twe|11
+Marysia|Ma=ry=sia|11
+medytował|me=dy=to=wał|11
+miarkować|miar=ko=wać|11
+miejscach|miej=scach|11
+modlitwę|mo=dli=twę|11
+morzył|mo=rzył|11
+możecie|mo=że=cie|11
+musiało|mu=sia=ło|11
+mówicie|mó=wi=cie|11
+młynowi|mły=no=wi|11
+najwięcej|naj=wię=cej|11
+naleźć|na=leźć|11
+naszego|na=sze=go|11
+niechcenia|nie=chce=nia|11
+niedaleko|nie=da=le=ko|11
+niemały|nie=ma=ły|11
+nieprzytomnie|nie=przy=tom=nie|11
+niewiela|nie=wie=la|11
+niewolił|nie=wo=lił|11
+nowinę|no=wi=nę|11
+obchodzić|ob=cho=dzić|11
+obcierając|ob=cie=ra=jąc|11
+obiadu|obia=du|11
+obzierając|obzie=ra=jąc|11
+odpoczywać|od=po=czy=wać|11
+odpowiedzi|od=po=wie=dzi|11
+odrobek|od=ro=bek|11
+odwróciła|od=wró=ci=ła|11
+ogniach|ogniach|11
+opowiadał|opo=wia=dał|11
+opowiadała|opo=wia=da=ła|11
+palcach|pal=cach|11
+pamiętać|pa=mię=tać|11
+pastwisk|pa=stwisk|11
+pazuchę|pa=zu=chę|11
+Pański|Pań=ski|11
+Pewnikiem|Pew=ni=kiem|11
+pilnował|pil=no=wał|11
+pluchy|plu=chy|11
+pobożne|po=boż=ne|11
+pobożnie|po=boż=nie|11
+począł|po=czął|11
+poglądał|po=glą=dał|11
+pogwary|po=gwa=ry|11
+pokoje|po=ko=je|11
+pomiarkował|po=miar=ko=wał|11
+ponieść|po=nieść|11
+poradzę|po=ra=dzę|11
+porządek|po=rzą=dek|11
+posłyszał|po=sły=szał|11
+powiedali|po=wie=da=li|11
+powiedzieli|po=wie=dzie=li|11
+powróciła|po=wró=ci=ła|11
+pozwoli|po=zwo=li|11
+połednie|po=łed=nie|11
+prawdy|praw=dy|11
+Proboszcz|Pro=boszcz|11
+przedzwonili|prze=dzwo=ni=li|11
+przemówić|prze=mó=wić|11
+przepijali|prze=pi=ja=li|11
+przeszłym|prze=szłym|11
+przynaglał|przy=na=glał|11
+przypomnienie|przy=po=mnie=nie|11
+przytajone|przy=ta=jo=ne|11
+przywarła|przy=war=ła|11
+przyzbie|przy=zbie|11
+ptaszki|ptasz=ki|11
+puścić|pu=ścić|11
+pójdziemy|pój=dzie=my|11
+płachty|płach=ty|11
+płachtę|płach=tę|11
+płaczów|pła=czów|11
+radosnym|ra=do=snym|11
+rajcowały|raj=co=wa=ły|11
+raźniej|raź=niej|11
+robotą|ro=bo=tą|11
+rodzone|ro=dzo=ne|11
+rodzony|ro=dzo=ny|11
+rolach|ro=lach|11
+rowach|ro=wach|11
+rozcież|roz=cież|11
+rozlewały|roz=le=wa=ły|11
+rozniesło|roz=nie=sło|11
+Rychtyk|Rych=tyk|11
+rzucając|rzu=ca=jąc|11
+rzucały|rzu=ca=ły|11
+rzędem|rzę=dem|11
+różnoście|róż=no=ście|11
+siedząc|sie=dząc|11
+sinych|si=nych|11
+skarżyła|skar=ży=ła|11
+skrzydła|skrzy=dła|11
+skrzypicy|skrzy=pi=cy|11
+skrzypki|skrzyp=ki|11
+skwapnie|skwap=nie|11
+sołtysem|soł=ty=sem|11
+spiekota|spie=ko=ta|11
+spodoba|spodo=ba|11
+sprawą|spra=wą|11
+starszym|star=szym|11
+stawała|sta=wa=ła|11
+stawiał|sta=wiał|11
+stodołę|sto=do=łę|11
+straszną|strasz=ną|11
+swarów|swa=rów|11
+sypały|sy=pa=ły|11
+Szymon|Szy=mon|11
+szynkwasie|szynk=wa=sie|11
+sądzie|są=dzie|11
+sąsiedzku|są=siedz=ku|11
+słodki|słod=ki|11
+tańcował|tań=co=wał|11
+trzeci|trze=ci|11
+trzymać|trzy=mać|11
+trzymała|trzy=ma=ła|11
+turbacja|tur=ba=cja|11
+turkot|tur=kot|11
+tymczasem|tym=cza=sem|11
+tłukły|tłu=kły|11
+urządzenie|urzą=dze=nie|11
+uspokajać|uspo=ka=jać|11
+wargach|war=gach|11
+wchodząc|wcho=dząc|11
+weselu|we=se=lu|11
+weszła|we=szła|11
+wichura|wi=chu=ra|11
+wielka|wiel=ka|11
+wierzcie|wierz=cie|11
+winien|wi=nien|11
+wrótnie|wrót=nie|11
+wsparłszy|wsparł=szy|11
+wspominki|wspo=min=ki|11
+wstęgi|wstę=gi|11
+wybrał|wy=brał|11
+wygnał|wy=gnał|11
+wyrywał|wy=ry=wał|11
+wyszli|wy=szli|11
+wzdychali|wzdy=cha=li|11
+wzgardliwie|wzgar=dli=wie|11
+Wójtowa|Wój=to=wa|11
+wójtowej|wój=to=wej|11
+zabawa|za=ba=wa|11
+zabrać|za=brać|11
+zaczną|za=czną|11
+zagadnęła|za=gad=nę=ła|11
+zagrały|za=gra=ły|11
+zapatrzony|za=pa=trzo=ny|11
+zapowiedzie|za=po=wie=dzie|11
+zapraszała|za=pra=sza=ła|11
+zasnął|za=snął|11
+zaszło|za=szło|11
+zatrzęsła|za=trzę=sła|11
+zatrzęsły|za=trzę=sły|11
+zebrała|ze=bra=ła|11
+zebrało|ze=bra=ło|11
+zerwała|ze=rwa=ła|11
+zgodzie|zgo=dzie|11
+zjedzą|zje=dzą|11
+zmroku|zmro=ku|11
+znajomków|zna=jom=ków|11
+znaleźć|zna=leźć|11
+zwrócił|zwró=cił|11
+ściana|ścia=na|11
+świętego|świę=te=go|11
+żałował|ża=ło=wał|11
+żałość|ża=łość|11
+Balcerek|Bal=ce=rek|10
+baldach|bal=dach|10
+biedzie|bie=dzie|10
+bokach|bo=kach|10
+bokiem|bo=kiem|10
+bratem|bra=tem|10
+bruzdach|bruz=dach|10
+brzęczały|brzę=cza=ły|10
+brzękiem|brzę=kiem|10
+chciały|chcia=ły|10
+chrzciny|chrzci=ny|10
+chórem|chó=rem|10
+Chłopaki|Chło=pa=ki|10
+chłopcy|chłop=cy|10
+chłopem|chło=pem|10
+Cichocie|Ci=cho=cie|10
+cichuśkim|ci=chuś=kim|10
+ciekły|cie=kły|10
+ciemnicy|ciem=ni=cy|10
+cienia|cie=nia|10
+ciepłe|cie=płe|10
+czarnych|czar=nych|10
+czarną|czar=ną|10
+Częstochowskiej|Czę=sto=chow=skiej|10
+dajcie|daj=cie|10
+daleki|da=le=ki|10
+deszcze|desz=cze|10
+dobrodziejem|do=bro=dzie=jem|10
+dobrych|do=brych|10
+dróżkę|dróż=kę|10
+dwojaków|dwo=ja=ków|10
+dzieuchami|dzieu=cha=mi|10
+długiej|dłu=giej|10
+Filipka|Fi=lip=ka|10
+Franek|Fra=nek|10
+gardło|gar=dło|10
+gospodarkę|go=spo=dar=kę|10
+gospodarski|go=spo=dar=ski|10
+gospodarstwa|go=spo=dar=stwa|10
+gotowego|go=to=we=go|10
+gromada|gro=ma=da|10
+gromady|gro=ma=dy|10
+grzechów|grze=chów|10
+Gulbasiak|Gul=ba=siak|10
+gąszcz|gąszcz|10
+gęstwę|gę=stwę|10
+głosować|gło=so=wać|10
+Głupia|Głu=pia|10
+huknął|huk=nął|10
+idźcie|idź=cie|10
+inszych|in=szych|10
+izbach|izbach|10
+jarmarek|jar=ma=rek|10
+jedzenie|je=dze=nie|10
+Jezusem|Je=zu=sem|10
+jąkała|ją=ka=ła|10
+jęczał|ję=czał|10
+Jędrek|Ję=drek|10
+kartofle|kar=to=fle|10
+karwas|kar=was|10
+kobietami|ko=bie=ta=mi|10
+kobietą|ko=bie=tą|10
+kokosz|ko=kosz|10
+kolebały|ko=le=ba=ły|10
+koszula|ko=szu=la|10
+koszulę|ko=szu=lę|10
+kowalowie|ko=wa=lo=wie|10
+Kozłową|Ko=zło=wą|10
+kredyt|kre=dyt|10
+krokiem|kro=kiem|10
+krzyczały|krzy=cza=ły|10
+krzycząc|krzy=cząc|10
+krzyże|krzy=że|10
+księża|księ=ża|10
+księżą|księ=żą|10
+któregoś|któ=re=goś|10
+kurzyło|ku=rzy=ło|10
+kądzielą|ką=dzie=lą|10
+leżało|le=ża=ło|10
+ludzkich|ludz=kich|10
+majaczyły|ma=ja=czy=ły|10
+mdlały|mdla=ły|10
+miałem|mia=łem|10
+miedzy|mie=dzy|10
+milczał|mil=czał|10
+morgach|mor=gach|10
+moście|mo=ście|10
+muzykę|mu=zy=kę|10
+Mówili|Mó=wi=li|10
+mądrala|mą=dra=la|10
+Młynarz|Mły=narz|10
+nadeszła|na=de=szła|10
+nadszedł|nad=szedł|10
+najlepszy|naj=lep=szy|10
+Nastką|Na=st=ką|10
+naszczekiwały|na=szcze=ki=wa=ły|10
+niemałym|nie=ma=łym|10
+nieobjęte|nie=ob=ję=te|10
+Nieprawda|Nie=praw=da|10
+nieszpory|nie=szpo=ry|10
+nowych|no=wych|10
+obcierał|ob=cie=rał|10
+Obejrzał|Obej=rzał|10
+obraza|ob=ra=za|10
+obrazami|ob=ra=za=mi|10
+odebrać|ode=brać|10
+odezwał|ode=zwał|10
+odezwała|ode=zwa=ła|10
+odpocząć|od=po=cząć|10
+odzywał|od=zy=wał|10
+ogarniając|ogar=nia=jąc|10
+ogonem|ogo=nem|10
+opadały|opa=da=ły|10
+organów|or=ga=nów|10
+osobno|osob=no|10
+pachnące|pach=ną=ce|10
+pachnący|pach=ną=cy|10
+paciorki|pa=cior=ki|10
+piasek|pia=sek|10
+pierwszych|pierw=szych|10
+Pietrkowi|Pietr=ko=wi|10
+Pietruś|Pie=truś|10
+Pietrze|Pie=trze|10
+piętnaście|pięt=na=ście|10
+pięści|pię=ści|10
+poczęli|po=czę=li|10
+poczęła|po=czę=ła|10
+podnieść|pod=nieść|10
+podobne|po=dob=ne|10
+podłodze|pod=ło=dze|10
+pogasły|po=ga=sły|10
+poglądając|po=glą=da=jąc|10
+pojedynkę|po=je=dyn=kę|10
+pokazywał|po=ka=zy=wał|10
+pokaże|po=ka=że|10
+pomiarkować|po=miar=ko=wać|10
+pomocą|po=mo=cą|10
+pomyślała|po=my=śla=ła|10
+ponuro|po=nu=ro|10
+porozchodzili|po=roz=cho=dzi=li|10
+Poszedł|Po=szedł|10
+potrzebuje|po=trze=bu=je|10
+Powiadali|Po=wia=da=li|10
+powiedz|po=wiedz|10
+powinien|po=wi=nien|10
+powstrzymać|po=wstrzy=mać|10
+procesji|pro=ce=sji|10
+przejmowała|przej=mo=wa=ła|10
+przekpinki|prze=kpin=ki|10
+przenikliwie|prze=ni=kli=wie|10
+przerażenia|prze=ra=że=nia|10
+przerwy|prze=rwy|10
+przesiaduje|prze=sia=du=je|10
+przychodziła|przy=cho=dzi=ła|10
+przyjdź|przyjdź|10
+przypołudnie|przy=po=łu=dnie|10
+przywieźli|przy=wieź=li|10
+psiachmać|psiach=mać|10
+płacić|pła=cić|10
+płakaniem|pła=ka=niem|10
+płomieniami|pło=mie=nia=mi|10
+radosne|ra=do=sne|10
+radosny|ra=do=sny|10
+radoście|ra=do=ście|10
+rozpowiadając|roz=po=wia=da=jąc|10
+rozpowiadała|roz=po=wia=da=ła|10
+rozważać|roz=wa=żać|10
+rośnie|ro=śnie|10
+rykiem|ry=kiem|10
+rymnął|rym=nął|10
+rzucili|rzu=ci=li|10
+różańca|ró=żań=ca|10
+schował|scho=wał|10
+siedziało|sie=dzia=ło|10
+Sikora|Si=ko=ra|10
+skoczyła|sko=czy=ła|10
+skończyło|skoń=czy=ło|10
+skądciś|skąd=ciś|10
+sobotę|so=bo=tę|10
+spadały|spa=da=ły|10
+spojrzeć|spoj=rzeć|10
+spostrzegł|spo=strzegł|10
+sprzeciw|sprze=ciw|10
+sprzedać|sprze=dać|10
+sprzęt|sprzęt|10
+spływały|spły=wa=ły|10
+stanęli|sta=nę=li|10
+starej|sta=rej|10
+starsi|star=si|10
+stodole|sto=do=le|10
+szarych|sza=rych|10
+szczerze|szcze=rze|10
+szeroką|sze=ro=ką|10
+szkoły|szko=ły|10
+szpitala|szpi=ta=la|10
+szumem|szu=mem|10
+słodką|słod=ką|10
+służył|słu=żył|10
+tańcowali|tań=co=wa=li|10
+tańcować|tań=co=wać|10
+Tereskę|Te=re=skę|10
+trumnę|trum=nę|10
+trzaskały|trza=ska=ły|10
+trzymają|trzy=ma=ją|10
+trzymając|trzy=ma=jąc|10
+trzymali|trzy=ma=li|10
+trzęsło|trzę=sło|10
+tuliła|tu=li=ła|10
+twarde|twar=de|10
+twardy|twar=dy|10
+uniesła|unie=sła|10
+urzędzie|urzę=dzie|10
+usiadł|usiadł|10
+uważać|uwa=żać|10
+uwierzyć|uwie=rzyć|10
+Wachnik|Wach=nik|10
+walili|wa=li=li|10
+waliły|wa=li=ły|10
+weszli|we=szli|10
+weźcie|weź=cie|10
+widniał|wid=niał|10
+widocznie|wi=docz=nie|10
+wisiał|wi=siał|10
+wnetki|wnet=ki|10
+wolność|wol=ność|10
+wozach|wo=zach|10
+wołania|wo=ła=nia|10
+wrzątku|wrząt=ku|10
+wschodzie|wscho=dzie|10
+wsparł|wsparł|10
+wstrzymał|wstrzy=mał|10
+wszelki|wszel=ki|10
+wybrany|wy=bra=ny|10
+wydzierał|wy=dzie=rał|10
+wydzierały|wy=dzie=ra=ły|10
+wyglądała|wy=glą=da=ła|10
+wyjrzała|wyj=rza=ła|10
+wyprawia|wy=pra=wia|10
+wyrabia|wy=ra=bia|10
+wyrwało|wy=rwa=ło|10
+wysoki|wy=so=ki|10
+wysunął|wy=su=nął|10
+wywarty|wy=war=ty|10
+zagadał|za=ga=dał|10
+zagonów|za=go=nów|10
+zagrała|za=gra=ła|10
+zalały|za=la=ły|10
+zapalił|za=pa=lił|10
+zapowietrzone|za=po=wie=trzo=ne|10
+zapłaci|za=pła=ci|10
+zaraza|za=ra=za|10
+zawracał|za=wra=cał|10
+zbożach|zbo=żach|10
+zbraknie|zbrak=nie|10
+zebrać|ze=brać|10
+zeźlony|ze=źlo=ny|10
+zgodnie|zgod=nie|10
+zielenią|zie=le=nią|10
+ziemiami|zie=mia=mi|10
+zważając|zwa=ża=jąc|10
+zwijała|zwi=ja=ła|10
+ścianie|ścia=nie|10
+ściągali|ścią=ga=li|10
+ślepiów|śle=piów|10
+śliczności|ślicz=no=ści|10
+śmiertelny|śmier=tel=ny|10
+śpiewali|śpie=wa=li|10
+śpiewań|śpie=wań|10
+świecił|świe=cił|10
+żałosnym|ża=ło=snym|10
+żałośliwie|ża=ło=śli=wie|10
+żegnał|że=gnał|10
+Bartka|Bart=ka|9
+białym|bia=łym|9
+bieliły|bie=li=ły|9
+bolały|bo=la=ły|9
+boleści|bo=le=ści|9
+Borynowa|Bo=ry=no=wa|9
+Borynową|Bo=ry=no=wą|9
+boskie|bo=skie|9
+bracie|bra=cie|9
+buchała|bu=cha=ła|9
+budzić|bu=dzić|9
+buzował|bu=zo=wał|9
+byłoby|by=ło=by|9
+Chciała|Chcia=ła|9
+chciałem|chcia=łem|9
+chciwie|chci=wie|9
+chmurzyska|chmu=rzy=ska|9
+Chodził|Cho=dził|9
+chusty|chu=s=ty|9
+chętliwie|chę=tli=wie|9
+chętnie|chęt=nie|9
+Chłopak|Chło=pak|9
+Cichość|Ci=chość|9
+cichych|ci=chych|9
+ciemię|cie=mię|9
+cieniami|cie=nia=mi|9
+cisnęli|ci=snę=li|9
+ciągnie|cią=gnie|9
+ciągną|cią=gną|9
+ciągotki|cią=got=ki|9
+ciężką|cięż=ką|9
+cudzego|cu=dze=go|9
+Czasem|Cza=sem|9
+Czemuż|Cze=muż|9
+czerwono|czer=wo=no|9
+czystym|czy=stym|9
+czytać|czy=tać|9
+człowiekowa|czło=wie=ko=wa|9
+dalekości|da=le=ko=ści|9
+dawnemu|daw=ne=mu|9
+dobrotliwie|do=bro=tli=wie|9
+dobrość|do=brość|9
+dojrzeć|doj=rzeć|9
+dostać|do=stać|9
+dosłyszał|do=sły=szał|9
+drewniane|drew=nia=ne|9
+drobny|drob=ny|9
+drużbowie|druż=bo=wie|9
+drzewach|drze=wach|9
+drzewinami|drze=wi=na=mi|9
+duszno|dusz=no|9
+dychać|dy=chać|9
+dziadów|dzia=dów|9
+dziękować|dzię=ko=wać|9
+długich|dłu=gich|9
+dźwigać|dźwi=gać|9
+figlów|fi=glów|9
+figury|fi=gu=ry|9
+figurą|fi=gu=rą|9
+garnki|garn=ki|9
+godzić|go=dzić|9
+gorący|go=rą=cy|9
+gospodarskie|go=spo=dar=skie|9
+gospodarsku|go=spo=dar=sku|9
+Gospodyni|Go=spo=dy=ni|9
+gotowi|go=to=wi|9
+grania|gra=nia|9
+gronta|gron=ta|9
+gruchnął|gruch=nął|9
+grzmoty|grzmo=ty|9
+głownie|głow=nie|9
+głupawy|głu=pa=wy|9
+Głupie|Głu=pie|9
+głębokie|głę=bo=kie|9
+herbatę|her=ba=tę|9
+jakbyś|jak=byś|9
+jastrząb|ja=strząb|9
+Jastrząb|Ja=strząb|9
+jednych|jed=nych|9
+jeździł|jeź=dził|9
+kapusta|ka=pu=sta|9
+klepisko|kle=pi=sko|9
+kobiece|ko=bie=ce|9
+koguty|ko=gu=ty|9
+kompanii|kom=pa=nii|9
+koniczynę|ko=ni=czy=nę|9
+kopyta|ko=py=ta|9
+kruchcie|kruch=cie|9
+krzyku|krzy=ku|9
+krzyków|krzy=ków|9
+krzywdą|krzyw=dą|9
+kudłów|ku=dłów|9
+kładła|kła=dła|9
+kłosami|kło=sa=mi|9
+Kłębiak|Kłę=biak|9
+Kłębową|Kłę=bo=wą|9
+lamenty|la=men=ty|9
+Ledwie|Le=d=wie|9
+Lipczaki|Lip=cza=ki|9
+lubości|lu=bo=ści|9
+Mateuszowi|Ma=te=uszo=wi|9
+miedzę|mie=dzę|9
+miejsc|miejsc|9
+miesiąc|mie=siąc|9
+minuty|mi=nu=ty|9
+miętko|mięt=ko|9
+miłowania|mi=ło=wa=nia|9
+modrym|mo=drym|9
+mrozie|mro=zie|9
+musiały|mu=sia=ły|9
+myślach|my=ślach|9
+myślałam|my=śla=łam|9
+mówcie|mów=cie|9
+młodzi|mło=dzi|9
+Naczelnik|Na=czel=nik|9
+naczelnika|na=czel=ni=ka|9
+naczynie|na=czy=nie|9
+nadział|na=dział|9
+nagich|na=gich|9
+nastał|na=stał|9
+Nastusią|Na=stu=sią|9
+natknął|na=tknął|9
+niechcący|nie=chcą=cy|9
+niejednego|nie=jed=ne=go|9
+niejedną|nie=jed=ną|9
+nieszczęście|nie=szczę=ście|9
+nieustępliwa|nie=ustę=pli=wa|9
+niewiele|nie=wie=le|9
+nosiła|no=si=ła|9
+nowiną|no=wi=ną|9
+obaczy|oba=czy|9
+obaczycie|oba=czy=cie|9
+obchodził|ob=cho=dził|9
+obejmując|obej=mu=jąc|9
+obejście|obej=ście|9
+obiecał|obie=cał|9
+odpowiedział|od=po=wie=dział|9
+ogarnął|ogar=nął|9
+ogrodach|ogro=dach|9
+ojcową|oj=co=wą|9
+okapem|oka=pem|9
+opowiedział|opo=wie=dział|9
+ostatka|ostat=ka|9
+ostatnich|ostat=nich|9
+otworzyć|otwo=rzyć|9
+pacierzu|pa=cie=rzu|9
+padało|pa=da=ło|9
+paskudne|pa=skud=ne|9
+Pańskie|Pań=skie|9
+piechty|piech=ty|9
+piekło|pie=kło|9
+pierwej|pier=wej|9
+piesek|pie=sek|9
+pieska|pie=ska|9
+pilnuj|pil=nuj|9
+pochwalił|po=chwa=lił|9
+pochylonych|po=chy=lo=nych|9
+pociechy|po=cie=chy|9
+poczciwy|po=czci=wy|9
+Poczekaj|Po=cze=kaj|9
+początku|po=cząt=ku|9
+podatki|po=dat=ki|9
+podała|po=da=ła|9
+podczas|pod=czas|9
+Podniesienia|Pod=nie=sie=nia|9
+podnosiło|pod=no=si=ło|9
+podobien|po=do=bien|9
+podziwu|po=dzi=wu|9
+pogadał|po=ga=dał|9
+poglądała|po=glą=da=ła|9
+pojadę|po=ja=dę|9
+pokazała|po=ka=za=ła|9
+pokoju|po=ko=ju|9
+pokryty|po=kry=ty|9
+poletę|po=le=tę|9
+pomstował|po=msto=wał|9
+popatrzeć|po=pa=trzeć|9
+popatrzył|po=pa=trzył|9
+poprzek|po=przek|9
+popłakując|po=pła=ku=jąc|9
+poradził|po=ra=dził|9
+poruszyć|po=ru=szyć|9
+postronku|po=stron=ku|9
+poszukać|po=szu=kać|9
+posłyszawszy|po=sły=szaw=szy|9
+potrzebny|po=trzeb=ny|9
+powiadam|po=wia=dam|9
+powtórzył|po=wtó=rzył|9
+poznał|po=znał|9
+prażył|pra=żył|9
+proboszcza|pro=bosz=cza|9
+procesją|pro=ce=sją|9
+prosiak|pro=siak|9
+przechodziły|prze=cho=dzi=ły|9
+przecierał|prze=cie=rał|9
+przecknęła|prze=ck=nę=ła|9
+przede|przede|9
+przegarniał|prze=gar=niał|9
+przejęte|prze=ję=te|9
+przeleciał|prze=le=ciał|9
+przemian|prze=mian|9
+przepijał|prze=pi=jał|9
+przepił|prze=pił|9
+przestając|prze=sta=jąc|9
+przestrzał|prze=strzał|9
+przeszły|prze=szły|9
+przełaj|prze=łaj|9
+przełazu|prze=ła=zu|9
+przygarnął|przy=gar=nął|9
+przyjacielstwo|przy=ja=ciel=stwo|9
+przykry|przy=kry|9
+przypomniał|przy=po=mniał|9
+przystawali|przy=sta=wa=li|9
+Próżno|Próż=no|9
+półgłosem|pół=gło=sem|9
+półkwaterki|pół=kwa=ter=ki|9
+płakania|pła=ka=nia|9
+płótna|płót=na|9
+radzić|ra=dzić|9
+rejwach|rej=wach|9
+rodzona|ro=dzo=na|9
+rosami|ro=sa=mi|9
+rozgłośniej|roz=gło=śniej|9
+rozległy|roz=le=gły|9
+rozmyślała|roz=my=śla=ła|9
+rozstajach|roz=sta=jach|9
+rychtować|rych=to=wać|9
+Rychło|Ry=chło|9
+ryczała|ry=cza=ła|9
+rzeźwe|rzeź=we|9
+rzęsisty|rzę=si=sty|9
+sercach|ser=cach|9
+sielna|siel=na|9
+siostry|sio=stry|9
+siostrą|sio=strą|9
+sięgnąć|się=gnąć|9
+skargi|skar=gi|9
+skargą|skar=gą|9
+skargę|skar=gę|9
+skwapliwie|skwa=pli=wie|9
+smutne|smut=ne|9
+smętarza|smę=ta=rza|9
+spadnie|spad=nie|9
+sparło|spar=ło|9
+spaśny|spa=śny|9
+spotkała|spo=tka=ła|9
+sprawie|spra=wie|9
+stamtąd|stam=tąd|9
+starych|sta=rych|9
+starzy|sta=rzy|9
+stawać|sta=wać|9
+stojący|sto=ją=cy|9
+Strach|Strach|9
+stracił|stra=cił|9
+straszna|strasz=na|9
+strasznego|strasz=ne=go|9
+straszny|strasz=ny|9
+stworzył|stwo=rzył|9
+stójka|stój=ka|9
+syknęła|syk=nę=ła|9
+szczekać|szcze=kać|9
+szczęściem|szczę=ściem|9
+Szczęściem|Szczę=ściem|9
+szybki|szyb=ki|9
+słowami|sło=wa=mi|9
+słońcem|słoń=cem|9
+słucha|słu=cha|9
+służbie|służ=bie|9
+słówkiem|słów=kiem|9
+tabaki|ta=ba=ki|9
+troskliwie|tro=skli=wie|9
+trzecią|trze=cią|9
+trzeszczały|trzesz=cza=ły|9
+turkotały|tur=ko=ta=ły|9
+twardym|twar=dym|9
+uciechą|ucie=chą|9
+ukradł|ukradł|9
+uniósł|uniósł|9
+ustami|usta=mi|9
+uśmiechał|uśmie=chał|9
+wchodził|wcho=dził|9
+wełniaków|weł=nia=ków|9
+wiatry|wia=try|9
+widziałem|wi=dzia=łem|9
+widzieć|wi=dzieć|9
+wieczory|wie=czo=ry|9
+wieków|wie=ków|9
+Wielki|Wiel=ki|9
+winowata|wi=no=wa=ta|9
+wlazło|wla=zło|9
+wolnelektury|wol=ne=lek=tu=ry|9
+wracał|wra=cał|9
+wrzeciono|wrze=cio=no|9
+wrzątkiem|wrząt=kiem|9
+wspierając|wspie=ra=jąc|9
+wstała|wsta=ła|9
+wstrzymać|wstrzy=mać|9
+wsunął|wsu=nął|9
+wszyćkie|wszyć=kie|9
+wtrącił|wtrą=cił|9
+wtrąciła|wtrą=ci=ła|9
+wybierać|wy=bie=rać|9
+wybierał|wy=bie=rał|9
+wyciągając|wy=cią=ga=jąc|9
+wyciągnąć|wy=cią=gnąć|9
+wyglądając|wy=glą=da=jąc|9
+wyjrzeć|wyj=rzeć|9
+wypadnie|wy=pad=nie|9
+wypominać|wy=po=mi=nać|9
+wypytywać|wy=py=ty=wać|9
+wyrobek|wy=ro=bek|9
+wyrzekania|wy=rze=ka=nia|9
+wzdychy|wzdy=chy|9
+wójtową|wój=to=wą|9
+Zaczęła|Za=czę=ła|9
+zamysły|za=my=sły|9
+zaniesła|za=nie=sła|9
+zapadła|za=pa=dła|9
+zapalczywie|za=pal=czy=wie|9
+zapłacę|za=pła=cę|9
+zapłakała|za=pła=ka=ła|9
+zaradzić|za=ra=dzić|9
+zazierać|za=zie=rać|9
+zbiera|zbie=ra|9
+zdumieniem|zdu=mie=niem|9
+zdumieniu|zdu=mie=niu|9
+zdumiony|zdu=mio=ny|9
+zeszło|ze=szło|9
+zeźlił|ze=źlił|9
+zieleni|zie=le=ni|9
+ziemniakami|ziem=nia=ka=mi|9
+zmówiny|zmó=wi=ny|9
+został|zo=stał|9
+zuchwale|zu=chwa=le|9
+zwarli|zwar=li|9
+zwiesnowy|zwie=sno=wy|9
+zwykle|zwy=kle|9
+złośliwie|zło=śli=wie|9
+łajdus|łaj=dus|9
+ławach|ła=wach|9
+łaziły|ła=zi=ły|9
+śmiało|śmia=ło|9
+śmiech|śmiech|9
+śmignął|śmi=gnął|9
+śpieszył|śpie=szył|9
+śpiewając|śpie=wa=jąc|9
+światłości|świa=tło=ści|9
+święcie|świę=cie|9
+żegnając|że=gna=jąc|9
+żółtych|żół=tych|9
+Alleluja|Al=le=lu=ja|8
+Antkową|Ant=ko=wą|8
+bacznie|bacz=nie|8
+batami|ba=ta=mi|8
+biczem|bi=czem|8
+biedoto|bie=do=to|8
+biegła|bie=gła|8
+broniąc|bro=niąc|8
+brzaskach|brza=skach|8
+brzucho|brzu=cho|8
+bydlątka|by=dląt=ka|8
+błocko|błoc=ko|8
+całunki|ca=łun=ki|8
+chwiał|chwiał|8
+chyciła|chy=ci=ła|8
+chłodzie|chło=dzie|8
+ciepłem|cie=płem|8
+ciepłych|cie=płych|8
+ciągał|cią=gał|8
+ciężkich|cięż=kich|8
+czajki|czaj=ki|8
+czapki|czap=ki|8
+Czekaj|Cze=kaj|8
+czerwonym|czer=wo=nym|8
+czerwonymi|czer=wo=ny=mi|8
+czwartek|czwar=tek|8
+czyniła|czy=ni=ła|8
+dachem|da=chem|8
+dawnej|daw=nej|8
+dawniej|daw=niej|8
+deszczem|desz=czem|8
+Dobranoc|Do=bra=noc|8
+Dołach|Do=łach|8
+druhny|druh=ny|8
+dysząc|dy=sząc|8
+dzieciak|dzie=ciak|8
+dzieciątka|dzie=ciąt=ka|8
+dziedzice|dzie=dzi=ce|8
+dziedzicowi|dzie=dzi=co=wi|8
+dziedziczka|dzie=dzicz=ka|8
+dziedziców|dzie=dzi=ców|8
+dziesięciu|dzie=się=ciu|8
+dziewkę|dziew=kę|8
+dzikim|dzi=kim|8
+dziwny|dziw=ny|8
+dziwował|dzi=wo=wał|8
+dzwonił|dzwo=nił|8
+Dębicy|Dę=bi=cy|8
+dłonią|dło=nią|8
+garnków|garn=ków|8
+godzinami|go=dzi=na=mi|8
+gorączkowo|go=rącz=ko=wo|8
+gospodarce|go=spo=dar=ce|8
+gołymi|go=ły=mi|8
+goście|go=ście|8
+granatowe|gra=na=to=we|8
+gryzły|gry=zły|8
+Grzelą|Grze=lą|8
+gwarno|gwar=no|8
+gwiazd|gwiazd|8
+gwiazda|gwiaz=da|8
+głuchym|głu=chym|8
+huczała|hu=cza=ła|8
+huczało|hu=cza=ło|8
+Jeszczech|Jesz=czech|8
+Jezusowi|Je=zu=so=wi|8
+jęczała|ję=cza=ła|8
+jęczmiona|jęcz=mio=na|8
+kamieni|ka=mie=ni|8
+kamionki|ka=mion=ki|8
+kieliszki|kie=lisz=ki|8
+kluski|klu=ski|8
+kobiecie|ko=bie=cie|8
+Kobusowa|Ko=bu=so=wa|8
+Kozłów|Ko=złów|8
+kołtuny|koł=tu=ny|8
+kościach|ko=ściach|8
+krajach|kra=jach|8
+krwawym|krwa=wym|8
+krzyżów|krzy=żów|8
+książką|książ=ką|8
+Księżyc|Księ=życ|8
+Któren|Któ=ren|8
+kulasów|ku=la=sów|8
+kupami|ku=pa=mi|8
+kupili|ku=pi=li|8
+kwikiem|kwi=kiem|8
+kłopot|kło=pot|8
+kłócić|kłó=cić|8
+latała|la=ta=ła|8
+ludzkiej|ludz=kiej|8
+maciory|ma=cio=ry|8
+miarkuję|miar=ku=ję|8
+mieniło|mie=ni=ło|8
+mierziło|mier=zi=ło|8
+migotały|mi=go=ta=ły|8
+Milczeli|Mil=cze=li|8
+miodem|mio=dem|8
+miłosierdzia|mi=ło=sier=dzia|8
+miłosierdzie|mi=ło=sier=dzie|8
+mlekiem|mle=kiem|8
+mniejsze|mniej=sze|8
+Moiście|Mo=iście|8
+myśleli|my=śle=li|8
+mówiłem|mó=wi=łem|8
+mówiły|mó=wi=ły|8
+młynarzowa|mły=na=rzo=wa|8
+młynicy|mły=ni=cy|8
+nabierał|na=bie=rał|8
+nabrane|na=bra=ne|8
+naciskiem|na=ci=skiem|8
+najpierw|naj=pierw|8
+największy|naj=więk=szy|8
+namawiał|na=ma=wiał|8
+narządziła|na=rzą=dzi=ła|8
+Nastkę|Na=st=kę|8
+naszej|na=szej|8
+naszemu|na=sze=mu|8
+nasłuchiwała|na=słu=chi=wa=ła|8
+Nazajutrz|Na=za=jutrz|8
+niebem|nie=bem|8
+niecierpliwiej|nie=cier=pli=wiej|8
+niedawno|nie=daw=no|8
+niedziel|nie=dziel|8
+niepokój|nie=po=kój|8
+nieznacznie|nie=znacz=nie|8
+nijakiego|ni=ja=kie=go|8
+nijako|ni=ja=ko|8
+nikogój|ni=ko=gój|8
+obaczę|oba=czę|8
+obcych|ob=cych|8
+objęła|ob=ję=ła|8
+obleczenie|ob=le=cze=nie|8
+obronie|obro=nie|8
+obronę|obro=nę|8
+obzierał|obzie=rał|8
+ochoty|ocho=ty|8
+odburknął|od=burk=nął|8
+odparł|od=parł|8
+opadał|opa=dał|8
+opiekę|opie=kę|8
+Organista|Or=ga=ni=sta|8
+ostawił|osta=wił|8
+Ostańcie|Ostań=cie|8
+pachniało|pach=nia=ło|8
+pachnącym|pach=ną=cym|8
+palące|pa=lą=ce|8
+papiery|pa=pie=ry|8
+parafii|pa=ra=fii|8
+parobku|pa=rob=ku|8
+patrzyły|pa=trzy=ły|8
+pełnymi|peł=ny=mi|8
+piasku|pia=sku|8
+pieniądz|pie=niądz|8
+pierwsi|pierw=si|8
+piorunami|pio=ru=na=mi|8
+Pisarz|Pi=sarz|8
+pisarza|pi=sa=rza|8
+pięćdziesiąt|pięć=dzie=siąt|8
+placek|pla=cek|8
+placka|plac=ka|8
+plucha|plu=cha|8
+pobiegł|po=biegł|8
+pochwalony|po=chwa=lo=ny|8
+pochylał|po=chy=lał|8
+pociemniało|po=ciem=nia=ło|8
+poczciwe|po=czci=we|8
+poczciwości|po=czci=wo=ści|8
+poczekać|po=cze=kać|8
+poczerniałe|po=czer=nia=łe|8
+podając|po=da=jąc|8
+podniosły|pod=nio=sły|8
+podoba|po=do=ba|8
+podsunął|pod=su=nął|8
+poglądali|po=glą=da=li|8
+pogrzeb|po=grzeb|8
+pokrzyki|po=krzy=ki|8
+pokrzykując|po=krzy=ku=jąc|8
+polecę|po=le=cę|8
+Polska|Pol=ska|8
+pomogę|po=mo=gę|8
+pomsty|po=msty|8
+ponosi|po=no=si|8
+poratunku|po=ra=tun=ku|8
+poredzali|po=re=dza=li|8
+porwały|po=rwa=ły|8
+Poszli|Po=szli|8
+Poszła|Po=szła|8
+posłuchać|po=słu=chać|8
+potężnie|po=tęż=nie|8
+powiadacie|po=wia=da=cie|8
+powiecie|po=wie=cie|8
+Powiem|Po=wiem|8
+powodu|po=wo=du|8
+powrocie|po=wro=cie|8
+powstrzymując|po=wstrzy=mu=jąc|8
+powtarzał|po=wta=rzał|8
+powtarzała|po=wta=rza=ła|8
+poznać|po=znać|8
+pozwolą|po=zwo=lą|8
+połednia|po=łed=nia|8
+położył|po=ło=żył|8
+połyskiwały|po=ły=ski=wa=ły|8
+Prawie|Pra=wie|8
+procesja|pro=ce=sja|8
+prosili|pro=si=li|8
+prostował|pro=sto=wał|8
+przechwalał|prze=chwa=lał|8
+przecknął|prze=ck=nął|8
+przedzierał|prze=dzie=rał|8
+przedzwaniali|prze=dzwa=nia=li|8
+przejmujący|przej=mu=ją=cy|8
+przejęła|prze=ję=ła|8
+przekąsem|prze=ką=sem|8
+przemóc|prze=móc|8
+przenieść|prze=nieść|8
+przepadł|prze=padł|8
+przepuszczając|prze=pusz=cza=jąc|8
+przerwała|prze=rwa=ła|8
+przeszli|prze=szli|8
+przewalał|prze=wa=lał|8
+przewiady|prze=wia=dy|8
+przełazie|prze=ła=zie|8
+przygotowań|przy=go=to=wań|8
+przyjacielsko|przy=ja=ciel=sko|8
+przymrozek|przy=mro=zek|8
+przypilnuję|przy=pil=nu=ję|8
+przypominki|przy=po=min=ki|8
+przystąpił|przy=stą=pił|8
+przysunął|przy=su=nął|8
+Przyszedł|Przy=szedł|8
+przysłaniały|przy=sła=nia=ły|8
+przywarte|przy=war=te|8
+przywierając|przy=wie=ra=jąc|8
+przyźbie|przy=źbie|8
+próbował|pró=bo=wał|8
+psiekrwie|psie=kr=wie|8
+ptaków|pta=ków|8
+pustym|pu=stym|8
+puszczając|pusz=cza=jąc|8
+puszył|pu=szył|8
+płaczliwie|płacz=li=wie|8
+płomieniem|pło=mie=niem|8
+Płoszków|Płosz=ków|8
+raptem|rap=tem|8
+robiły|ro=bi=ły|8
+rozebrać|ro=ze=brać|8
+rozmawiać|roz=ma=wiać|8
+roznosił|roz=no=sił|8
+rozpacznie|roz=pacz=nie|8
+rozpierała|roz=pie=ra=ła|8
+rozpytywać|roz=py=ty=wać|8
+rozumiała|ro=zu=mia=ła|8
+ruchał|ru=chał|8
+Rzekliście|Rze=kli=ście|8
+rządzi|rzą=dzi|8
+róbcie|rób=cie|8
+różaniec|ró=ża=niec|8
+samotne|sa=mot=ne|8
+samotnie|sa=mot=nie|8
+serdecznym|ser=decz=nym|8
+siarczyste|siar=czy=ste|8
+Siedział|Sie=dział|8
+Siedzieli|Sie=dzie=li|8
+sielne|siel=ne|8
+Sielny|Siel=ny|8
+sienie|sie=nie|8
+sięgał|się=gał|8
+skrzybot|skrzy=bot|8
+skrzypiały|skrzy=pia=ły|8
+smutna|smut=na|8
+spadły|spa=dły|8
+sposobną|spo=sob=ną|8
+spostrzegli|spo=strze=gli|8
+spuścić|spu=ścić|8
+srogiej|sro=giej|8
+srożył|sro=żył|8
+stawały|sta=wa=ły|8
+stojało|sto=ja=ło|8
+Strasznie|Strasz=nie|8
+straszno|strasz=no|8
+strażniki|straż=ni=ki|8
+stróżował|stró=żo=wał|8
+szczeka|szcze=ka|8
+szeroki|sze=ro=ki|8
+szkopek|szko=pek|8
+szkoła|szko=ła|8
+szkołach|szko=łach|8
+szukając|szu=ka=jąc|8
+szukały|szu=ka=ły|8
+szumiały|szu=mia=ły|8
+szybach|szy=bach|8
+słuchaj|słu=chaj|8
+słyszeli|sły=sze=li|8
+taczki|tacz=ki|8
+tknęło|tknę=ło|8
+tocząc|to=cząc|8
+topieli|to=pie=li|8
+topolami|to=po=la=mi|8
+torbeczki|tor=becz=ki|8
+trafił|tra=fił|8
+trupem|tru=pem|8
+Trzeba|Trze=ba|8
+trzeciego|trze=cie=go|8
+trzymam|trzy=mam|8
+tupoty|tu=po=ty|8
+turbacje|tur=ba=cje|8
+turkoty|tur=ko=ty|8
+tęskliwie|tę=skli=wie|8
+tłukąc|tłu=kąc|8
+tłukło|tłu=kło|8
+tłusto|tłu=sto|8
+urwała|urwa=ła|8
+uspokoić|uspo=ko=ić|8
+uspokoiło|uspo=ko=iło|8
+uszach|uszach|8
+utrzymać|utrzy=mać|8
+wagować|wa=go=wać|8
+westchnieniem|wes=tchnie=niem|8
+wetknęła|we=tknę=ła|8
+widziałam|wi=dzia=łam|8
+wierzył|wie=rzył|8
+wietrze|wie=trze|8
+Wilczych|Wil=czych|8
+wilgotny|wil=got=ny|8
+wionął|wio=nął|8
+wiosenny|wio=sen=ny|8
+wisiała|wi=sia=ła|8
+wiszące|wi=szą=ce|8
+wlekąc|wle=kąc|8
+wnątrzu|wną=trzu|8
+wodziła|wo=dzi=ła|8
+Wojtek|Woj=tek|8
+wracali|wra=ca=li|8
+wrzeciona|wrze=cio=na|8
+wsparła|wspar=ła|8
+wspomożenie|wspo=mo=że=nie|8
+wszelaki|wsze=la=ki|8
+wszyćkim|wszyć=kim|8
+wtykał|wty=kał|8
+wybrane|wy=bra=ne|8
+wychodząc|wy=cho=dząc|8
+wyciągały|wy=cią=ga=ły|8
+wyciągnęła|wy=cią=gnę=ła|8
+wyganiać|wy=ga=niać|8
+wyjściu|wyj=ściu|8
+wyniośle|wy=nio=śle|8
+wypominał|wy=po=mi=nał|8
+wypominki|wy=po=min=ki|8
+wyprostował|wy=pro=sto=wał|8
+wystąpił|wy=stą=pił|8
+wytrząchając|wy=trzą=cha=jąc|8
+wzdychała|wzdy=cha=ła|8
+wątpiach|wąt=piach|8
+wściekły|wście=kły|8
+zabaczyć|za=ba=czyć|8
+zabawę|za=ba=wę|8
+zabiega|za=bie=ga|8
+zacinał|za=ci=nał|8
+zaczynać|za=czy=nać|8
+Zaczęli|Za=czę=li|8
+zaglądając|za=glą=da=jąc|8
+zakotłowało|za=ko=tło=wa=ło|8
+zakończył|za=koń=czył|8
+zaledwie|za=le=d=wie|8
+zamieszanie|za=mie=sza=nie|8
+zapaski|za=pa=ski|8
+zapatrzyła|za=pa=trzy=ła|8
+zapierało|za=pie=ra=ło|8
+zapisał|za=pi=sał|8
+zapowietrzona|za=po=wie=trzo=na|8
+zatracenie|za=tra=ce=nie|8
+zawiewał|za=wie=wał|8
+zazierając|za=zie=ra=jąc|8
+zazwyczaj|za=zwy=czaj|8
+zgrozą|zgro=zą|8
+zjedli|zje=dli|8
+zmyślnie|zmyśl=nie|8
+znalazł|zna=lazł|8
+zresztą|zresz=tą|8
+zrobią|zro=bią|8
+zrywać|zry=wać|8
+zwierz|zwierz|8
+zwiesną|zwie=sną|8
+zziajany|zzia=ja=ny|8
+łagodnie|ła=god=nie|8
+Ścierwy|Ścier=wy|8
+ściągać|ścią=gać|8
+śmiały|śmia=ły|8
+środek|śro=dek|8
+świadków|świad=ków|8
+Święty|Świę=ty|8
+żadnego|żad=ne=go|8
+żałosny|ża=ło=sny|8
+żałoście|ża=ło=ście|8
+żołnierka|żoł=nier=ka|8
+żółciły|żół=ci=ły|8
+akurat|aku=rat|7
+alkierz|al=kierz|7
+Antkowa|Ant=ko=wa|7
+baczyła|ba=czy=ła|7
+bawiły|ba=wi=ły|7
+bezmyślnie|bez=myśl=nie|7
+białawe|bia=ła=we|7
+białej|bia=łej|7
+biedoty|bie=do=ty|7
+bielały|bie=la=ły|7
+bladym|bla=dym|7
+bogacz|bo=gacz|7
+bolesny|bo=le=sny|7
+borgować|bor=go=wać|7
+brakuje|bra=ku=je|7
+bruzdami|bruz=da=mi|7
+brzasków|brza=sków|7
+brzegi|brze=gi|7
+brzozy|brzo=zy|7
+budynki|bu=dyn=ki|7
+budził|bu=dził|7
+błogosławił|bło=go=sła=wił|7
+błotem|bło=tem|7
+błyskawice|bły=ska=wi=ce|7
+chceta|chce=ta|7
+chleby|chle=by|7
+chlewów|chle=wów|7
+chlustały|chlu=sta=ły|7
+chmurny|chmur=ny|7
+chodźcie|chodź=cie|7
+chojary|cho=ja=ry|7
+choroba|cho=ro=ba|7
+choroby|cho=ro=by|7
+Choćby|Choć=by|7
+chudziaku|chu=dzia=ku|7
+chwycić|chwy=cić|7
+ciasto|cia=sto|7
+cichej|ci=chej|7
+cichoj|ci=choj|7
+cichością|ci=cho=ścią|7
+ciekawe|cie=ka=we|7
+ciemne|ciem=ne|7
+ciepał|cie=pał|7
+ciesząc|cie=sząc|7
+ciągiem|cią=giem|7
+cofnęła|cof=nę=ła|7
+cudności|cud=no=ści|7
+czerwonej|czer=wo=nej|7
+czterdzieści|czter=dzie=ści|7
+Cztery|Czte=ry|7
+czubami|czu=ba=mi|7
+czyniło|czy=ni=ło|7
+czystej|czy=stej|7
+człowieczą|czło=wie=czą|7
+daleką|da=le=ką|7
+dalszych|dal=szych|7
+deszczów|desz=czów|7
+dniach|dniach|7
+dochodziły|do=cho=dzi=ły|7
+dostaniesz|do=sta=niesz|7
+dostała|do=sta=ła|7
+doszedł|do=szedł|7
+dowiedzieć|do=wie=dzieć|7
+dołkach|doł=kach|7
+dołożę|do=ło=żę|7
+drabiny|dra=bi=ny|7
+drzewin|drze=win|7
+dufności|duf=no=ści|7
+duszach|du=szach|7
+dziada|dzia=da|7
+dzieckiem|dziec=kiem|7
+dzikie|dzi=kie|7
+dzwonki|dzwon=ki|7
+długości|dłu=go=ści|7
+flachę|fla=chę|7
+flaszkę|flasz=kę|7
+gadali|ga=da=li|7
+gadała|ga=da=ła|7
+garściach|gar=ściach|7
+gmerały|gme=ra=ły|7
+gniazd|gniazd|7
+gniewy|gnie=wy|7
+gorzkie|gorz=kie|7
+gorączce|go=rącz=ce|7
+gospodarzem|go=spo=da=rzem|7
+gospodarzom|go=spo=da=rzom|7
+Gospodarzu|Go=spo=da=rzu|7
+gotowane|go=to=wa=ne|7
+Gołębianka|Go=łę=bian=ka|7
+gołębie|go=łę=bie|7
+grubym|gru=bym|7
+gwarzyć|gwa=rzyć|7
+głębiej|głę=biej|7
+głęboki|głę=bo=ki|7
+głębokiej|głę=bo=kiej|7
+innymi|in=ny=mi|7
+intencję|in=ten=cję|7
+jadłem|ja=dłem|7
+jakbym|jak=bym|7
+jakichś|ja=kichś|7
+Jambrożym|Jam=bro=żym|7
+jamory|ja=mo=ry|7
+jarzącymi|ja=rzą=cy=mi|7
+Jasiem|Ja=siem|7
+jasnym|ja=snym|7
+jechał|je=chał|7
+jenszy|jen=szy|7
+Jezusowe|Je=zu=so=we|7
+kajdany|kaj=da=ny|7
+katolickim|ka=to=lic=kim|7
+Każden|Każ=den|7
+kiecki|kiec=ki|7
+kiejście|kiej=ście|7
+klaczy|kla=czy|7
+kogutka|ko=gut=ka|7
+kopania|ko=pa=nia|7
+kopytami|ko=py=ta=mi|7
+korali|ko=ra=li|7
+kołowały|ko=ło=wa=ły|7
+kołysał|ko=ły=sał|7
+kołysały|ko=ły=sa=ły|7
+kończyna|koń=czy=na|7
+krajów|kra=jów|7
+krzami|krza=mi|7
+krzyknąć|krzyk=nąć|7
+krótką|krót=ką|7
+książkę|książ=kę|7
+księżego|księ=że=go|7
+Któregoś|Któ=re=goś|7
+kurzawą|ku=rza=wą|7
+kurzył|ku=rzył|7
+kwiatach|kwia=tach|7
+kądzieli|ką=dzie=li|7
+kłonicą|kło=ni=cą|7
+kłosów|kło=sów|7
+lecieli|le=cie=li|7
+lekciej|lek=ciej|7
+litanię|li=ta=nię|7
+lśniące|lśnią=ce|7
+marnego|mar=ne=go|7
+martwy|mar=twy|7
+matczyne|mat=czy=ne|7
+matula|ma=tu=la|7
+miarkujecie|miar=ku=je=cie|7
+miedzą|mie=dzą|7
+Miemce|Miem=ce|7
+minucie|mi=nu=cie|7
+minutę|mi=nu=tę|7
+miotał|mio=tał|7
+mocarz|mo=carz|7
+molestować|mo=le=sto=wać|7
+motyle|mo=ty=le|7
+możesz|mo=żesz|7
+mroczało|mro=cza=ło|7
+myślałem|my=śla=łem|7
+mógłby|mógł=by|7
+młodego|mło=de=go|7
+młodszy|młod=szy|7
+młynarzem|mły=na=rzem|7
+młynarzowego|mły=na=rzo=we=go|7
+młynarzów|mły=na=rzów|7
+nabrzmiałe|na=brzmia=łe|7
+nadzieją|na=dzie=ją|7
+Najpierw|Naj=pierw|7
+najpierwsi|naj=pierw=si|7
+nalazł|na=lazł|7
+namawiać|na=ma=wiać|7
+nasienia|na=sie=nia|7
+naszło|na=szło|7
+natomiast|na=to=miast|7
+niebieskie|nie=bie=skie|7
+nieboszczyka|nie=bosz=czy=ka|7
+niechaj|nie=chaj|7
+Niechby|Niech=by|7
+niektórzy|nie=któ=rzy|7
+niemałą|nie=ma=łą|7
+nienawiścią|nie=na=wi=ścią|7
+niesło|nie=sło|7
+Niewiela|Nie=wie=la|7
+nosili|no=si=li|7
+nowiny|no=wi=ny|7
+obcasami|ob=ca=sa=mi|7
+obertelek|obe=r=te=lek|7
+oberwać|obe=rwać|7
+obficie|ob=fi=cie|7
+obiecywał|obie=cy=wał|7
+obsiadły|ob=sia=dły|7
+ochotę|ocho=tę|7
+odchodzi|od=cho=dzi|7
+odchodził|od=cho=dził|7
+odchodząc|od=cho=dząc|7
+odetchnąć|ode=tchnąć|7
+odpowiedziała|od=po=wie=dzia=ła|7
+odzipnąć|od=zip=nąć|7
+oglądali|oglą=da=li|7
+ogniska|ogni=ska|7
+ogrodu|ogro=du|7
+ogrody|ogro=dy|7
+ogromnych|ogrom=nych|7
+opuszczenie|opusz=cze=nie|7
+opłatek|opła=tek|7
+opłotkami|opłot=ka=mi|7
+ostatnia|ostat=nia|7
+ostawał|osta=wał|7
+ostawiając|osta=wia=jąc|7
+ostawiła|osta=wi=ła|7
+ozorami|ozo=ra=mi|7
+ołtarze|oł=ta=rze|7
+pachnie|pach=nie|7
+padnie|pad=nie|7
+panowie|pa=no=wie|7
+paradą|pa=ra=dą|7
+Parobek|Pa=ro=bek|7
+patrzę|pa=trzę|7
+pazurów|pa=zu=rów|7
+Pańskiej|Pań=skiej|7
+pedzieć|pe=dzieć|7
+pełnej|peł=nej|7
+pełnym|peł=nym|7
+piesków|pie=sków|7
+pieśnią|pie=śnią|7
+Pijcie|Pij=cie|7
+pilnowała|pil=no=wa=ła|7
+pioruny|pio=ru=ny|7
+piosneczki|pio=snecz=ki|7
+piskiem|pi=skiem|7
+piąciu|pią=ciu|7
+plebanią|ple=ba=nią|7
+pluchę|plu=chę|7
+pobożny|po=boż=ny|7
+pochylały|po=chy=la=ły|7
+poczekaj|po=cze=kaj|7
+poczerwieniała|po=czer=wie=nia=ła|7
+pocznę|po=cznę|7
+podawać|po=da=wać|7
+podjął|pod=jął|7
+podnieśli|pod=nie=śli|7
+podobnie|po=dob=nie|7
+podobny|po=dob=ny|7
+podziw|po=dziw|7
+pogadując|po=ga=du=jąc|7
+pognała|po=gna=ła|7
+pojmować|poj=mo=wać|7
+pokazać|po=ka=zać|7
+pokojach|po=ko=jach|7
+Pokrótce|Po=krót=ce|7
+pokręciło|po=krę=ci=ło|7
+Poleciała|Po=le=cia=ła|7
+pomaga|po=ma=ga|7
+pomagała|po=ma=ga=ła|7
+pomstą|po=mstą|7
+pomyślenie|po=my=śle=nie|7
+pomógł|po=mógł|7
+pomówić|po=mó=wić|7
+poniesie|po=nie=sie|7
+poniesą|po=nie=są|7
+popijał|po=pi=jał|7
+poprawił|po=pra=wił|7
+popuszczę|po=pusz=czę|7
+poredzać|po=re=dzać|7
+poredzą|po=re=dzą|7
+poruszać|po=ru=szać|7
+porządków|po=rząd=ków|7
+poręby|po=rę=by|7
+porębę|po=rę=bę|7
+pospólnie|po=spól=nie|7
+postać|po=stać|7
+postronek|po=stro=nek|7
+posłuch|po=słuch|7
+posłyszeć|po=sły=szeć|7
+potaczał|po=ta=czał|7
+potrafi|po=tra=fi|7
+potrzeby|po=trze=by|7
+powiadać|po=wia=dać|7
+powiatu|po=wia=tu|7
+powiedam|po=wie=dam|7
+Powiedział|Po=wie=dział|7
+powraca|po=wra=ca|7
+powrócą|po=wró=cą|7
+powywierane|po=wy=wie=ra=ne|7
+pozostał|po=zo=stał|7
+pozwolić|po=zwo=lić|7
+połowa|po=ło=wa|7
+pośmiewisko|po=śmie=wi=sko|7
+pracował|pra=co=wał|7
+prosiaki|pro=sia=ki|7
+proszę|pro=szę|7
+prowadził|pro=wa=dził|7
+przechodziła|prze=cho=dzi=ła|7
+przedać|przedać|7
+przejmujące|przej=mu=ją=ce|7
+przejęły|prze=ję=ły|7
+przekpiwał|prze=kpi=wał|7
+przekładać|prze=kła=dać|7
+przenikał|prze=ni=kał|7
+przepijając|prze=pi=ja=jąc|7
+przestanku|prze=stan=ku|7
+Przeszedł|Prze=szedł|7
+przewiny|prze=wi=ny|7
+przewodził|prze=wo=dził|7
+przełaz|prze=łaz|7
+prześmiech|prze=śmiech|7
+przychodzą|przy=cho=dzą|7
+przychodź|przy=chodź|7
+przyczajone|przy=cza=jo=ne|7
+przydrożne|przy=droż=ne|7
+przyginały|przy=gi=na=ły|7
+przyglądał|przy=glą=dał|7
+Przyjdę|Przyj=dę|7
+przyjedzie|przy=je=dzie|7
+przynieść|przy=nieść|7
+przyobiecał|przy=obie=cał|7
+przypominając|przy=po=mi=na=jąc|7
+przysiedli|przy=sie=dli|7
+przysiąść|przy=siąść|7
+przyszedłem|przy=sze=dłem|7
+przywieść|przy=wieść|7
+przywiózł|przy=wiózł|7
+przyzba|przy=zba|7
+przyśpiewując|przy=śpie=wu=jąc|7
+próbowała|pró=bo=wa=ła|7
+Psiachmać|Psiach=mać|7
+ptactwa|ptac=twa|7
+ptasie|pta=sie|7
+płachta|płach=ta|7
+pławiły|pła=wi=ły|7
+płomienie|pło=mie=nie|7
+płomień|pło=mień|7
+radosną|ra=do=sną|7
+ratunek|ra=tu=nek|7
+rejenta|re=jen=ta|7
+robicie|ro=bi=cie|7
+robili|ro=bi=li|7
+robotny|ro=bot=ny|7
+rosach|ro=sach|7
+rozbierała|roz=bie=ra=ła|7
+rozbłysły|roz=bły=sły|7
+rozebrało|ro=ze=bra=ło|7
+rozgorzały|roz=go=rza=ły|7
+rozniesły|roz=nie=sły|7
+rozpalonymi|roz=pa=lo=ny=mi|7
+rozpiera|roz=pie=ra|7
+rozpoznał|roz=po=znał|7
+rozrosłe|roz=ro=słe|7
+rozumiał|ro=zu=miał|7
+rozumieć|ro=zu=mieć|7
+rozważając|roz=wa=ża=jąc|7
+rozłożył|roz=ło=żył|7
+ruszyły|ru=szy=ły|7
+Rzekłem|Rze=kłem|7
+Rzepek|Rze=pek|7
+rzęsiście|rzę=si=ście|7
+różańcem|ró=żań=cem|7
+samymi|sa=my=mi|7
+serdecznej|ser=decz=nej|7
+serdeczny|ser=decz=ny|7
+siadając|sia=da=jąc|7
+siekierą|sie=kie=rą|7
+Sikorzyna|Si=ko=rzy=na|7
+skraju|skra=ju|7
+skrzat|skrzat|7
+skrzyczał|skrzy=czał|7
+skrzypiał|skrzy=piał|7
+skrzypice|skrzy=pi=ce|7
+smętarzu|smę=ta=rzu|7
+snopki|snop=ki|7
+Sochowa|So=cho=wa|7
+sołtysa|soł=ty=sa|7
+spieki|spie=ki|7
+spodział|spo=dział|7
+spodziewając|spo=dzie=wa=jąc|7
+spojrzeniem|spoj=rze=niem|7
+spojrzy|spoj=rzy|7
+spostrzegając|spo=strze=ga=jąc|7
+spozierał|spo=zie=rał|7
+srebrne|srebr=ne|7
+srogich|sro=gich|7
+Stacha|Sta=cha|7
+stadko|stad=ko|7
+stawali|sta=wa=li|7
+stojali|sto=ja=li|7
+stojącą|sto=ją=cą|7
+straciła|stra=ci=ła|7
+strawy|stra=wy|7
+strażnikami|straż=ni=ka=mi|7
+strażnikom|straż=ni=kom|7
+struchlałe|stru=chla=łe|7
+strzegli|strze=gli|7
+strzelbę|strzel=bę|7
+stworzenia|stwo=rze=nia|7
+swobodnie|swo=bod=nie|7
+szarym|sza=rym|7
+szczekania|szcze=ka=nia|7
+szukała|szu=ka=ła|7
+słodkie|słod=kie|7
+Słyszeliście|Sły=sze=li=ście|7
+słyszysz|sły=szysz|7
+tabaką|ta=ba=ką|7
+tamtego|tam=te=go|7
+tatulu|ta=tu=lu|7
+toczył|to=czył|7
+trepami|tre=pa=mi|7
+trumny|trum=ny|7
+trwała|trwa=ła|7
+trzaskając|trza=ska=jąc|7
+trzasnęła|trza=snę=ła|7
+trzepały|trze=pa=ły|7
+tumany|tu=ma=ny|7
+tysiąc|ty=siąc|7
+ubrany|ubra=ny|7
+uciekały|ucie=ka=ły|7
+ucieszne|uciesz=ne|7
+uderzyły|ude=rzy=ły|7
+udręki|udrę=ki|7
+ujadały|uja=da=ły|7
+ujrzawszy|uj=rzaw=szy|7
+ująwszy|ująw=szy|7
+umiała|umia=ła|7
+umyślnie|umyśl=nie|7
+unosząc|uno=sząc|7
+upodoby|upodo=by|7
+urzędnik|urzęd=nik|7
+uspokoił|uspo=ko=ił|7
+usypany|usy=pa=ny|7
+uszami|usza=mi|7
+usłyszał|usły=szał|7
+uwierzy|uwie=rzy|7
+uwierzył|uwie=rzył|7
+uwięzi|uwię=zi|7
+uśmiechnął|uśmiech=nął|7
+warczały|war=cza=ły|7
+warkocze|war=ko=cze|7
+warowała|wa=ro=wa=ła|7
+waszych|wa=szych|7
+Weronki|We=ron=ki|7
+westchnienia|wes=tchnie=nia|7
+wiatrak|wia=trak|7
+wiecznie|wiecz=nie|7
+wiedła|wie=dła|7
+wiejskiej|wiej=skiej|7
+wierciło|wier=ci=ło|7
+wierzchu|wierz=chu|7
+wiośniane|wio=śnia=ne|7
+wiośnie|wio=śnie|7
+witając|wi=ta=jąc|7
+wiązać|wią=zać|7
+wojnie|woj=nie|7
+wolniuśko|wol=niuś=ko|7
+wozami|wo=za=mi|7
+wołały|wo=ła=ły|7
+wracając|wra=ca=jąc|7
+Wrzask|Wrzask|7
+wrzawą|wrza=wą|7
+wrzała|wrza=ła|7
+wrzeszczały|wrzesz=cza=ły|7
+wrócili|wró=ci=li|7
+wrótniami|wrót=nia=mi|7
+wschodem|wscho=dem|7
+wskazując|wska=zu=jąc|7
+współczuciem|współ=czu=ciem|7
+wstawać|wsta=wać|7
+wstąpił|wstą=pił|7
+wstążkę|wstąż=kę|7
+wybiera|wy=bie=ra|7
+wychylały|wy=chy=la=ły|7
+wydziera|wy=dzie=ra|7
+wygrażał|wy=gra=żał|7
+wyjrzał|wyj=rzał|7
+wykrzykiwać|wy=krzy=ki=wać|7
+wypomina|wy=po=mi=na|7
+wyrozumie|wy=ro=zu=mie|7
+wyrywać|wy=ry=wać|7
+wyrzekać|wy=rze=kać|7
+wystraszony|wy=stra=szo=ny|7
+wywalili|wy=wa=li=li|7
+wyzierając|wy=zie=ra=jąc|7
+wzburzony|wzbu=rzo=ny|7
+wzdychając|wzdy=cha=jąc|7
+wzdychów|wzdy=chów|7
+wznosił|wzno=sił|7
+wzruszenia|wzru=sze=nia|7
+wątroba|wą=tro=ba|7
+wściekłe|wście=kłe|7
+wściekłością|wście=kło=ścią|7
+zabiegał|za=bie=gał|7
+zabierać|za=bie=rać|7
+zachciało|za=chcia=ło|7
+zaczynał|za=czy=nał|7
+zaczynały|za=czy=na=ły|7
+zaglądać|za=glą=dać|7
+zaglądały|za=glą=da=ły|7
+zagonie|za=go=nie|7
+Zajrzała|Zaj=rza=ła|7
+zajęta|za=ję=ta|7
+zakołysał|za=ko=ły=sał|7
+zakrystii|za=kry=stii|7
+zakrzyczały|za=krzy=cza=ły|7
+zamedytował|za=me=dy=to=wał|7
+zamilkł|za=milkł|7
+zamknięty|za=mknię=ty|7
+zapamiętałością|za=pa=mię=ta=ło=ścią|7
+zapisu|za=pi=su|7
+zapodział|za=po=dział|7
+zapomnieli|za=po=mnie=li|7
+zapraszać|za=pra=szać|7
+zapłacić|za=pła=cić|7
+zarzewie|za=rze=wie|7
+zarzewiem|za=rze=wiem|7
+zasiadł|za=siadł|7
+zasnute|za=snu=te|7
+zasnęła|za=snę=ła|7
+zawodziły|za=wo=dzi=ły|7
+zaśpiewał|za=śpie=wał|7
+zbożem|zbo=żem|7
+zdechła|zde=chła|7
+zdrowy|zdro=wy|7
+zdumienia|zdu=mie=nia|7
+zdążyć|zdą=żyć|7
+zdążyła|zdą=ży=ła|7
+zerwały|ze=rwa=ły|7
+zgodził|zgo=dził|7
+ziarnem|ziar=nem|7
+zipiąc|zi=piąc|7
+zmartwiała|zmar=twia=ła|7
+zmarło|zmar=ło|7
+zmówić|zmó=wić|7
+znaczy|zna=czy|7
+znikąd|zni=kąd|7
+zrywała|zry=wa=ła|7
+zwyczajem|zwy=cza=jem|7
+złocie|zło=cie|7
+złodzieja|zło=dzie=ja|7
+ławkach|ław=kach|7
+łaziła|ła=zi=ła|7
+łąkach|łą=kach|7
+łęgach|łę=gach|7
+ścianach|ścia=nach|7
+Ścierwa|Ścier=wa|7
+ścisnął|ści=snął|7
+ścisnęło|ści=snę=ło|7
+ściółkę|ściół=kę|7
+śledzia|śle=dzia|7
+śmigały|śmi=ga=ły|7
+świecami|świe=ca=mi|7
+świeżo|świe=żo|7
+święci|świę=ci|7
+żałowała|ża=ło=wa=ła|7
+żałością|ża=ło=ścią|7
+życiem|ży=ciem|7
+Żydzie|Ży=dzie|7
+żywota|ży=wo=ta|7
+alkierzu|al=kie=rzu|6
+Antkowie|Ant=ko=wie|6
+Antoni|An=to=ni|6
+baczysz|ba=czysz|6
+barana|ba=ra=na|6
+baraszkował|ba=rasz=ko=wał|6
+baraszkowały|ba=rasz=ko=wa=ły|6
+bekiem|be=kiem|6
+bełkotem|beł=ko=tem|6
+biegali|bie=ga=li|6
+bierzcie|bierz=cie|6
+bieżyj|bie=żyj|6
+bijące|bi=ją=ce|6
+bijącym|bi=ją=cym|6
+bochen|bo=chen|6
+bogactwa|bo=gac=twa|6
+bogacze|bo=ga=cze|6
+bolesne|bo=le=sne|6
+borowego|bo=ro=we=go|6
+Borynowego|Bo=ry=no=we=go|6
+Borynowy|Bo=ry=no=wy|6
+Borynowym|Bo=ry=no=wym|6
+brzaskami|brza=ska=mi|6
+brzegu|brze=gu|6
+brzęki|brzę=ki|6
+buchało|bu=cha=ło|6
+burych|bu=rych|6
+bywały|by=wa=ły|6
+byłaby|by=ła=by|6
+Byście|By=ście|6
+Całkiem|Cał=kiem|6
+całowali|ca=ło=wa=li|6
+całowała|ca=ło=wa=ła|6
+cepami|ce=pa=mi|6
+Chciał|Chciał|6
+chlebem|chle=bem|6
+chlipanie|chli=pa=nie|6
+chmurzyskami|chmu=rzy=ska=mi|6
+chmurą|chmu=rą|6
+chodźmy|chodź=my|6
+Chodźta|Chodź=ta|6
+chorej|cho=rej|6
+choćbyś|choć=byś|6
+Chrystus|Chry=stus|6
+chrzęstem|chrzę=stem|6
+chwalił|chwa=lił|6
+chwasty|chwa=sty|6
+chwytając|chwy=ta=jąc|6
+chłodu|chło=du|6
+chłopskich|chłop=skich|6
+cielak|cie=lak|6
+ciemny|ciem=ny|6
+cieple|cie=ple|6
+ciepnął|ciep=nął|6
+ciepłym|cie=płym|6
+cieszyć|cie=szyć|6
+cieszył|cie=szył|6
+ciołak|cio=łak|6
+ciołka|cioł=ka|6
+ciurkiem|ciur=kiem|6
+ciągnąć|cią=gnąć|6
+ciągłe|cią=głe|6
+ciężkimi|cięż=ki=mi|6
+ciżbie|ciż=bie|6
+coście|co=ście|6
+czasownika|cza=sow=ni=ka|6
+czegóż|cze=góż|6
+czołem|czo=łem|6
+czujące|czu=ją=ce|6
+czynnością|czyn=no=ścią|6
+człowiecze|czło=wie=cze|6
+córuchno|có=ruch=no|6
+dachach|da=chach|6
+dalekim|da=le=kim|6
+dalekościach|da=le=ko=ściach|6
+dawali|da=wa=li|6
+deliberował|de=li=be=ro=wał|6
+diabli|dia=bli|6
+dlatego|dla=te=go|6
+dobremu|do=bre=mu|6
+dobytek|do=by=tek|6
+dochtory|do=chto=ry|6
+doczekać|do=cze=kać|6
+dojrzały|doj=rza=ły|6
+dokładnie|do=kład=nie|6
+dopraszam|do=pra=szam|6
+dostanie|do=sta=nie|6
+dosłyszawszy|do=sły=szaw=szy|6
+dowodził|do=wo=dził|6
+dołoży|do=ło=ży|6
+drapać|dra=pać|6
+dreszcz|dreszcz|6
+drewek|dre=wek|6
+drgały|drga=ły|6
+drzewina|drze=wi=na|6
+dróżce|dróż=ce|6
+drżące|drżą=ce|6
+dwojaki|dwo=ja=ki|6
+dygotała|dy=go=ta=ła|6
+dygotało|dy=go=ta=ło|6
+dygotem|dy=go=tem|6
+dymach|dy=mach|6
+działach|dzia=łach|6
+działy|dzia=ły|6
+dzieciach|dzie=ciach|6
+dziedzicowy|dzie=dzi=co=wy|6
+dziobem|dzio=bem|6
+dzioby|dzio=by|6
+dziwna|dziw=na|6
+Dziwowali|Dzi=wo=wa=li|6
+dzwoniła|dzwo=ni=ła|6
+długachne|dłu=gach=ne|6
+dłuższą|dłuż=szą|6
+dłużył|dłu=żył|6
+dźwigając|dźwi=ga=jąc|6
+farbami|far=ba=mi|6
+gadanie|ga=da=nie|6
+galopem|ga=lo=pem|6
+garnek|gar=nek|6
+gałęziach|ga=łę=ziach|6
+gałęzią|ga=łę=zią|6
+giezło|gie=zło|6
+gorszego|gor=sze=go|6
+gorzko|gorz=ko|6
+gorącymi|go=rą=cy=mi|6
+gospodarki|go=spo=dar=ki|6
+gospodarzami|go=spo=da=rza=mi|6
+gospodarzowi|go=spo=da=rzo=wi|6
+gospodyń|go=spo=dyń|6
+gołębi|go=łę=bi|6
+gościniec|go=ści=niec|6
+grobli|gro=bli|6
+grochem|gro=chem|6
+gromadę|gro=ma=dę|6
+gromnicę|grom=ni=cę|6
+groszem|gro=szem|6
+groziła|gro=zi=ła|6
+groźby|groź=by|6
+groźna|groź=na|6
+grubachne|gru=bach=ne|6
+grusze|gru=sze|6
+grzeszne|grzesz=ne|6
+gwarząc|gwa=rząc|6
+gwiezdne|gwiezd=ne|6
+gąsków|gą=sków|6
+gęsiego|gę=sie=go|6
+gęstniał|gęst=niał|6
+gęstwa|gę=stwa|6
+głaskać|gła=skać|6
+głaskał|gła=skał|6
+głupiego|głu=pie=go|6
+Hameryki|Ha=me=ry=ki|6
+hamował|ha=mo=wał|6
+hardość|har=dość|6
+historię|hi=sto=rię|6
+idziecie|idzie=cie|6
+indory|in=do=ry|6
+izdebki|iz=deb=ki|6
+jabłek|ja=błek|6
+Jagusina|Ja=gu=si=na|6
+Jankla|Jan=kla|6
+jasnością|ja=sno=ścią|6
+jazgoty|ja=zgo=ty|6
+Jaśkiem|Jaś=kiem|6
+jaśniały|ja=śnia=ły|6
+jechali|je=cha=li|6
+jedzie|je=dzie|6
+Jeszczek|Jesz=czek|6
+Jezusowego|Je=zu=so=we=go|6
+jeździli|jeź=dzi=li|6
+jeżeli|je=że=li|6
+Jędrzycha|Ję=drzy=cha|6
+jękliwe|ję=kli=we|6
+jękliwym|ję=kli=wym|6
+języka|ję=zy=ka|6
+kancelarią|kan=ce=la=rią|6
+kapały|ka=pa=ły|6
+kapocie|ka=po=cie|6
+karczmach|karcz=mach|6
+kawale|ka=wa=le|6
+kawałki|ka=wał=ki|6
+Kiedyż|Kie=dyż|6
+kieliszka|kie=lisz=ka|6
+kieszeni|kie=sze=ni|6
+kiełbasa|kieł=ba=sa|6
+kiełbasę|kieł=ba=sę|6
+kijaszek|ki=ja=szek|6
+klęczała|klę=cza=ła|6
+kobieto|ko=bie=to|6
+kobyłę|ko=by=łę|6
+kochana|ko=cha=na|6
+kokoty|ko=ko=ty|6
+komisarza|ko=mi=sa=rza|6
+kompanią|kom=pa=nią|6
+koniecznie|ko=niecz=nie|6
+konstrukcja|kon=struk=cja|6
+Kozłowej|Ko=zło=wej|6
+kołujący|ko=łu=ją=cy|6
+końcówką|koń=ców=ką|6
+końskie|koń=skie|6
+kościołowi|ko=ścio=ło=wi|6
+Kościół|Ko=ściół|6
+krewniaki|krew=nia=ki|6
+krewniaków|krew=nia=ków|6
+krzepciej|krzep=ciej|6
+krzyczą|krzy=czą|6
+krzyżu|krzy=żu|6
+królach|kró=lach|6
+kręcić|krę=cić|6
+kręciły|krę=ci=ły|6
+krętanina|krę=ta=ni=na|6
+kumami|ku=ma=mi|6
+kuntentność|kun=tent=ność|6
+kuropatki|ku=ro=pat=ki|6
+Kużden|Kuż=den|6
+kwiliły|kwi=li=ły|6
+lament|la=ment|6
+lasach|la=sach|6
+leciało|le=cia=ło|6
+leniwie|le=ni=wie|6
+lepszego|lep=sze=go|6
+lepszy|lep=szy|6
+lewentarz|le=wen=tarz|6
+leżących|le=żą=cych|6
+Lipcami|Lip=ca=mi|6
+Maciejowi|Ma=cie=jo=wi|6
+mamrotać|mam=ro=tać|6
+markotnie|mar=kot=nie|6
+matczynych|mat=czy=nych|6
+miarkował|miar=ko=wał|6
+miarkujcie|miar=kuj=cie|6
+migotał|mi=go=tał|6
+milcząca|mil=czą=ca|6
+mocniejszy|moc=niej=szy|6
+modlić|mo=dlić|6
+modliła|mo=dli=ła|6
+mrowiły|mro=wi=ły|6
+mruczała|mru=cza=ła|6
+mrówki|mrów=ki|6
+musiałem|mu=sia=łem|6
+musisz|mu=sisz|6
+mówiłam|mó=wi=łam|6
+młynarczyk|mły=nar=czyk|6
+nabożeństwa|na=bo=żeń=stwa|6
+nabrzmiały|na=brzmia=ły|6
+nadchodził|nad=cho=dził|6
+naokół|na=okół|6
+napisane|na=pi=sa=ne|6
+naprawdę|na=praw=dę|6
+narodził|na=ro=dził|6
+Nastce|Na=st=ce|6
+Nastusię|Na=stu=się|6
+naszczekiwał|na=szcze=ki=wał|6
+naszych|na=szych|6
+natknęła|na=tknę=ła|6
+niczegój|ni=cze=gój|6
+niczemu|ni=cze=mu|6
+niechże|niech=że|6
+niedzieli|nie=dzie=li|6
+niektóry|nie=któ=ry|6
+nieletko|nie=let=ko|6
+niemocy|nie=mo=cy|6
+niepowstrzymanie|nie=po=wstrzy=ma=nie|6
+nieprzyjacioły|nie=przy=ja=cio=ły|6
+nierad|nie=rad|6
+nierada|nie=ra=da|6
+niesie|nie=sie|6
+niesprawiedliwość|nie=spra=wie=dli=wość|6
+niesąc|nie=sąc|6
+nieustępliwą|nie=ustę=pli=wą|6
+niezadługo|nie=za=dłu=go|6
+Niezgorzej|Nie=zgo=rzej|6
+niosąc|nio=sąc|6
+niosły|nio=sły|6
+obaczył|oba=czył|6
+obejmował|obej=mo=wał|6
+oberwał|obe=rwał|6
+objaśniał|ob=ja=śniał|6
+objaśniała|ob=ja=śnia=ła|6
+obleczenia|ob=le=cze=nia|6
+obleczeniu|ob=le=cze=niu|6
+obmierzły|ob=mier=z=ły|6
+obrazem|ob=ra=zem|6
+obrony|obro=ny|6
+obzierać|obzie=rać|6
+ochfiarowała|ochfia=ro=wa=ła|6
+ociężale|ocię=ża=le|6
+oczekując|ocze=ku=jąc|6
+oddała|od=da=ła|6
+oddech|od=dech|6
+oddechy|od=de=chy|6
+odebrał|ode=brał|6
+odeszli|ode=szli|6
+odmówienie|od=mó=wie=nie|6
+odpowie|od=po=wie|6
+odsunął|od=su=nął|6
+odwracał|od=wra=cał|6
+odwracała|od=wra=ca=ła|6
+oganiając|oga=nia=jąc|6
+ogiery|ogie=ry|6
+ogniste|ogni=ste|6
+ogrodzie|ogro=dzie|6
+ojcowego|oj=co=we=go|6
+okrutnie|okrut=nie|6
+okręcił|okrę=cił|6
+omacku|omac=ku|6
+opadła|opa=dła|6
+opierał|opie=rał|6
+opowiadając|opo=wia=da=jąc|6
+opowiedzieć|opo=wie=dzieć|6
+oprzytomniał|oprzy=tom=niał|6
+organistą|or=ga=ni=stą|6
+Organiścina|Or=ga=ni=ści=na|6
+ostrzej|ostrzej|6
+otwarcie|otwar=cie|6
+otwierać|otwie=rać|6
+otwierało|otwie=ra=ło|6
+otwierały|otwie=ra=ły|6
+ozorach|ozo=rach|6
+ozwarł|ozwarł|6
+oścież|oścież|6
+ożenić|oże=nić|6
+paciorków|pa=cior=ków|6
+padała|pa=da=ła|6
+palcem|pal=cem|6
+pamięta|pa=mię=ta|6
+Panajezusowe|Pa=na=je=zu=so=we|6
+panuje|pa=nu=je|6
+papierosy|pa=pie=ro=sy|6
+papieru|pa=pie=ru|6
+pasieki|pa=sie=ki|6
+paśniki|pa=śni=ki|6
+pedział|pe=dział|6
+piekle|pie=kle|6
+piesneczki|pie=snecz=ki|6
+Pietrkiem|Pietr=kiem|6
+Pietrusia|Pie=tru=sia|6
+pieściwie|pie=ści=wie|6
+pieśni|pie=śni|6
+pilnuje|pil=nu=je|6
+pobili|po=bi=li|6
+pochowku|po=chow=ku|6
+pociecha|po=cie=cha|6
+pociechę|po=cie=chę|6
+pociągając|po=cią=ga=jąc|6
+pociągnęła|po=cią=gnę=ła|6
+poczęstunek|po=czę=stu=nek|6
+podjeść|pod=jeść|6
+Podlesia|Pod=le=sia|6
+podmurówki|pod=mu=rów=ki|6
+Podniesła|Pod=nie=sła|6
+podniesło|pod=nie=sło|6
+Podniósł|Pod=niósł|6
+podsuwając|pod=su=wa=jąc|6
+podszedł|pod=szedł|6
+poduszki|po=dusz=ki|6
+podzielić|po=dzie=lić|6
+pogadywać|po=ga=dy=wać|6
+pogrzebie|po=grze=bie|6
+pojechała|po=je=cha=ła|6
+pojękiwał|po=ję=ki=wał|6
+pokazało|po=ka=za=ło|6
+pokazały|po=ka=za=ły|6
+polśniewał|po=lśnie=wał|6
+polśniewały|po=lśnie=wa=ły|6
+pomdlałe|po=mdla=łe|6
+pomieścić|po=mie=ścić|6
+Poniechajcie|Po=nie=chaj=cie|6
+poniektórych|po=nie=któ=rych|6
+poniesły|po=nie=sły|6
+ponieśli|po=nie=śli|6
+ponosił|po=no=sił|6
+popuszczał|po=pusz=czał|6
+popłakiwała|po=pła=ki=wa=ła|6
+poredzili|po=re=dzi=li|6
+porykiwania|po=ry=ki=wa=nia|6
+posiał|po=siał|6
+postawili|po=sta=wi=li|6
+postało|po=sta=ło|6
+postronki|po=stron=ki|6
+postękiwał|po=stę=ki=wał|6
+poszumem|po=szu=mem|6
+posłucha|po=słu=cha|6
+potoczył|po=to=czył|6
+powiadaj|po=wia=daj|6
+powinna|po=win=na|6
+pozdrowienia|po=zdro=wie=nia|6
+pozwolili|po=zwo=li=li|6
+pościel|po=ściel|6
+pośpiechu|po=śpie=chu|6
+pożogą|po=żo=gą|6
+pożyczyć|po=ży=czyć|6
+prawdziwie|praw=dzi=wie|6
+prawdziwy|praw=dzi=wy|6
+prawej|pra=wej|6
+prosząc|pro=sząc|6
+prosząco|pro=szą=co|6
+prośby|proś=by|6
+Pryczek|Pry=czek|6
+przeciwił|prze=ciw=ił|6
+przeciwiła|prze=ciw=i=ła|6
+przeciągle|prze=cią=gle|6
+przedostawać|prze=do=sta=wać|6
+przekradać|prze=kra=dać|6
+przemawiał|prze=ma=wiał|6
+przemieni|prze=mie=ni|6
+przemówił|prze=mó=wił|6
+przeniósł|prze=niósł|6
+przepadła|prze=pa=dła|6
+Przepili|Prze=pi=li|6
+przepomnieć|prze=po=mnieć|6
+przepuści|prze=pu=ści|6
+przepychać|prze=py=chać|6
+przerażających|prze=ra=ża=ją=cych|6
+przeróżnych|prze=róż=nych|6
+przetaczało|prze=ta=cza=ło|6
+przeto|prze=to|6
+przetrzymać|prze=trzy=mać|6
+przewalała|prze=wa=la=ła|6
+przewalały|prze=wa=la=ły|6
+prześpiegi|prze=śpie=gi|6
+przychodzę|przy=cho=dzę|6
+przycichła|przy=ci=chła|6
+przyciszać|przy=ci=szać|6
+przyginał|przy=gi=nał|6
+przygiął|przy=giął|6
+przyjacielstwie|przy=ja=ciel=stwie|6
+przyjacioły|przy=ja=cio=ły|6
+przyjaźnie|przy=jaź=nie|6
+Przyjdzie|Przyj=dzie|6
+przyjrzał|przyj=rzał|6
+przykazywał|przy=ka=zy=wał|6
+przyklęknął|przy=klęk=nął|6
+przymierzać|przy=mie=rzać|6
+przyniesie|przy=nie=sie|6
+przyniesę|przy=nie=sę|6
+przyniewalać|przy=nie=wa=lać|6
+przyodziane|przy=odzia=ne|6
+przyodziać|przy=odziać|6
+przyodziała|przy=odzia=ła|6
+przypiecku|przy=piec=ku|6
+przypominał|przy=po=mi=nał|6
+przystał|przy=stał|6
+przystało|przy=sta=ło|6
+przysłoniła|przy=sło=ni=ła|6
+przytrafić|przy=tra=fić|6
+przytwierdzał|przy=twier=dzał|6
+przytwierdzała|przy=twier=dza=ła|6
+przywarł|przy=warł|6
+przywierała|przy=wie=ra=ła|6
+przyziemnych|przy=ziem=nych|6
+przyłożył|przy=ło=żył|6
+Przyłęka|Przy=łę=ka|6
+przędziwem|przę=dzi=wem|6
+przędzy|przę=dzy|6
+próbując|pró=bu=jąc|6
+psiakrew|psia=krew|6
+pszczelnym|psz=czel=nym|6
+pszczoły|psz=czo=ły|6
+pszenicy|psze=ni=cy|6
+ptaszka|ptasz=ka|6
+ptaszków|ptasz=ków|6
+puszcza|pusz=cza|6
+puszczały|pusz=cza=ły|6
+puszczę|pusz=czę|6
+puściły|pu=ści=ły|6
+pyskiem|py=skiem|6
+pyskuje|py=sku=je|6
+płacił|pła=cił|6
+płakali|pła=ka=li|6
+płakały|pła=ka=ły|6
+płonęły|pło=nę=ły|6
+Płoszki|Płosz=ki|6
+Płoszkową|Płosz=ko=wą|6
+płynie|pły=nie|6
+robaki|ro=ba=ki|6
+robotach|ro=bo=tach|6
+rodzonego|ro=dzo=ne=go|6
+rogate|ro=ga=te|6
+rozchodzili|roz=cho=dzi=li|6
+rozchodził|roz=cho=dził|6
+rozeszły|ro=ze=szły|6
+rozgorzałe|roz=go=rza=łe|6
+rozgorzałymi|roz=go=rza=ły=mi|6
+rozkołysane|roz=ko=ły=sa=ne|6
+rozlewając|roz=le=wa=jąc|6
+Rozmyślała|Roz=my=śla=ła|6
+roznosiło|roz=no=si=ło|6
+rozpaczliwie|roz=pacz=li=wie|6
+rozpaczy|roz=pa=czy|6
+rozpaczą|roz=pa=czą|6
+rozpalonym|roz=pa=lo=nym|6
+rozpozna|roz=po=zna|6
+rozpłakała|roz=pła=ka=ła|6
+roztrzęsiona|roz=trzę=sio=na|6
+rozwodząc|roz=wo=dząc|6
+ruchem|ru=chem|6
+ruchomą|ru=cho=mą|6
+ruszali|ru=sza=li|6
+rzeczach|rze=czach|6
+rzewnie|rzew=nie|6
+rzucali|rzu=ca=li|6
+rzutem|rzu=tem|6
+rzędami|rzę=da=mi|6
+różnościach|róż=no=ściach|6
+rączków|rącz=ków|6
+sadami|sa=da=mi|6
+sadzić|sa=dzić|6
+saniach|sa=niach|6
+saniami|sa=nia=mi|6
+schodzić|scho=dzić|6
+schować|scho=wać|6
+schowała|scho=wa=ła|6
+sennym|sen=nym|6
+siedzeniu|sie=dze=niu|6
+siedząca|sie=dzą=ca|6
+sieroto|sie=ro=to|6
+silniej|sil=niej|6
+siwiły|si=wi=ły|6
+sięgając|się=ga=jąc|6
+skamlała|skam=la=ła|6
+skamlały|skam=la=ły|6
+skarżąc|skar=żąc|6
+skowronkowe|skow=ron=ko=we|6
+skowytem|sko=wy=tem|6
+skończyć|skoń=czyć|6
+skończą|skoń=czą|6
+skropił|skro=pił|6
+skrzypkach|skrzyp=kach|6
+skrzyły|skrzy=ły|6
+skręcał|skrę=cał|6
+skręcie|skrę=cie|6
+smakuje|sma=ku=je|6
+smutki|smut=ki|6
+smutkiem|smut=kiem|6
+smutno|smut=no|6
+smutny|smut=ny|6
+Sołtys|Soł=tys|6
+spadła|spa=dła|6
+spluwał|splu=wał|6
+spoglądali|spo=glą=da=li|6
+spoglądać|spo=glą=dać|6
+spokoić|spo=ko=ić|6
+spokojności|spo=koj=no=ści|6
+sponiewierał|spo=nie=wie=rał|6
+spostrzegła|spo=strze=gła|6
+spotkać|spo=tkać|6
+spozierać|spo=zie=rać|6
+Sprawa|Spra=wa|6
+sprawiedliwie|spra=wie=dli=wie|6
+Sprawiedliwie|Spra=wie=dli=wie|6
+sprawiedliwością|spra=wie=dli=wo=ścią|6
+sprawić|spra=wić|6
+sprawię|spra=wię|6
+sprawił|spra=wił|6
+sprawnie|spraw=nie|6
+spuścił|spu=ścił|6
+spólnie|spól=nie|6
+spółki|spół=ki|6
+spółkę|spół=kę|6
+spłaty|spła=ty|6
+Stachowi|Sta=cho=wi|6
+stajanie|sta=ja=nie|6
+Starszy|Star=szy|6
+staruchy|sta=ru=chy|6
+stawiać|sta=wiać|6
+sterczały|ster=cza=ły|6
+stodołami|sto=do=ła=mi|6
+stodołą|sto=do=łą|6
+stodół|sto=dół|6
+stojące|sto=ją=ce|6
+stojących|sto=ją=cych|6
+stosunku|sto=sun=ku|6
+stołem|sto=łem|6
+strata|stra=ta|6
+strażnik|straż=nik|6
+straży|stra=ży|6
+strwożeni|str=wo=że=ni|6
+strzech|strzech|6
+stróżujące|stró=żu=ją=ce|6
+studnie|stud=nie|6
+studnią|stud=nią|6
+szarej|sza=rej|6
+szarości|sza=ro=ści|6
+szarzały|sza=rza=ły|6
+szczerym|szcze=rym|6
+szczękały|szczę=ka=ły|6
+szerokim|sze=ro=kim|6
+szkodę|szko=dę|6
+szkołą|szko=łą|6
+szmatami|szma=ta=mi|6
+sznury|sznu=ry|6
+szumnie|szum=nie|6
+szydziła|szy=dzi=ła|6
+szykowali|szy=ko=wa=li|6
+Szymkiem|Szym=kiem|6
+szynkwasem|szynk=wa=sem|6
+sądach|są=dach|6
+sędzia|sę=dzia|6
+słodkich|słod=kich|6
+słodkiej|słod=kiej|6
+słodkością|słod=ko=ścią|6
+słoneczny|sło=necz=ny|6
+słuchając|słu=cha=jąc|6
+Słuchali|Słu=cha=li|6
+Słuchała|Słu=cha=ła|6
+słyszy|sły=szy|6
+tamtej|tam=tej|6
+targał|tar=gał|6
+Tereski|Te=re=ski|6
+trusia|tru=sia|6
+trzask|trzask|6
+trzewiki|trze=wi=ki|6
+trzymaj|trzy=maj|6
+tumanach|tu=ma=nach|6
+twojej|two=jej|6
+tygodnia|ty=go=dnia|6
+tylachny|ty=lach=ny|6
+tęskliwe|tę=skli=we|6
+tęsknicy|tę=sk=ni=cy|6
+tęsknie|tę=sk=nie|6
+tęskności|tę=sk=no=ści|6
+tęskność|tę=sk=ność|6
+tłucze|tłu=cze|6
+tłumaczyć|tłu=ma=czyć|6
+tłusty|tłu=sty|6
+ubranie|ubra=nie|6
+uchwalić|uchwa=lić|6
+uciecha|ucie=cha|6
+uciekała|ucie=ka=ła|6
+udźwignie|udźwi=gnie|6
+ukrzywdził|ukrzyw=dził|6
+Ulisia|Uli=sia|6
+uniosła|unio=sła|6
+upadek|upa=dek|6
+uparcie|upar=cie|6
+upominał|upo=mi=nał|6
+uradzi|ura=dzi|6
+uroczyste|uro=czy=ste|6
+urodny|urod=ny|6
+urodzić|uro=dzić|6
+Urzędnik|Urzęd=nik|6
+ustawili|usta=wi=li|6
+utrapień|utra=pień|6
+utrudzony|utru=dzo=ny|6
+utrzymanie|utrzy=ma=nie|6
+uwidzi|uwi=dzi|6
+uwijał|uwi=jał|6
+ułapiło|uła=pi=ło|6
+Wachników|Wach=ni=ków|6
+wagował|wa=go=wał|6
+ważnie|waż=nie|6
+Wczoraj|Wczo=raj|6
+wczorajszej|wczo=raj=szej|6
+weselej|we=se=lej|6
+weselne|we=sel=ne|6
+Widziałem|Wi=dzia=łem|6
+widłami|wi=dła=mi|6
+wieczornych|wie=czor=nych|6
+wiedziały|wie=dzia=ły|6
+wielgachnych|wiel=gach=nych|6
+wielkich|wiel=kich|6
+wierząc|wie=rząc|6
+wilgotne|wil=got=ne|6
+większość|więk=szość|6
+wokoło|wo=ko=ło|6
+wołają|wo=ła=ją|6
+wpatrzona|wpa=trzo=na|6
+wpierając|wpie=ra=jąc|6
+wracać|wra=cać|6
+wraził|wra=ził|6
+wrzasku|wrza=sku|6
+wrzawie|wrza=wie|6
+wrzawy|wrza=wy|6
+wrzeszczeli|wrzesz=cze=li|6
+wrzeszczeć|wrzesz=czeć|6
+wrzątek|wrzą=tek|6
+wsadził|wsa=dził|6
+wstąpiła|wstą=pi=ła|6
+Wszyćko|Wszyć=ko|6
+wybiegając|wy=bie=ga=jąc|6
+wybojach|wy=bo=jach|6
+wybrała|wy=bra=ła|6
+wybuchnęła|wy=buch=nę=ła|6
+wychodziły|wy=cho=dzi=ły|6
+wydała|wy=da=ła|6
+wydało|wy=da=ło|6
+wykrztusiła|wy=krztu=si=ła|6
+wykrzykiwała|wy=krzy=ki=wa=ła|6
+wykręcał|wy=krę=cał|6
+wylazł|wy=lazł|6
+wynosili|wy=no=si=li|6
+wynosić|wy=no=sić|6
+wypadła|wy=pa=dła|6
+wypatruje|wy=pa=tru=je|6
+wypatrując|wy=pa=tru=jąc|6
+wyprawiała|wy=pra=wia=ła|6
+wyprowadził|wy=pro=wa=dził|6
+wypuścił|wy=pu=ścił|6
+wypytywał|wy=py=ty=wał|6
+wyrzekając|wy=rze=ka=jąc|6
+wyschła|wy=schła|6
+wysiedzieć|wy=sie=dzieć|6
+wysokościach|wy=so=ko=ściach|6
+wystraszona|wy=stra=szo=na|6
+wyszły|wy=szły|6
+wytrzyma|wy=trzy=ma|6
+wywartych|wy=war=tych|6
+wywiódł|wy=wiódł|6
+wywodzić|wy=wo=dzić|6
+wywrzeć|wy=wrzeć|6
+wyzdrowiał|wy=zdro=wiał|6
+Wyście|Wy=ście|6
+wyżalić|wy=ża=lić|6
+wzburzona|wzbu=rzo=na|6
+wzburzone|wzbu=rzo=ne|6
+wzgórze|wzgó=rze|6
+Wzieni|Wzie=ni|6
+Wzięła|Wzię=ła|6
+wątpia|wąt=pia|6
+węgieł|wę=gieł|6
+węzełek|wę=ze=łek|6
+własne|wła=sne|6
+włosach|wło=sach|6
+zabawiał|za=ba=wiał|6
+zabierał|za=bie=rał|6
+zabite|za=bi=te|6
+zachodził|za=cho=dził|6
+zachorzał|za=cho=rzał|6
+zachrapał|za=chra=pał|6
+zaczerwienione|za=czer=wie=nio=ne|6
+zaczynało|za=czy=na=ło|6
+zadyszana|za=dy=sza=na|6
+zadzie|za=dzie|6
+zagadać|za=ga=dać|6
+zagadując|za=ga=du=jąc|6
+zajadlej|za=ja=dlej|6
+zajrzy|zaj=rzy|6
+zajrzyj|zaj=rzyj|6
+zajączka|za=jącz=ka|6
+zakatrupię|za=ka=tru=pię|6
+zakolebały|za=ko=le=ba=ły|6
+zakładał|za=kła=dał|6
+zaległo|za=le=gło|6
+zamamrotał|za=mam=ro=tał|6
+zamknął|za=mknął|6
+zamrze|za=mrze|6
+zapachem|za=pa=chem|6
+zapadała|za=pa=da=ła|6
+zapadł|za=padł|6
+zapalili|za=pa=li=li|6
+zapartym|za=par=tym|6
+zapatrzył|za=pa=trzył|6
+zapowiadał|za=po=wia=dał|6
+zapowiedzi|za=po=wie=dzi|6
+zaprzestał|za=prze=stał|6
+zapłacił|za=pła=cił|6
+zarobić|za=ro=bić|6
+zaroiły|za=ro=iły|6
+zarzewia|za=rze=wia|6
+zasiedli|za=sie=dli|6
+zaszczekał|za=szcze=kał|6
+zawarczał|za=war=czał|6
+zawarty|za=war=ty|6
+zawiał|za=wiał|6
+Zawrzyj|Za=wrzyj|6
+zawziął|za=wziął|6
+zawziętości|za=wzię=to=ści|6
+Zawżdy|Za=wż=dy|6
+zaśpiewali|za=śpie=wa=li|6
+zaśpiewała|za=śpie=wa=ła|6
+zbierało|zbie=ra=ło|6
+zdawało|zda=wa=ło|6
+zdrowe|zdro=we|6
+zdumiał|zdu=miał|6
+zebrali|ze=bra=li|6
+zebranie|ze=bra=nie|6
+zechce|ze=chce|6
+zestrachane|ze=stra=cha=ne|6
+zeszedł|ze=szedł|6
+zeszli|ze=szli|6
+zeszły|ze=szły|6
+zginęło|zgi=nę=ło|6
+zgodzić|zgo=dzić|6
+zgromiła|zgro=mi=ła|6
+zielonym|zie=lo=nym|6
+zieloną|zie=lo=ną|6
+zięcia|zię=cia|6
+zjadliwie|zja=dli=wie|6
+zmartwienie|zmar=twie=nie|6
+znalazła|zna=la=zła|6
+zobaczy|zo=ba=czy|6
+zostanie|zo=sta=nie|6
+zrozumiał|zro=zu=miał|6
+zrywały|zry=wa=ły|6
+zwlókł|zwlókł|6
+zwoził|zwo=ził|6
+zwyczajny|zwy=czaj=ny|6
+złotem|zło=tem|6
+łajdusy|łaj=du=sy|6
+łańcuchem|łań=cu=chem|6
+łańcuchu|łań=cu=chu|6
+ścierpieć|ścier=pieć|6
+ścieżaj|ście=żaj|6
+ściszone|ści=szo=ne|6
+śledzie|śle=dzie|6
+śmiałości|śmia=ło=ści|6
+śmielej|śmie=lej|6
+śmiercią|śmier=cią|6
+śmiertelne|śmier=tel=ne|6
+śpiewa|śpie=wa|6
+śpiewają|śpie=wa=ją|6
+śpiewki|śpiew=ki|6
+śpiewów|śpie=wów|6
+świadkach|świad=kach|6
+światełka|świa=teł=ka|6
+światu|świa=tu|6
+światłość|świa=tłość|6
+świetle|świe=tle|6
+świątecznie|świą=tecz=nie|6
+święconego|świę=co=ne=go|6
+Święta|Świę=ta|6
+świętami|świę=ta=mi|6
+świętości|świę=to=ści|6
+źrebak|źre=bak|6
+żarliwie|żar=li=wie|6
+żartował|żar=to=wał|6
+żałosną|ża=ło=sną|6
+Żydowi|Ży=do=wi|6
+żółtym|żół=tym|6
+żółtymi|żół=ty=mi|6
+ambonie|am=bo=nie|5
+Ambroży|Am=bro=ży|5
+baczycie|ba=czy=cie|5
+Balcerków|Bal=cer=ków|5
+beczkę|becz=kę|5
+bezładnie|bez=ład=nie|5
+bełkot|beł=kot|5
+białego|bia=łe=go|5
+biedny|bied=ny|5
+biedotę|bie=do=tę|5
+bieganina|bie=ga=ni=na|5
+biegał|bie=gał|5
+biegała|bie=ga=ła|5
+biegnącej|bie=gną=cej|5
+biegnącą|bie=gną=cą|5
+bielmem|biel=mem|5
+bielone|bie=lo=ne|5
+bijatyki|bi=ja=ty=ki|5
+bladych|bla=dych|5
+bolenia|bo=le=nia|5
+bolesna|bo=le=sna|5
+boskiego|bo=skie=go|5
+brewiarz|bre=wiarz|5
+brzemię|brze=mię|5
+brzózek|brzó=zek|5
+bródkę|bród=kę|5
+budziła|bu=dzi=ła|5
+bujnie|buj=nie|5
+burknął|burk=nął|5
+butach|bu=tach|5
+butelkę|bu=tel=kę|5
+bydlątko|by=dląt=ko|5
+bydłem|by=dłem|5
+Bylicą|By=li=cą|5
+Byliście|By=li=ście|5
+Bójcie|Bój=cie|5
+błyskawica|bły=ska=wi=ca|5
+błyszczący|błysz=czą=cy|5
+całunkami|ca=łun=ka=mi|5
+Chcesz|Chcesz|5
+Chodźmy|Chodź=my|5
+chorobę|cho=ro=bę|5
+chorzał|cho=rzał|5
+chroniąc|chro=niąc|5
+chrzcie|chrzcie|5
+chudziaczek|chu=dzia=czek|5
+chwaci|chwa=ci|5
+chwała|chwa=ła|5
+chwile|chwi=le|5
+chwilą|chwi=lą|5
+chwyciła|chwy=ci=ła|5
+chybciej|chyb=ciej|5
+chybcikiem|chyb=ci=kiem|5
+chyliły|chy=li=ły|5
+chylące|chy=lą=ce|5
+chytał|chy=tał|5
+chłodny|chłod=ny|5
+chłopakom|chło=pa=kom|5
+chłopakowi|chło=pa=ko=wi|5
+chłopski|chłop=ski|5
+chłopskiego|chłop=skie=go|5
+chłopskiej|chłop=skiej|5
+ciekawość|cie=ka=wość|5
+ciemnica|ciem=ni=ca|5
+ciepła|cie=pła|5
+cieszy|cie=szy|5
+ciągnąc|cią=gnąc|5
+Cięgiem|Cię=giem|5
+ciężkiego|cięż=kie=go|5
+cmentarza|cmen=ta=rza|5
+cudzych|cu=dzych|5
+cudzym|cu=dzym|5
+czająco|cza=ją=co|5
+czarny|czar=ny|5
+czarnymi|czar=ny=mi|5
+czasach|cza=sach|5
+czekam|cze=kam|5
+czekanie|cze=ka=nie|5
+czekałam|cze=ka=łam|5
+czekały|cze=ka=ły|5
+czemuś|cze=muś|5
+czemuż|cze=muż|5
+czerwona|czer=wo=na|5
+czworakach|czwo=ra=kach|5
+czynili|czy=ni=li|5
+czyniły|czy=ni=ły|5
+czynności|czyn=no=ści|5
+czysto|czy=sto|5
+czyścu|czy=ś=cu|5
+człowieczy|czło=wie=czy|5
+dalach|da=lach|5
+dawnych|daw=nych|5
+deskami|de=ska=mi|5
+Deszcz|Deszcz|5
+diabeł|dia=beł|5
+dobrocią|do=bro=cią|5
+doczekawszy|do=cze=kaw=szy|5
+doczekał|do=cze=kał|5
+dokumentnie|do=ku=ment=nie|5
+dorznąć|do=rznąć|5
+dorzucał|do=rzu=cał|5
+dostało|do=sta=ło|5
+doszło|do=szło|5
+dotykał|do=ty=kał|5
+dowiedział|do=wie=dział|5
+drapał|dra=pał|5
+drewniany|drew=nia=ny|5
+Drugie|Dru=gie|5
+drwiąco|drwią=co|5
+Drzewa|Drze=wa|5
+drzewie|drze=wie|5
+dufnością|duf=no=ścią|5
+dufność|duf=ność|5
+dusili|du=si=li|5
+dworska|dwor=ska|5
+dworów|dwo=rów|5
+dychanie|dy=cha=nie|5
+dychał|dy=chał|5
+dygować|dy=go=wać|5
+dymiły|dy=mi=ły|5
+dziadku|dziad=ku|5
+dziadówka|dzia=dów=ka|5
+działów|dzia=łów|5
+dzieciska|dzie=ci=ska|5
+dzieciński|dzie=ciń=ski|5
+dziedzicowym|dzie=dzi=co=wym|5
+dziedziczki|dzie=dzicz=ki|5
+dziesiąte|dzie=sią=te|5
+dziesiątku|dzie=siąt=ku|5
+dzieuchom|dzieu=chom|5
+Dzieuchy|Dzieu=chy|5
+dzieuszyne|dzie=uszy=ne|5
+dzikich|dzi=kich|5
+dziwne|dziw=ne|5
+dziwnych|dziw=nych|5
+dziwnym|dziw=nym|5
+dziwowali|dzi=wo=wa=li|5
+dzwonienie|dzwo=nie=nie|5
+dzwonią|dzwo=nią|5
+dzwonić|dzwo=nić|5
+dzwonów|dzwo=nów|5
+dłuższe|dłuż=sze|5
+fajeczkę|fa=jecz=kę|5
+Filipki|Fi=lip=ki|5
+fleciku|fle=ci=ku|5
+frasunki|fra=sun=ki|5
+Fundacja|Fun=da=cja|5
+gadzina|ga=dzi=na|5
+galante|ga=lan=te|5
+gardziele|gar=dzie=le|5
+gardła|gar=dła|5
+garnczek|garn=czek|5
+garnka|garn=ka|5
+garnuszek|gar=nu=szek|5
+gałązek|ga=łą=zek|5
+gdakały|gda=ka=ły|5
+gmerał|gme=rał|5
+gniazda|gniaz=da|5
+gniazdach|gniaz=dach|5
+gniewał|gnie=wał|5
+gorsza|gor=sza|5
+gorzałce|go=rzał=ce|5
+gorącością|go=rą=co=ścią|5
+gorącość|go=rą=cość|5
+gorącym|go=rą=cym|5
+gorącą|go=rą=cą|5
+Gospodarze|Go=spo=da=rze|5
+gospodynię|go=spo=dy=nię|5
+Gołębiów|Go=łę=biów|5
+granuli|gra=nu=li|5
+grdyką|grdy=ką|5
+grobie|gro=bie|5
+groził|gro=ził|5
+grożąc|gro=żąc|5
+grubachny|gru=bach=ny|5
+gruntu|grun=tu|5
+grzbiety|grzbie=ty|5
+gwarem|gwa=rem|5
+gwarów|gwa=rów|5
+gąszczów|gąsz=czów|5
+gębusię|gę=bu=się|5
+gęgoty|gę=go=ty|5
+gęstwy|gę=stwy|5
+gęstych|gę=stych|5
+głodne|głod=ne|5
+głowach|gło=wach|5
+głowiny|gło=wi=ny|5
+głośne|gło=śne|5
+głupiemu|głu=pie=mu|5
+głębin|głę=bin|5
+hukiem|hu=kiem|5
+hukliwie|hu=kli=wie|5
+huknęli|huk=nę=li|5
+huknęły|huk=nę=ły|5
+hurkotał|hur=ko=tał|5
+idących|idą=cych|5
+inszej|in=szej|5
+Jagustynce|Ja=gu=styn=ce|5
+Jagustynkę|Ja=gu=styn=kę|5
+Jakieś|Ja=kieś|5
+jarzące|ja=rzą=ce|5
+jarzących|ja=rzą=cych|5
+jastrzębie|ja=strzę=bie|5
+jazgotliwe|ja=zgo=tli=we|5
+jałowców|ja=łow=ców|5
+jechała|je=cha=ła|5
+jednemu|jed=ne=mu|5
+jedyna|je=dy=na|5
+jedyny|je=dy=ny|5
+jensze|jen=sze|5
+jesienne|je=sien=ne|5
+jesiennych|je=sien=nych|5
+Jesień|Je=sień|5
+Jezusa|Je=zu=sa|5
+jęczały|ję=cza=ły|5
+jękliwy|ję=kli=wy|5
+kalkulował|kal=ku=lo=wał|5
+kamienia|ka=mie=nia|5
+kamionek|ka=mio=nek|5
+kapelusz|ka=pe=lusz|5
+kazali|ka=za=li|5
+kałduny|kał=du=ny|5
+Każdemu|Każ=de=mu|5
+kiełbas|kieł=bas|5
+kilkadziesiąt|kil=ka=dzie=siąt|5
+klepisku|kle=pi=sku|5
+klucze|klu=cze|5
+klątwy|klą=twy|5
+klęczał|klę=czał|5
+klęczek|klę=czek|5
+kobiecych|ko=bie=cych|5
+kolanach|ko=la=nach|5
+kolanami|ko=la=na=mi|5
+kolebać|ko=le=bać|5
+kolebał|ko=le=bał|5
+kolorowych|ko=lo=ro=wych|5
+kominów|ko=mi=nów|5
+komornicy|ko=mor=ni=cy|5
+komorniki|ko=mor=ni=ki|5
+koników|ko=ni=ków|5
+konisko|ko=ni=sko|5
+kopcach|kop=cach|5
+korzeniami|ko=rze=nia=mi|5
+korzeń|ko=rzeń|5
+kostki|kost=ki|5
+kołkami|koł=ka=mi|5
+kołować|ko=ło=wać|5
+kożucha|ko=żu=cha|5
+kreminał|kre=mi=nał|5
+kropidło|kro=pi=dło|5
+krowami|kro=wa=mi|5
+krwawy|krwa=wy|5
+krwawych|krwa=wych|5
+kryjąc|kry=jąc|5
+kryminale|kry=mi=na=le|5
+kryminał|kry=mi=nał|5
+krzach|krzach|5
+krzaki|krza=ki|5
+krzykać|krzy=kać|5
+krzątając|krzą=ta=jąc|5
+krążyły|krą=ży=ły|5
+kręciła|krę=ci=ła|5
+kręciło|krę=ci=ło|5
+kręgiem|krę=giem|5
+którejś|któ=rejś|5
+Kubowa|Ku=bo=wa|5
+kujnął|kuj=nął|5
+kulasa|ku=la=sa|5
+kużdego|kuż=de=go|5
+kwardo|kwar=do|5
+kwietne|kwiet=ne|5
+kępami|kę=pa=mi|5
+kłoniły|kło=ni=ły|5
+kłócili|kłó=ci=li|5
+Kłębem|Kłę=bem|5
+lakudra|la=ku=dra|5
+lampki|lamp=ki|5
+latach|la=tach|5
+latego|la=te=go|5
+lepsza|lep=sza|5
+lepszych|lep=szych|5
+licząca|li=czą=ca|5
+Lipcom|Lip=com|5
+Lipczaków|Lip=cza=ków|5
+litery|li=te=ry|5
+litości|li=to=ści|5
+loboga|lo=bo=ga|5
+lękiem|lę=kiem|5
+machorki|ma=chor=ki|5
+Maciuś|Ma=ciuś|5
+macochą|ma=co=chą|5
+Magdzie|Mag=dzie|5
+majstrował|maj=stro=wał|5
+makiem|ma=kiem|5
+mamrotała|mam=ro=ta=ła|5
+marnacji|mar=na=cji|5
+Marysi|Ma=ry=si|5
+marzenia|ma=rze=nia|5
+marzeń|ma=rzeń|5
+masłem|ma=słem|5
+matczynej|mat=czy=nej|5
+matuli|ma=tu=li|5
+medytować|me=dy=to=wać|5
+miarkuje|miar=ku=je|5
+miasteczka|mia=stecz=ka|5
+miasto|mia=sto|5
+Michała|Mi=cha=ła|5
+mierzi|mier=zi|5
+mieszkania|miesz=ka=nia|5
+mieszkał|miesz=kał|5
+mignęła|mi=gnę=ła|5
+miłowanie|mi=ło=wa=nie|5
+miłował|mi=ło=wał|5
+miłościwy|mi=ło=ści=wy|5
+mocnym|moc=nym|5
+modrawych|mo=dra=wych|5
+modrawą|mo=dra=wą|5
+modrych|mo=drych|5
+modrzały|mo=drza=ły|5
+mogłaby|mo=gła=by|5
+moiściewy|mo=iście=wy|5
+motyczkami|mo=tycz=ka=mi|5
+możemy|mo=że=my|5
+mrocznej|mrocz=nej|5
+mroczno|mrocz=no|5
+mrokiem|mro=kiem|5
+muzykanci|mu=zy=kan=ci|5
+muzyką|mu=zy=ką|5
+mąciło|mą=ci=ło|5
+młodym|mło=dym|5
+młotem|mło=tem|5
+młynarczyka|mły=nar=czy=ka|5
+nabożnym|na=boż=nym|5
+nabrał|na=brał|5
+naczynia|na=czy=nia|5
+nadziei|na=dziei|5
+naglądać|na=glą=dać|5
+nagrzany|na=grza=ny|5
+nagłym|na=głym|5
+najczęściej|naj=czę=ściej|5
+najmilejsza|naj=mi=lej=sza|5
+najmniej|naj=mniej|5
+najpierwej|naj=pier=wej|5
+najspokojniej|naj=spo=koj=niej|5
+największe|naj=więk=sze|5
+największą|naj=więk=szą|5
+namyśle|na=my=śle|5
+naprędce|na=pręd=ce|5
+naradę|na=ra=dę|5
+narobiła|na=ro=bi=ła|5
+Narodzie|Na=ro=dzie|5
+narządzić|na=rzą=dzić|5
+nastawał|na=sta=wał|5
+naszczekiwania|na=szcze=ki=wa=nia|5
+natknąwszy|na=tknąw=szy|5
+nawrócił|na=wró=cił|5
+niebieską|nie=bie=ską|5
+nieboszczyk|nie=bosz=czyk|5
+niedaleczko|nie=da=lecz=ko|5
+Niedługo|Nie=dłu=go|5
+niegdzie|nie=gdzie|5
+niejedni|nie=jed=ni|5
+nienawiści|nie=na=wi=ści|5
+nienawiść|nie=na=wiść|5
+nieodstępnie|nie=od=stęp=nie|5
+niepamięci|nie=pa=mię=ci|5
+niepomiernie|nie=po=mier=nie|5
+nieprzejrzane|nie=przej=rza=ne|5
+nieprzerwanym|nie=prze=rwa=nym|5
+nieprzytomnym|nie=przy=tom=nym|5
+nieskończone|nie=skoń=czo=ne|5
+nieskończonym|nie=skoń=czo=nym|5
+niesporo|nie=spo=ro|5
+nieszczęsna|nie=szczę=sna|5
+nieszczęścia|nie=szczę=ścia|5
+nieszporach|nie=szpo=rach|5
+nieubłaganą|nie=ubła=ga=ną|5
+nieustępliwie|nie=ustę=pli=wie|5
+nieustępliwy|nie=ustę=pli=wy|5
+niewola|nie=wo=la|5
+niezgorsza|nie=zgor=sza|5
+niezgłębioną|nie=zgłę=bio=ną|5
+niezmierną|nie=zmier=ną|5
+nikiej|ni=kiej|5
+nowinki|no=win=ki|5
+Nowoczesna|No=wo=cze=sna|5
+Obaczcie|Obacz=cie|5
+Obaczycie|Oba=czy=cie|5
+Obejrzała|Obej=rza=ła|5
+obrazik|ob=ra=zik|5
+obrazu|ob=ra=zu|5
+obroku|ob=ro=ku|5
+obrosłe|ob=ro=słe|5
+obszedł|ob=szedł|5
+obwisłe|ob=wi=słe|5
+obwisłymi|ob=wi=sły=mi|5
+obłożony|ob=ło=żo=ny|5
+ocierając|ocie=ra=jąc|5
+oczymgnieniu|oczym=gnie=niu|5
+odbierze|od=bie=rze|5
+oddawał|od=da=wał|5
+odejściu|odej=ściu|5
+oderwał|ode=rwał|5
+odgłosy|od=gło=sy|5
+odjechał|od=je=chał|5
+odkrzyknęła|od=krzyk=nę=ła|5
+odmawiać|od=ma=wiać|5
+odmawiał|od=ma=wiał|5
+odprawiała|od=pra=wia=ła|5
+odwracały|od=wra=ca=ły|5
+odzywała|od=zy=wa=ła|5
+odzywały|od=zy=wa=ły|5
+odświętnie|od=święt=nie|5
+oganiać|oga=niać|5
+ogląda|oglą=da|5
+ogniami|ognia=mi|5
+ognisty|ogni=sty|5
+ogrodzenie|ogro=dze=nie|5
+ogromna|ogrom=na|5
+ojcowa|oj=co=wa|5
+ojcowy|oj=co=wy|5
+okolicach|oko=li=cach|5
+okresach|okre=sach|5
+okrwawiony|okrwa=wio=ny|5
+oktawę|okta=wę|5
+okwiat|okwiat|5
+omijali|omi=ja=li|5
+opamiętała|opa=mię=ta=ła|5
+oparcie|opar=cie|5
+opowiadań|opo=wia=dań|5
+oprócz|oprócz|5
+orzydla|orzy=dla|5
+ostaje|osta=je|5
+ostaniesz|osta=niesz|5
+ostatek|osta=tek|5
+ostatniego|ostat=nie=go|5
+ostrym|ostrym|5
+oszroniałych|oszro=nia=łych|5
+otwartych|otwar=tych|5
+otwierając|otwie=ra=jąc|5
+otworzyła|otwo=rzy=ła|5
+ozewrzeć|ozew=rzeć|5
+ozimin|ozi=min|5
+oziminy|ozi=mi=ny|5
+oślepłe|ośle=płe|5
+paczkę|pacz=kę|5
+padając|pa=da=jąc|5
+palmami|pal=ma=mi|5
+pamiętajcie|pa=mię=taj=cie|5
+pamiętam|pa=mię=tam|5
+Panienka|Pa=nien=ka|5
+papierem|pa=pie=rem|5
+parafia|pa=ra=fia|5
+parszywego|par=szy=we=go|5
+parzył|pa=rzył|5
+parzyła|pa=rzy=ła|5
+pasiastych|pa=sia=stych|5
+paskudny|pa=skud=ny|5
+pastwiska|pa=stwi=ska|5
+patrzeli|pa=trze=li|5
+patrzyli|pa=trzy=li|5
+pewnością|pew=no=ścią|5
+pełzały|peł=za=ły|5
+pierun|pie=run|5
+pierzyna|pie=rzy=na|5
+piesku|pie=sku|5
+Pietras|Pie=tras|5
+pijani|pi=ja=ni|5
+pijanica|pi=ja=ni=ca|5
+pijcie|pij=cie|5
+pilnujcie|pil=nuj=cie|5
+pisane|pi=sa=ne|5
+pisarzem|pi=sa=rzem|5
+piskorz|pi=skorz|5
+piszczy|pisz=czy|5
+pięciu|pię=ciu|5
+piękna|pięk=na|5
+Piękny|Pięk=ny|5
+plątała|plą=ta=ła|5
+plątały|plą=ta=ły|5
+pobladły|po=bla=dły|5
+pocałowała|po=ca=ło=wa=ła|5
+pochylając|po=chy=la=jąc|5
+pociągnęli|po=cią=gnę=li|5
+poczciwa|po=czci=wa|5
+poczeka|po=cze=ka|5
+poczerwieniał|po=czer=wie=niał|5
+poczynało|po=czy=na=ło|5
+poczynały|po=czy=na=ły|5
+podatek|po=da=tek|5
+podawał|po=da=wał|5
+podjadł|pod=jadł|5
+Podniesienie|Pod=nie=sie=nie|5
+podnosili|pod=no=si=li|5
+podobna|po=dob=na|5
+podorędziu|po=do=rę=dziu|5
+podrapał|po=dra=pał|5
+podtykała|pod=ty=ka=ła|5
+podzieje|po=dzie=je|5
+podzieję|po=dzie=ję|5
+podzięce|po=dzię=ce|5
+pogadywała|po=ga=dy=wa=ła|5
+pogadywały|po=ga=dy=wa=ły|5
+pogardliwie|po=gar=dli=wie|5
+Pogoda|Po=go=da|5
+pogroza|po=gro=za|5
+pogrozy|po=gro=zy|5
+pogwizdywał|po=gwiz=dy=wał|5
+pogłaskał|po=gła=skał|5
+pojadał|po=ja=dał|5
+Pokażcie|Po=każ=cie|5
+pokosy|po=ko=sy|5
+pokrako|po=kra=ko|5
+pokryte|po=kry=te|5
+pokrywał|po=kry=wał|5
+pokrzykiwał|po=krzy=ki=wał|5
+pokręcił|po=krę=cił|5
+pokutę|po=ku=tę|5
+pokładali|po=kła=da=li|5
+polazł|po=lazł|5
+poleci|po=le=ci|5
+pomagając|po=ma=ga=jąc|5
+pomagało|po=ma=ga=ło|5
+pomarli|po=mar=li|5
+pomarła|po=mar=ła|5
+pomarłych|po=mar=łych|5
+pomiarkowali|po=miar=ko=wa=li|5
+pomiarkuj|po=miar=kuj|5
+pomogły|po=mo=gły|5
+pomstować|po=msto=wać|5
+pomstowała|po=msto=wa=ła|5
+poniechaj|po=nie=chaj|5
+poniechali|po=nie=cha=li|5
+popołudnie|po=po=łu=dnie|5
+poprowadzi|po=pro=wa=dzi|5
+popuścić|po=pu=ścić|5
+portek|por=tek|5
+porwali|po=rwa=li|5
+Porwał|Po=rwał|5
+porywając|po=ry=wa=jąc|5
+porębie|po=rę=bie|5
+postawi|po=sta=wi|5
+postawią|po=sta=wią|5
+postawiła|po=sta=wi=ła|5
+postąpił|po=stą=pił|5
+posypał|po=sy=pał|5
+Poszłabym|Po=szła=bym|5
+posępne|po=sęp=ne|5
+posępnie|po=sęp=nie|5
+posłać|po=słać|5
+posłuchu|po=słu=chu|5
+potrafiła|po=tra=fi=ła|5
+potrzebie|po=trze=bie|5
+potężne|po=tęż=ne|5
+Powiadają|Po=wia=da=ją|5
+Powiadam|Po=wia=dam|5
+Powiadał|Po=wia=dał|5
+Powiedają|Po=wie=da=ją|5
+powiedając|po=wie=da=jąc|5
+Powiedali|Po=wie=da=li|5
+powiedzcie|po=wiedz=cie|5
+powiedzenie|po=wie=dze=nie|5
+Powiedziałem|Po=wie=dzia=łem|5
+powiekami|po=wie=ka=mi|5
+powiesić|po=wie=sić|5
+powiew|po=wiew|5
+powinno|po=win=no|5
+powinny|po=win=ny|5
+powlekła|po=wle=kła|5
+powrósła|po=wró=sła|5
+powstały|po=wsta=ły|5
+pozdrawiał|po=zdra=wiał|5
+poznali|po=zna=li|5
+pozostać|po=zo=stać|5
+pozwalał|po=zwa=lał|5
+pozwolił|po=zwo=lił|5
+pozwolę|po=zwo=lę|5
+połcie|po=łcie|5
+połowę|po=ło=wę|5
+Południe|Po=łu=dnie|5
+pożaru|po=ża=ru|5
+pożywi|po=ży=wi|5
+pradziada|pra=dzia=da|5
+prażyło|pra=ży=ło|5
+proboszczem|pro=bosz=czem|5
+progach|pro=gach|5
+prosiaka|pro=sia=ka|5
+prosięta|pro=się=ta|5
+prosiętami|pro=się=ta=mi|5
+proste|pro=ste|5
+Prosto|Pro=sto|5
+prostowała|pro=sto=wa=ła|5
+prosty|pro=sty|5
+proszalne|pro=szal=ne|5
+proszonym|pro=szo=nym|5
+przebierały|prze=bie=ra=ły|5
+przebrał|prze=brał|5
+przechylił|prze=chy=lił|5
+przecie|prze=cie|5
+przeciągały|prze=cią=ga=ły|5
+przeciągnął|prze=cią=gnął|5
+przeczytał|prze=czy=tał|5
+przednim|przed=nim|5
+przegryźć|prze=gryźć|5
+przejmowały|przej=mo=wa=ły|5
+przejrzyste|przej=rzy=ste|5
+przekładał|prze=kła=dał|5
+przelewa|prze=le=wa|5
+przemawiać|prze=ma=wiać|5
+przemienił|prze=mie=nił|5
+przemogła|prze=mo=gła|5
+przemoże|prze=mo=że|5
+przemyślnie|prze=myśl=nie|5
+przeniesła|prze=nie=sła|5
+przenikliwy|prze=ni=kli=wy|5
+przenosiny|prze=no=si=ny|5
+Przepijcie|Prze=pij=cie|5
+przepiórki|prze=piór=ki|5
+przepomniał|prze=po=mniał|5
+przepomniała|prze=po=mnia=ła|5
+przepraszać|prze=pra=szać|5
+przeraźliwie|prze=raź=li=wie|5
+przerywając|prze=ry=wa=jąc|5
+przeschnie|prze=schnie|5
+przesiadywał|prze=sia=dy=wał|5
+przesiedział|prze=sie=dział|5
+przestała|prze=sta=ła|5
+przetak|prze=tak|5
+Przewrotny|Prze=wrot=ny|5
+przezwiska|prze=zwi=ska|5
+przezwisko|prze=zwi=sko|5
+przełknąć|prze=łknąć|5
+prześmiewał|prze=śmie=wał|5
diff --git a/test/run_differential_rounding_test.sh b/test/run_differential_rounding_test.sh
index dd7aa5c7..e73aaf0e 100755
--- a/test/run_differential_rounding_test.sh
+++ b/test/run_differential_rounding_test.sh
@@ -10,6 +10,7 @@ mkdir -p "$BUILD_DIR"
 SOURCES=(
   "$ROOT_DIR/test/differential_rounding/DifferentialRoundingTest.cpp"
   "$ROOT_DIR/lib/EpdFont/EpdFont.cpp"
+  "$ROOT_DIR/lib/EpdFont/EpdFontFamily.cpp"
   "$ROOT_DIR/lib/Utf8/Utf8.cpp"
 )