update

fix
2026-03-28 17:42:44 +01:00 · 2026-03-26 17:05:58 +11:00 · 2026-03-26 17:03:05 +11:00 · 2026-03-26 16:52:19 +11:00 · 2026-03-26 16:41:00 +11:00 · 2026-03-26 15:35:55 +11:00
53 changed files with 7905 additions and 1133 deletions
--- a/README.md
+++ b/README.md
@@ -1,25 +1,31 @@
 ## Meshcore + Fork = Meck

-A fork created specifically to focus on enabling BLE & WiFi companion firmware for the LilyGo T-Deck Pro & LilyGo T5 E-Paper S3 Pro. Created with the assistance of Claude AI using Meshcore v1.11 code.
+A fork created specifically to focus on enabling BLE & WiFi companion firmware for the LilyGo T-Deck Pro & LilyGo T5 E-Paper S3 Pro. Created wholly with Claude AI using Meshcore v1.11 code. 100% vibecoded.
+
+[Check out the Meck discussion channel on the MeshCore Discord](https://discord.com/channels/1343693475589263471/1460136499390447670)

 <img src="https://github.com/user-attachments/assets/b30ce6bd-79af-44d3-93c4-f5e7e21e5621" alt="IMG_1453" width="300" height="650">

 ### Contents
 - [Supported Devices](#supported-devices)
+- [SD Card Requirements](#sd-card-requirements)
 - [Flashing Firmware](#flashing-firmware)
  - [First-Time Flash (Merged Firmware)](#first-time-flash-merged-firmware)
  - [Upgrading Firmware](#upgrading-firmware)
-  - [SD Card Launcher](#sd-card-launcher)
+  - [Launcher](#launcher)
+  - [OTA Firmware Update](#ota-firmware-update-v13)
 - [Path Hash Mode (v0.9.9+)](#path-hash-mode-v099)
 - [T-Deck Pro](#t-deck-pro)
  - [Build Variants](#t-deck-pro-build-variants)
  - [Keyboard Controls](#t-deck-pro-keyboard-controls)
  - [Navigation (Home Screen)](#navigation-home-screen)
  - [Bluetooth (BLE)](#bluetooth-ble)
+  - [WiFi Companion](#wifi-companion)
  - [Clock & Timezone](#clock--timezone)
  - [Channel Message Screen](#channel-message-screen)
  - [Contacts Screen](#contacts-screen)
  - [Sending a Direct Message](#sending-a-direct-message)
+  - [Roomservers](#roomservers)
  - [Repeater Admin Screen](#repeater-admin-screen)
  - [Settings Screen](#settings-screen)
  - [Compose Mode](#compose-mode)
@@ -27,6 +33,7 @@ A fork created specifically to focus on enabling BLE & WiFi companion firmware f
  - [Emoji Picker](#emoji-picker)
  - [SMS & Phone App (4G only)](#sms--phone-app-4g-only)
  - [Web Browser & IRC](#web-browser--irc)
+  - [Lock Screen (T-Deck Pro)](#lock-screen-t-deck-pro)
 - [T5S3 E-Paper Pro](#t5s3-e-paper-pro)
  - [Build Variants](#t5s3-build-variants)
  - [Touch Navigation](#touch-navigation)
@@ -70,13 +77,21 @@ Both devices use the ESP32-S3 with 16 MB flash and 8 MB PSRAM.

 ---

+## SD Card Requirements
+
+**An SD card is essential for Meck to function properly.** Many features — including the e-book reader, notes, bookmarks, web reader cache, audiobook playback, firmware updates, contact import/export, and WiFi credential storage — rely on files stored on the SD card. Without an SD card inserted, the device will boot and handle mesh messaging, but most extended features will be unavailable or will fail silently.
+
+**Recommended:** A **32 GB or larger** microSD card formatted as **FAT32**. MeshCore users have found that **SanDisk** microSD cards are the most reliable across both the T-Deck Pro and T5S3.
+
+---
+
 ## Flashing Firmware

 Download the latest firmware from the [Releases](https://github.com/pelgraine/Meck/releases) page. Each release includes two types of `.bin` files per build variant:

 | File Type | When to Use |
 |-----------|-------------|
-| `*_merged.bin` | **First-time flash** — includes bootloader, partition table, and firmware in a single file. Flash at address `0x0`. |
+| `*-merged.bin` | **First-time flash** — includes bootloader, partition table, and firmware in a single file. Flash at address `0x0`. |
 | `*.bin` (non-merged) | **Upgrading existing firmware** — firmware image only. Also used when loading firmware from an SD card via the Launcher. |

 ### First-Time Flash (Merged Firmware)
@@ -87,7 +102,7 @@ If the device has never had Meck firmware (or you want a clean start), use the *

 ```
 esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 \
-  write_flash 0x0 meck_t5s3_standalone_merged.bin
+  write_flash 0x0 meck_t5s3_standalone-merged.bin
 ```

 On macOS the port is typically `/dev/cu.usbmodem*`. On Windows it will be a COM port like `COM3`.
@@ -99,7 +114,7 @@ On macOS the port is typically `/dev/cu.usbmodem*`. On Windows it will be a COM
 3. Select the **merged** `.bin` file you downloaded
 4. Click **Flash**, select your device in the popup, and click **Connect**

-> **Note:** The MeshCore Flasher flashes at address `0x0` by default, so the merged file is the correct choice here for first-time flashes.
+> **Note:** The MeshCore Flasher detects merged firmware by the `-merged.bin` suffix in the filename and automatically flashes at address `0x0`. If the filename doesn't end with `-merged.bin`, the flasher writes at `0x10000` instead, which will fail on a clean device.

 ### Upgrading Firmware

@@ -114,10 +129,25 @@ esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 \

 > **Tip:** If you're unsure whether the device already has a bootloader, it's always safe to use the merged file and flash at `0x0` — it will overwrite everything cleanly.

-### SD Card Launcher
+### Launcher

 If you're loading firmware from an SD card via the LilyGo Launcher firmware, use the **non-merged** `.bin` file. The Launcher provides its own bootloader and only needs the application image.

+### OTA Firmware Update (v1.3+)
+
+Once Meck is installed, you can update firmware directly from your phone — no computer or serial cable required. The device creates a temporary WiFi access point and you upload the new `.bin` via your phone's browser.
+
+1. Download the new **non-merged** `.bin` to your phone (from GitHub Releases, Discord, etc.)
+2. On the device: **Settings → Firmware Update → Enter** (T-Deck Pro) or **tap** (T5S3)
+3. The device starts a WiFi network called `Meck-Update-XXXX` and displays connection details
+4. On your phone: connect to the `Meck-Update` WiFi network, open a browser, go to `192.168.4.1`
+5. Tap **Choose File**, select the `.bin`, tap **Upload**
+6. The device receives the file, saves to SD, verifies, flashes, and reboots
+
+The partition layout supports dual OTA slots — the old firmware remains on the inactive partition as an automatic rollback target. If the new firmware fails to boot, the ESP32 bootloader reverts to the previous working version automatically.
+
+> **Note:** Use the **non-merged** `.bin` for OTA updates. The merged binary is only needed for first-time USB flashing.
+
 ---

 ## Path Hash Mode (v0.9.9+)
@@ -149,8 +179,10 @@ For a detailed explanation of what multibyte path hash means and why it matters,
 | Variant | Environment | BLE | WiFi | 4G Modem | Audio DAC | Web Reader | Max Contacts |
 |---------|------------|-----|------|----------|-----------|------------|-------------|
 | Audio + BLE | `meck_audio_ble` | Yes | Yes (via BLE stack) | — | PCM5102A | Yes | 500 |
+| Audio + WiFi | `meck_audio_wifi` | — | Yes (TCP:5000) | — | PCM5102A | Yes | 1,500 |
 | Audio + Standalone | `meck_audio_standalone` | — | — | — | PCM5102A | No | 1,500 |
 | 4G + BLE | `meck_4g_ble` | Yes | Yes | A7682E | — | Yes | 500 |
+| 4G + WiFi | `meck_4g_wifi` | — | Yes (TCP:5000) | A7682E | — | Yes | 1,500 |
 | 4G + Standalone | `meck_4g_standalone` | — | Yes | A7682E | — | Yes | 1,500 |

 The audio DAC and 4G modem occupy the same hardware slot and are mutually exclusive.
@@ -175,8 +207,10 @@ The T-Deck Pro firmware includes full keyboard support for standalone messaging
 | T | Open SMS & Phone app (4G variant only) |
 | P | Open audiobook player (audio variant only) |
 | F | Open node discovery (search for nearby repeaters/nodes) |
+| H | Open last heard list (passive advert history) |
 | G | Open map screen (shows contacts with GPS positions) |
 | Q | Back to home screen |
+| Double-click Boot | Lock / unlock screen |

 ### Bluetooth (BLE)

@@ -184,12 +218,29 @@ BLE is **disabled by default** at boot to support standalone-first operation. Th

 To connect to the MeshCore companion app, navigate to the **Bluetooth** home page (use D to page through) and press **Enter** to toggle BLE on. The BLE PIN will be displayed on screen. Toggle it off again the same way when you're done.

+### WiFi Companion
+
+The WiFi companion variants (`meck_audio_wifi`, `meck_4g_wifi`) connect to the MeshCore web app, meshcore.js, or Python CLI over your local network via TCP on port 5000. WiFi credentials are stored on the SD card at `/web/wifi.cfg`.
+
+**Connecting:**
+
+1. Navigate to the **WiFi** home page (use D to page through)
+2. Press **Enter** to toggle WiFi on
+3. The device scans for networks — select yours and enter the password
+4. Once connected, the IP address is displayed on the WiFi home page
+
+Connect the MeshCore web app or meshcore.js to `<device IP>:5000`.
+
+WiFi is also used by the web reader and IRC client on WiFi variants. The web reader shares the same connection — no extra setup needed.
+
+> **Tip:** WiFi variants support up to 1,500 contacts (vs 500 for BLE variants) because they are not constrained by the BLE protocol ceiling.
+
 ### Clock & Timezone

-The T-Deck Pro does not include a dedicated RTC chip, so after each reboot the device clock starts unset. The clock will appear in the nav bar (between node name and battery) once the time has been synced by one of two methods:
+The T-Deck Pro does not include a dedicated RTC chip, so after each reboot the device clock starts unset. The clock will appear in the nav bar (between node name and battery) once the time has been synced by one of these methods:

 1. **GPS fix** (standalone) — Once the GPS acquires a satellite fix, the time is automatically synced from the NMEA data. No phone or BLE connection required. Typical time to first fix is 30–90 seconds outdoors with clear sky.
-2. **BLE companion app** — If BLE is enabled and connected to the MeshCore companion app, the app will push the current time to the device.
+2. **BLE/WiFi companion app** — If connected to the MeshCore companion app (via BLE or WiFi), the app will push the current time to the device.

 **Setting your timezone:**

@@ -211,7 +262,7 @@ The GPS page also shows the current time, satellite count, position, altitude, a
 | Key | Action |
 |-----|--------|
 | W / S | Scroll messages up/down |
-| A / D | Switch between channels |
+| A / D | Switch between channels (press D past the last channel to reach the DM inbox, A to return) |
 | Enter | Compose new message |
 | R | Reply to a message — enter reply select mode, scroll to a message with W/S, then press Enter to compose a reply with an @mention |
 | V | View relay path of the last received message (scrollable, up to 20 hops) |
@@ -230,12 +281,24 @@ Press **C** from the home screen to open the contacts list. All known mesh conta
 | R | Import contacts from SD card (wait 5–10 seconds for confirmation popup) |
 | Q | Back to home screen |

-**Contact limits:** Standalone variants support up to 1,500 contacts (stored in PSRAM). BLE variants (both Audio-BLE and 4G-BLE) are limited to 500 contacts due to BLE protocol constraints.
+**Contact limits:** Standalone and WiFi variants support up to 1,500 contacts (stored in PSRAM). BLE variants (Audio-BLE and 4G-BLE) are limited to 500 contacts due to BLE protocol constraints.

 ### Sending a Direct Message

 Select a **Chat** contact in the contacts list and press **Enter** to start composing a direct message. The compose screen will show `DM: ContactName` in the header. Type your message and press **Enter** to send. The DM is sent encrypted directly to that contact (or flooded if no direct path is known). After sending or cancelling, you're returned to the contacts list.

+Contacts with unread direct messages show a `*` marker next to their name in the contacts list.
+
+**Reading received DMs:** On the Channel Messages screen, press **D** past the last group channel to reach the **DM inbox**. This shows all received direct messages with sender name and timestamp. Entering the DM inbox marks all DM messages as read and clears the unread indicator. Press **A** to return to group channels.
+
+### Roomservers
+
+Room servers are MeshCore nodes that host persistent chat rooms. Messages sent to a room server are stored and relayed to anyone who logs in. In Meck, room server messages arrive as contact messages and appear in the DM inbox alongside regular direct messages.
+
+To interact with a room server, navigate to the Contacts screen, filter to **Room** contacts, select the room, and press **Enter** to open the Repeater Admin screen. Log in with the room's admin password to access room administration. On successful login, all unread messages from that room are automatically marked as read.
+
+Room server messages are also synced to the companion app when connected via BLE or WiFi — the companion app will pull and display them alongside other messages.
+
 ### Repeater Admin Screen

 Select a **Repeater** contact in the contacts list and press **Enter** to open the repeater admin screen. You'll be prompted for the repeater's admin password. Characters briefly appear as you type them before being masked, making it easier to enter symbols and numbers on the T-Deck Pro keyboard.
@@ -266,8 +329,8 @@ Press **S** from the home screen to open settings. On first boot (when the devic
 | Key | Action |
 |-----|--------|
 | W / S | Navigate up / down through settings |
-| Enter | Edit selected setting |
-| Q | Back to home screen |
+| Enter | Edit selected setting, or enter a sub-screen |
+| Q | Back one level (sub-screen → top level → home screen) |

 **Available settings:**

@@ -275,17 +338,26 @@ Press **S** from the home screen to open settings. On first boot (when the devic
 |---------|-------------|
 | Device Name | Text entry — type a name, Enter to confirm |
 | Radio Preset | A / D to cycle presets (MeshCore Default, Long Range, Fast/Short, EU Default), Enter to apply |
-| Frequency | W / S to adjust, Enter to confirm |
+| Frequency | Text entry — type exact value (e.g. 916.575), Enter to confirm |
 | Bandwidth | W / S to cycle standard values (31.25 / 62.5 / 125 / 250 / 500 kHz), Enter to confirm |
 | Spreading Factor | W / S to adjust (5–12), Enter to confirm |
 | Coding Rate | W / S to adjust (5–8), Enter to confirm |
 | TX Power | W / S to adjust (1–20 dBm), Enter to confirm |
 | UTC Offset | W / S to adjust (-12 to +14), Enter to confirm |
-| Path Hash Mode | A / D to cycle (0 = 1-byte, 1 = 2-byte, 2 = 3-byte), Enter to confirm |
-| Channels | View existing channels, add hashtag channels, or delete non-primary channels (X) |
+| Msg Rcvd LED Pulse | Toggle keyboard backlight flash on new message (Enter to toggle) |
+| GPS Baud Rate | A / D to cycle (Default 38400 / 4800 / 9600 / 19200 / 38400 / 57600 / 115200), Enter to confirm. **Requires reboot to take effect.** |
+| Path Hash Mode | W / S to cycle (1-byte / 2-byte / 3-byte), Enter to confirm |
+| Dark Mode | Toggle inverted display — white text on black background (Enter to toggle) |
+| Auto Lock | A / D to cycle timeout (None / 2 / 5 / 10 / 15 / 30 min), Enter to confirm |
+| Contacts >> | Opens the Contacts sub-screen (see below) |
+| Channels >> | Opens the Channels sub-screen (see below) |
 | Device Info | Public key and firmware version (read-only) |

-The bottom of the settings screen also displays your node ID and firmware version. On the 4G variant, IMEI, carrier name, and APN details are shown here as well.
+**Contacts sub-screen** — press Enter on the `Contacts >>` row to open. Contains the contact auto-add mode picker (Auto All / Custom / Manual) and, when set to Custom, per-type toggles for Chat, Repeater, Room Server, Sensor, and an Overwrite Oldest option. Press Q to return to the top-level settings list.
+
+**Channels sub-screen** — press Enter on the `Channels >>` row to open. Lists all current channels, with an option to add hashtag channels or delete non-primary channels (X). Press Q to return to the top-level settings list.
+
+The top-level settings screen also displays your node ID and firmware version. On the 4G variant, IMEI, carrier name, and APN details are shown here as well.

 When adding a hashtag channel, type the channel name and press Enter. The channel secret is automatically derived from the name via SHA-256, matching the standard MeshCore hashtag convention.

@@ -346,7 +418,7 @@ For full documentation including key mappings, dialpad usage, contacts managemen

 ### Web Browser & IRC

-Press **B** from the home screen to open the web reader. This is available on the BLE and 4G variants (not the standalone audio variant, which excludes WiFi to preserve lowest-battery-usage design).
+Press **B** from the home screen to open the web reader. This is available on the BLE, WiFi, and 4G variants (not the standalone audio variant, which excludes WiFi to preserve lowest-battery-usage design).

 The web reader home screen provides access to the **IRC client**, the **URL bar**, and your **bookmarks** and **history**. Select IRC Chat and press Enter to configure and connect to an IRC server. Select the URL bar to enter a web address, or scroll down to open a bookmark or history entry.

@@ -354,6 +426,14 @@ The browser is a text-centric reader best suited to text-heavy websites. It also

 For full documentation including key mappings, WiFi setup, bookmarks, IRC configuration, and SD card structure, see the [Web App Guide](Web_App_Guide.md).

+### Lock Screen (T-Deck Pro)
+
+Double-click the Boot button to lock the screen. The lock screen shows the current time, battery percentage, and unread message count. The CPU drops to 40 MHz while locked to reduce power consumption.
+
+Double-click the Boot button again to unlock and return to whatever screen you were on.
+
+An auto-lock timer can be configured in **Settings → Auto Lock** (None / 2 / 5 / 10 / 15 / 30 minutes of idle time).
+
 ---

 ## T5S3 E-Paper Pro
@@ -423,6 +503,8 @@ Long press the Boot button to lock the device. The lock screen shows:

 Touch input is completely disabled while locked. Long press the Boot button again to unlock and return to whatever screen you were on.

+An auto-lock timer can be configured in **Settings → Auto Lock** (None / 2 / 5 / 10 / 15 / 30 minutes of idle time). The CPU drops to 40 MHz while locked to reduce power consumption.
+
 ### Virtual Keyboard

 Since the T5S3 has no physical keyboard, a full-screen QWERTY virtual keyboard appears automatically when text input is needed (composing messages, entering WiFi passwords, editing settings, etc.).
@@ -435,14 +517,20 @@ The virtual keyboard supports:

 Tap keys to type. Tap **Enter** to submit, or press the **Boot button** to cancel and close the keyboard.

+### External Keyboard (CardKB)
+
+The T5S3 supports the M5Stack CardKB (or compatible I2C keyboard) connected via the QWIIC port. When detected at boot, the CardKB can be used for all text input — composing messages, entering URLs, editing notes, and navigating menus — without the on-screen virtual keyboard.
+
+The CardKB is auto-detected on the I2C bus at address `0x5F`. No configuration is needed — just plug it in.
+
 ### Display Settings

-The T5S3 Settings screen includes two additional options not available on the T-Deck Pro:
+The T5S3 Settings screen includes one additional display option not available on the T-Deck Pro:

 | Setting | Description |
 |---------|-------------|
-| **Dark Mode** | Inverts the display — white text on black background. Tap to toggle on/off. |
-| **Portrait Mode** | Rotates the display 90° from landscape (960×540) to portrait (540×960). Touch coordinates are automatically remapped. Text reader layout recalculates on orientation change. |
+| **Dark Mode** | Inverts the display — white text on black background. Tap to toggle on/off. Available on both T-Deck Pro and T5S3. |
+| **Portrait Mode** | Rotates the display 90° from landscape (960×540) to portrait (540×960). Touch coordinates are automatically remapped. Text reader layout recalculates on orientation change. T5S3 only. |

 These settings are persisted and survive reboots.

@@ -481,7 +569,7 @@ The UTC offset is configured in the Settings screen (same as T-Deck Pro) and is
 | Gesture | Action |
 |---------|--------|
 | Swipe up / down | Scroll messages |
-| Swipe left / right | Switch between channels |
+| Swipe left / right | Switch between channels (swipe left past the last channel to reach the DM inbox) |
 | Tap footer area | View relay path of last received message |
 | Tap path overlay | Dismiss overlay |
 | Long press (touch) | Open virtual keyboard to compose message to current channel |
@@ -493,7 +581,7 @@ The UTC offset is configured in the Settings screen (same as T-Deck Pro) and is
 | Swipe up / down | Scroll through contacts |
 | Swipe left / right | Cycle contact filter (All → Chat → Repeater → Room → Sensor → Favourites) |
 | Tap | Select contact |
-| Long press on Chat contact | Open virtual keyboard to compose DM |
+| Long press on Chat contact | View unread DMs (if any), then compose DM |
 | Long press on Repeater contact | Open repeater admin login |

 #### Text Reader (File List)
@@ -508,6 +596,7 @@ The UTC offset is configured in the Settings screen (same as T-Deck Pro) and is
 | Gesture | Action |
 |---------|--------|
 | Tap anywhere | Next page |
+| Tap footer bar | Go to page number (via virtual keyboard) |
 | Swipe left | Next page |
 | Swipe right | Previous page |
 | Swipe up / down | Next / previous page |
@@ -548,8 +637,16 @@ The UTC offset is configured in the Settings screen (same as T-Deck Pro) and is
 | Gesture | Action |
 |---------|--------|
 | Swipe up / down | Scroll node list |
+| Tap | Add selected node to contacts |
 | Long press | Rescan for nodes |

+#### Last Heard
+
+| Gesture | Action |
+|---------|--------|
+| Swipe up / down | Scroll advert list |
+| Tap | Add to or delete from contacts |
+
 #### Repeater Admin

 | Gesture | Action |
@@ -610,9 +707,9 @@ For developers:

 **Companion Firmware**

-The companion firmware can be connected to via BLE (T-Deck Pro and T5S3 BLE variants) or WiFi (T5S3 WiFi variant, TCP port 5000).
+The companion firmware can be connected to via BLE (T-Deck Pro and T5S3 BLE variants) or WiFi (T-Deck Pro WiFi variants and T5S3 WiFi variant, TCP port 5000).

-> **Note:** On both the T-Deck Pro and T5S3, BLE is disabled by default at boot. On the T-Deck Pro, navigate to the Bluetooth home page and press Enter to enable BLE. On the T5S3, navigate to the Bluetooth home page and long-press the screen to toggle BLE on.
+> **Note:** On both the T-Deck Pro and T5S3, BLE and WiFi are disabled by default at boot. On the T-Deck Pro, navigate to the Bluetooth or WiFi home page and press Enter to enable. On the T5S3, navigate to the Bluetooth home page and long-press the screen to toggle BLE on.

 - Web: https://app.meshcore.nz
 - Android: https://play.google.com/store/apps/details?id=com.liamcottle.meshcore.android
@@ -649,17 +746,26 @@ There are a number of fairly major features in the pipeline, with no particular
 - [X] Settings screen with radio presets, channel management, and first-boot onboarding
 - [X] Expand SMS app to enable phone calls
 - [X] Basic web reader app with IRC client
+- [X] Lock screen with auto-lock timer and low-power standby
+- [X] Last heard passive advert list
+- [X] Touch-to-select on contacts, discovery, settings, text reader, notes screens
+- [X] Map screen with GPS tile rendering
+- [X] WiFi companion environment
+- [X] OTA firmware update via phone
+- [X] DM inbox with per-contact unread indicators
+- [X] Roomserver message handling and mark-read on login
 - [ ] Fix M4B rendering to enable chaptered audiobook playback
 - [ ] Better JPEG and PNG decoding
 - [ ] Improve EPUB rendering and EPUB format handling
- [ ] Map support with GPS
- [ ] WiFi companion environment
+- [ ] Figure out a way to silence the ringtone
+- [ ] Figure out a way to customise the ringtone
+- [ ] Customised user option for larger-font mode

 **T5S3 E-Paper Pro:**
 - [X] Core port: display, touch input, LoRa, battery, RTC
 - [X] Touch-navigable home screen with tappable tile grid
 - [X] Full virtual keyboard for text entry
- [X] Lock screen with clock, battery, and unread count
+- [X] Lock screen with clock, battery, unread count, and auto-lock timer
 - [X] Backlight control (double/triple-click Boot button)
 - [X] Dark mode and portrait mode display settings
 - [X] Channel messages with swipe navigation and touch compose
@@ -668,9 +774,14 @@ There are a number of fairly major features in the pipeline, with no particular
 - [X] Web reader with virtual keyboard URL/search entry (WiFi variant)
 - [X] Settings screen with touch editing
 - [X] Serial clock sync for hardware RTC
- [ ] Emoji sprites on home tiles
- [ ] Portrait mode toggle via quadruple-click Boot button
- [ ] Hibernate should auto-off backlight
+- [X] CardKB external keyboard support (via QWIIC)
+- [X] Last heard passive advert list
+- [X] Tap-to-select on contacts, discovery, settings, text reader, notes screens
+- [X] OTA firmware update via phone (WiFi variant)
+- [X] DM inbox with per-contact unread indicators
+- [X] Roomserver message handling and mark-read on login
+- [ ] Improve EPUB rendering and EPUB format handling
+- [ ] Customised user option for larger-font mode

 ## 📞 Get Support

--- a/Guide.md
+++ b/Guide.md
@@ -2,7 +2,7 @@

 ## Overview

-This adds a text reader accessible via the **R** key from the home screen.
+This adds a text reader accessible via the **E** key from the home screen.

 **Features:**
 - Browse `.txt` and `.epub` files from `/books/` folder on SD card
@@ -13,17 +13,27 @@ This adds a text reader accessible via the **R** key from the home screen.
 - Index files cached to SD for instant re-opens
 - Bookmark indicator (`*`) on files with saved positions

-**Key Mapping:**
+**Key Mapping (T-Deck Pro):**
 | Context | Key | Action |
 |---------|-----|--------|
 | Home screen | E | Open text reader |
 | File list | W/S | Navigate up/down |
-| File list | Enter | Open selected file |
+| File list | Tap / Enter | Open selected file |
 | File list | Q | Back to home screen |
 | Reading | W/A | Previous page |
-| Reading | S/D/Space/Enter | Next page |
+| Reading | S/D/Space | Next page |
+| Reading | Enter | Go to page number (type digits, Enter to confirm, Q to cancel) |
 | Reading | Q | Close book → file list |
-| Reading | C | Enter compose mode |
+
+**Touch Gestures (T5S3):**
+| Context | Gesture | Action |
+|---------|---------|--------|
+| File list | Swipe up/down | Scroll file list |
+| File list | Tap | Open selected book |
+| Reading | Tap | Next page |
+| Reading | Swipe left/right | Next / previous page |
+| Reading | Tap footer | Go to page number (via virtual keyboard) |
+| Reading | Long press | Close book → file list |

 ---

@@ -113,4 +123,4 @@ The conversion is handled by three components:
 - Page content is pre-read from SD into a memory buffer during `handleInput()`, then rendered from buffer during `render()` — this avoids SPI bus conflicts during display refresh
 - Layout metrics (chars per line, lines per page) are calculated dynamically from the display driver's font metrics on first entry
 - EPUB conversion runs synchronously in `openBook()` — the e-ink splash screen keeps the user informed while the ESP32 processes the archive
- ZIP extraction uses the ESP32-S3's hardware-optimised ROM `tinfl` inflate, avoiding external compression library dependencies and the linker conflicts they cause
+- ZIP extraction uses the ESP32-S3's hardware-optimised ROM `tinfl` inflate, avoiding external compression library dependencies and the linker conflicts they cause
--- a/boards/t-deck_pro_max.json
+++ b/boards/t-deck_pro_max.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_qspi",
+      "partitions": "default_16MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "LilyGo T-Deck Pro MAX (16MB Flash 8MB QSPI PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.lilygo.cc/products/t-deck-pro",
+  "vendor": "LilyGo"
+}
--- a/examples/companion_radio/DataStore.cpp
+++ b/examples/companion_radio/DataStore.cpp
@@ -252,6 +252,42 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
    if (_prefs.path_hash_mode > 2) _prefs.path_hash_mode = 0;
    if (_prefs.autoadd_max_hops > 64) _prefs.autoadd_max_hops = 0;

+    // v1.1+ Meck fields — may not exist in older prefs files
+    if (file.read((uint8_t *)&_prefs.gps_baudrate, sizeof(_prefs.gps_baudrate)) != sizeof(_prefs.gps_baudrate)) {
+      _prefs.gps_baudrate = 0;  // default: use compile-time GPS_BAUDRATE
+    }
+    if (file.read((uint8_t *)&_prefs.interference_threshold, sizeof(_prefs.interference_threshold)) != sizeof(_prefs.interference_threshold)) {
+      _prefs.interference_threshold = 0;  // default: disabled
+    }
+    if (file.read((uint8_t *)&_prefs.dark_mode, sizeof(_prefs.dark_mode)) != sizeof(_prefs.dark_mode)) {
+      _prefs.dark_mode = 0;  // default: light mode
+    }
+    if (file.read((uint8_t *)&_prefs.portrait_mode, sizeof(_prefs.portrait_mode)) != sizeof(_prefs.portrait_mode)) {
+      _prefs.portrait_mode = 0;  // default: landscape
+    }
+    if (file.read((uint8_t *)&_prefs.auto_lock_minutes, sizeof(_prefs.auto_lock_minutes)) != sizeof(_prefs.auto_lock_minutes)) {
+      _prefs.auto_lock_minutes = 0;  // default: disabled
+    }
+    if (file.read((uint8_t *)&_prefs.hint_shown, sizeof(_prefs.hint_shown)) != sizeof(_prefs.hint_shown)) {
+      _prefs.hint_shown = 0;  // default: show boot hint
+    }
+    if (file.read((uint8_t *)&_prefs.large_font, sizeof(_prefs.large_font)) != sizeof(_prefs.large_font)) {
+      _prefs.large_font = 0;  // default: tiny font
+    }
+
+    // Clamp to valid ranges
+    if (_prefs.dark_mode > 1) _prefs.dark_mode = 0;
+    if (_prefs.portrait_mode > 1) _prefs.portrait_mode = 0;
+    if (_prefs.hint_shown > 1) _prefs.hint_shown = 0;
+    if (_prefs.large_font > 1) _prefs.large_font = 0;
+    // auto_lock_minutes: only accept known options (0, 2, 5, 10, 15, 30)
+    {
+      uint8_t alm = _prefs.auto_lock_minutes;
+      if (alm != 0 && alm != 2 && alm != 5 && alm != 10 && alm != 15 && alm != 30) {
+        _prefs.auto_lock_minutes = 0;
+      }
+    }
+
    file.close();
  }
 }
@@ -291,6 +327,13 @@ void DataStore::savePrefs(const NodePrefs& _prefs, double node_lat, double node_
    file.write((uint8_t *)&_prefs.ringtone_enabled, sizeof(_prefs.ringtone_enabled));    // 90
    file.write((uint8_t *)&_prefs.path_hash_mode, sizeof(_prefs.path_hash_mode));        // 91
    file.write((uint8_t *)&_prefs.autoadd_max_hops, sizeof(_prefs.autoadd_max_hops));   // 92
+    file.write((uint8_t *)&_prefs.gps_baudrate, sizeof(_prefs.gps_baudrate));            // 93
+    file.write((uint8_t *)&_prefs.interference_threshold, sizeof(_prefs.interference_threshold)); // 97
+    file.write((uint8_t *)&_prefs.dark_mode, sizeof(_prefs.dark_mode));                  // 98
+    file.write((uint8_t *)&_prefs.portrait_mode, sizeof(_prefs.portrait_mode));          // 99
+    file.write((uint8_t *)&_prefs.auto_lock_minutes, sizeof(_prefs.auto_lock_minutes)); // 100
+    file.write((uint8_t *)&_prefs.hint_shown, sizeof(_prefs.hint_shown));               // 101
+    file.write((uint8_t *)&_prefs.large_font, sizeof(_prefs.large_font));               // 102

    file.close();
  }
@@ -443,6 +486,101 @@ void DataStore::saveContacts(DataStoreHost* host) {
  }
 }

+// =========================================================================
+// Chunked contact save — non-blocking across multiple loop iterations
+// =========================================================================
+
+bool DataStore::beginSaveContacts(DataStoreHost* host) {
+  if (_saveInProgress) return false;  // Already saving
+
+  FILESYSTEM* fs = _getContactsChannelsFS();
+  _saveFile = openWrite(fs, "/contacts3.tmp");
+  if (!_saveFile) {
+    Serial.println("DataStore: chunked save FAILED — cannot open tmp file");
+    return false;
+  }
+
+  _saveHost = host;
+  _saveIdx = 0;
+  _saveRecordsWritten = 0;
+  _saveWriteOk = true;
+  _saveInProgress = true;
+  Serial.println("DataStore: chunked save started");
+  return true;
+}
+
+bool DataStore::saveContactsChunk(int batchSize) {
+  if (!_saveInProgress || !_saveWriteOk) return false;
+
+  ContactInfo c;
+  uint8_t unused = 0;
+  int written = 0;
+
+  while (written < batchSize && _saveHost->getContactForSave(_saveIdx, c)) {
+    bool success = (_saveFile.write(c.id.pub_key, 32) == 32);
+    success = success && (_saveFile.write((uint8_t *)&c.name, 32) == 32);
+    success = success && (_saveFile.write(&c.type, 1) == 1);
+    success = success && (_saveFile.write(&c.flags, 1) == 1);
+    success = success && (_saveFile.write(&unused, 1) == 1);
+    success = success && (_saveFile.write((uint8_t *)&c.sync_since, 4) == 4);
+    success = success && (_saveFile.write((uint8_t *)&c.out_path_len, 1) == 1);
+    success = success && (_saveFile.write((uint8_t *)&c.last_advert_timestamp, 4) == 4);
+    success = success && (_saveFile.write(c.out_path, 64) == 64);
+    success = success && (_saveFile.write((uint8_t *)&c.lastmod, 4) == 4);
+    success = success && (_saveFile.write((uint8_t *)&c.gps_lat, 4) == 4);
+    success = success && (_saveFile.write((uint8_t *)&c.gps_lon, 4) == 4);
+
+    if (!success) {
+      _saveWriteOk = false;
+      Serial.printf("DataStore: chunked save write error at record %d\n", _saveIdx);
+      return false;  // Error — finishSaveContacts will clean up
+    }
+
+    _saveRecordsWritten++;
+    _saveIdx++;
+    written++;
+  }
+
+  // Check if there are more contacts to write
+  ContactInfo peek;
+  if (_saveHost->getContactForSave(_saveIdx, peek)) {
+    return true;  // More to write
+  }
+  return false;  // Done
+}
+
+void DataStore::finishSaveContacts() {
+  if (!_saveInProgress) return;
+
+  _saveFile.close();
+  _saveInProgress = false;
+
+  FILESYSTEM* fs = _getContactsChannelsFS();
+  const char* finalPath = "/contacts3";
+  const char* tmpPath   = "/contacts3.tmp";
+
+  // Verify
+  size_t expectedBytes = _saveRecordsWritten * 152;
+  File verify = openRead(fs, tmpPath);
+  size_t bytesWritten = verify ? verify.size() : 0;
+  if (verify) verify.close();
+
+  if (!_saveWriteOk || bytesWritten != expectedBytes) {
+    Serial.printf("DataStore: chunked save ABORTED — wrote %d bytes, expected %d (%d records)\n",
+                  (int)bytesWritten, (int)expectedBytes, _saveRecordsWritten);
+    fs->remove(tmpPath);
+    return;
+  }
+
+  fs->remove(finalPath);
+  if (fs->rename(tmpPath, finalPath)) {
+    Serial.printf("DataStore: saved %d contacts (%d bytes, chunked)\n",
+                  _saveRecordsWritten, (int)bytesWritten);
+  } else {
+    Serial.println("DataStore: rename failed, tmp file preserved");
+  }
+}
+
 void DataStore::loadChannels(DataStoreHost* host) {
    FILESYSTEM* fs = _getContactsChannelsFS();

--- a/examples/companion_radio/DataStore.h
+++ b/examples/companion_radio/DataStore.h
@@ -24,6 +24,14 @@ class DataStore {
  void checkAdvBlobFile();
 #endif

+  // Chunked save state
+  File _saveFile;
+  DataStoreHost* _saveHost = nullptr;
+  uint32_t _saveIdx = 0;
+  uint32_t _saveRecordsWritten = 0;
+  bool _saveInProgress = false;
+  bool _saveWriteOk = true;
+
 public:
  DataStore(FILESYSTEM& fs, mesh::RTCClock& clock);
  DataStore(FILESYSTEM& fs, FILESYSTEM& fsExtra, mesh::RTCClock& clock);
@@ -37,6 +45,14 @@ public:
  void savePrefs(const NodePrefs& prefs, double node_lat, double node_lon);
  void loadContacts(DataStoreHost* host);
  void saveContacts(DataStoreHost* host);
+  // Chunked save — splits contact write across multiple loop iterations
+  // to prevent blocking the main loop for 500ms+ on large contact lists.
+  // Call beginSaveContacts(), then saveContactsChunk() each loop until it
+  // returns false (done), then finishSaveContacts() to verify and commit.
+  bool beginSaveContacts(DataStoreHost* host);
+  bool saveContactsChunk(int batchSize = 20);  // returns true if more to write
+  void finishSaveContacts();
+  bool isSaveInProgress() const { return _saveInProgress; }
  void loadChannels(DataStoreHost* host);
  void saveChannels(DataStoreHost* host);
  void migrateToSecondaryFS();
@@ -51,4 +67,4 @@ public:

 private:
  FILESYSTEM* _getContactsChannelsFS() const { if (_fsExtra) return _fsExtra; return _fs;};
-};
+};
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -380,6 +380,7 @@ void MyMesh::onDiscoveredContact(ContactInfo &contact, bool is_new, uint8_t path

    memcpy(p->pubkey_prefix, contact.id.pub_key, sizeof(p->pubkey_prefix));
    strcpy(p->name, contact.name);
+    p->type = contact.type;
    p->recv_timestamp = getRTCClock()->getCurrentTime();
    p->path_len = mesh::Packet::copyPath(p->path, path, path_len);
  }
@@ -427,6 +428,10 @@ int MyMesh::getRecentlyHeard(AdvertPath dest[], int max_num) {
  return max_num;
 }

+void MyMesh::scheduleLazyContactSave() {
+  dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
+}
+
 void MyMesh::onContactPathUpdated(const ContactInfo &contact) {
  out_frame[0] = PUSH_CODE_PATH_UPDATED;
  memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
@@ -493,7 +498,24 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
  bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN;
  if (should_display && _ui) {
    const uint8_t* msg_path = (pkt->isRouteFlood() && pkt->path_len > 0) ? pkt->path : nullptr;
-    _ui->newMsg(path_len, from.name, text, offline_queue_len, msg_path, pkt->_snr);
+
+    // For signed messages (room server posts): the extra bytes contain the
+    // original poster's pub_key prefix. Look up their name and format as
+    // "PosterName: message" so the UI shows who actually wrote it.
+    if (txt_type == TXT_TYPE_SIGNED_PLAIN && extra && extra_len >= 4) {
+      ContactInfo* poster = lookupContactByPubKey(extra, extra_len);
+      if (poster) {
+        char formatted[MAX_PACKET_PAYLOAD];
+        snprintf(formatted, sizeof(formatted), "%s: %s", poster->name, text);
+        _ui->newMsg(path_len, from.name, formatted, offline_queue_len, msg_path, pkt->_snr);
+      } else {
+        // Poster not in contacts — show raw text (no name prefix)
+        _ui->newMsg(path_len, from.name, text, offline_queue_len, msg_path, pkt->_snr);
+      }
+    } else {
+      _ui->newMsg(path_len, from.name, text, offline_queue_len, msg_path, pkt->_snr);
+    }
+
    if (!_prefs.buzzer_quiet) _ui->notify(UIEventType::contactMessage); //buzz if enabled
  }
 #endif
@@ -538,12 +560,12 @@ void MyMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, ui
                recipient.name, delay_millis, _prefs.path_hash_mode, _prefs.path_hash_mode + 1);
  // TODO: dynamic send_scope, depending on recipient and current 'home' Region
  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis, _prefs.path_hash_mode + 1);
+    sendFlood(pkt, delay_millis, getPathHashSize());
  } else {
    uint16_t codes[2];
    codes[0] = send_scope.calcTransportCode(pkt);
    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis, _prefs.path_hash_mode + 1);
+    sendFlood(pkt, codes, delay_millis, getPathHashSize());
  }
 }
 void MyMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
@@ -560,12 +582,12 @@ void MyMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pk

  // TODO: have per-channel send_scope
  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis, _prefs.path_hash_mode + 1);
+    sendFlood(pkt, delay_millis, getPathHashSize());
  } else {
    uint16_t codes[2];
    codes[0] = send_scope.calcTransportCode(pkt);
    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis, _prefs.path_hash_mode + 1);
+    sendFlood(pkt, codes, delay_millis, getPathHashSize());
  }
 }

@@ -732,6 +754,13 @@ bool MyMesh::uiLoginToRepeater(uint32_t contact_idx, const char* password, uint3
  uint8_t save_path_len = recipient->out_path_len;
  recipient->out_path_len = OUT_PATH_UNKNOWN;

+  // For room servers: reset sync_since to zero so the server pushes ALL posts.
+  // The device has no persistent DM storage, so every session needs full history.
+  // sync_since naturally updates as messages arrive (BaseChatMesh::onPeerDataRecv).
+  if (recipient->type == ADV_TYPE_ROOM) {
+    recipient->sync_since = 0;
+  }
+
  Serial.printf("[uiLogin] Sending login to '%s' (idx=%d, path was 0x%02X, now 0x%02X, hash_mode=%d)\n",
                recipient->name, contact_idx, save_path_len, recipient->out_path_len, _prefs.path_hash_mode);

@@ -1193,12 +1222,25 @@ void MyMesh::begin(bool has_display) {
      _prefs.gps_baudrate != 9600 && _prefs.gps_baudrate != 19200 &&
      _prefs.gps_baudrate != 38400 && _prefs.gps_baudrate != 57600 &&
      _prefs.gps_baudrate != 115200) {
+    Serial.printf("PREFS: invalid gps_baudrate=%lu — reset to 0 (default)\n",
+                  (unsigned long)_prefs.gps_baudrate);
    _prefs.gps_baudrate = 0;  // reset to default if invalid
  }
-  // interference_threshold: 0 = disabled, minimum functional value is 14
+  // interference_threshold: 0 = disabled, minimum functional value is 14, max sane ~30
  if (_prefs.interference_threshold > 0 && _prefs.interference_threshold < 14) {
    _prefs.interference_threshold = 0;
  }
+  if (_prefs.interference_threshold > 50) {
+    Serial.printf("PREFS: invalid interference_threshold=%d — reset to 0 (disabled)\n",
+                  _prefs.interference_threshold);
+    _prefs.interference_threshold = 0;  // garbage from prefs upgrade — disable
+  }
+  // Clamp remaining v1.0 fields that may contain garbage after upgrade from older firmware
+  if (_prefs.path_hash_mode > 2) _prefs.path_hash_mode = 0;
+  if (_prefs.autoadd_max_hops > 64) _prefs.autoadd_max_hops = 0;
+  if (_prefs.dark_mode > 1) _prefs.dark_mode = 0;
+  if (_prefs.portrait_mode > 1) _prefs.portrait_mode = 0;
+  if (_prefs.hint_shown > 1) _prefs.hint_shown = 0;

 #ifdef BLE_PIN_CODE // 123456 by default
  if (_prefs.ble_pin == 0) {
@@ -1448,7 +1490,7 @@ void MyMesh::handleCmdFrame(size_t len) {
    if (pkt) {
      if (len >= 2 && cmd_frame[1] == 1) { // optional param (1 = flood, 0 = zero hop)
        unsigned long delay_millis = 0;
-        sendFlood(pkt, delay_millis, _prefs.path_hash_mode + 1);
+        sendFlood(pkt, delay_millis, getPathHashSize());
      } else {
        sendZeroHop(pkt);
      }
@@ -1571,6 +1613,13 @@ void MyMesh::handleCmdFrame(size_t len) {
          uint8_t ch_idx = is_v3_ch ? out_frame[4] : out_frame[1];
          _ui->markChannelReadFromBLE(ch_idx);
        }
+
+        // Mark DM slot read when companion app syncs a contact (DM/room) message
+        bool is_v3_dm = (out_frame[0] == RESP_CODE_CONTACT_MSG_RECV_V3);
+        bool is_old_dm = (out_frame[0] == RESP_CODE_CONTACT_MSG_RECV);
+        if (is_v3_dm || is_old_dm) {
+          _ui->markChannelReadFromBLE(0xFF);
+        }
      }
 #endif
    } else {
@@ -2982,10 +3031,19 @@ void MyMesh::loop() {

  // is there are pending dirty contacts write needed?
  if (dirty_contacts_expiry && millisHasNowPassed(dirty_contacts_expiry)) {
-    saveContacts();
+    if (!_store->isSaveInProgress()) {
+      _store->beginSaveContacts(this);
+    }
    dirty_contacts_expiry = 0;
  }

+  // Drive chunked contact save — write a batch each loop iteration
+  if (_store->isSaveInProgress()) {
+    if (!_store->saveContactsChunk(20)) {  // 20 contacts per chunk (~3KB, ~30ms)
+      _store->finishSaveContacts();  // Done or error — verify and commit
+    }
+  }
+
  // Discovery scan timeout
  if (_discoveryActive && millisHasNowPassed(_discoveryTimeout)) {
    _discoveryActive = false;
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -8,11 +8,11 @@
 #define FIRMWARE_VER_CODE 10

 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "13 March 2026"
+#define FIRMWARE_BUILD_DATE "26 March 2026"
 #endif

 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "Meck v1.0"
+#define FIRMWARE_VERSION "Meck v1.4"
 #endif

 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -79,6 +79,7 @@
 struct AdvertPath {
  uint8_t pubkey_prefix[7];
  uint8_t path_len;
+  uint8_t type;             // ADV_TYPE_* (Chat/Repeater/Room/Sensor)
  char    name[32];
  uint32_t recv_timestamp;
  uint8_t path[MAX_PATH_SIZE];
@@ -119,6 +120,12 @@ public:
  int  getDiscoveredCount() const { return _discoveredCount; }
  const DiscoveredNode& getDiscovered(int idx) const { return _discovered[idx]; }
  bool addDiscoveredToContacts(int idx);  // promote a discovered node into contacts
+
+  // Last Heard — public wrappers for contact add/remove from UI
+  void scheduleLazyContactSave();
+  int getContactBlob(const uint8_t key[], int key_len, uint8_t dest_buf[]) {
+    return getBlobByKey(key, key_len, dest_buf);
+  }
  
  // Queue a sent channel message for BLE app sync
  void queueSentChannelMessage(uint8_t channel_idx, uint32_t timestamp, const char* sender, const char* text);
@@ -143,6 +150,7 @@ protected:
  uint8_t getAutoAddMaxHops() const override;
  bool filterRecvFloodPacket(mesh::Packet* packet) override;

+  uint8_t getPathHashSize() const override { return _prefs.path_hash_mode + 1; }
  void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0) override;
  void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0) override;

@@ -262,7 +270,7 @@ private:
  AckTableEntry expected_ack_table[EXPECTED_ACK_TABLE_SIZE]; // circular table
  int next_ack_idx;

-  #define ADVERT_PATH_TABLE_SIZE   16
+  #define ADVERT_PATH_TABLE_SIZE   40
  AdvertPath advert_paths[ADVERT_PATH_TABLE_SIZE]; // circular table

    // Sent message repeat tracking
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -37,4 +37,41 @@ struct NodePrefs {  // persisted to file
  uint8_t interference_threshold; // Interference threshold in dB (0=disabled, 14+=enabled)
  uint8_t dark_mode;              // 0=off (white bg), 1=on (black bg)
  uint8_t portrait_mode;          // 0=landscape, 1=portrait — T5S3 only
+  uint8_t auto_lock_minutes;      // 0=disabled, 2/5/10/15/30=auto-lock after idle
+  uint8_t hint_shown;             // 0=show nav hint on boot, 1=already shown (dismiss permanently)
+  uint8_t large_font;             // 0=tiny (built-in 6x8), 1=larger (FreeSans9pt) — T-Deck Pro only
+
+  // --- Font helpers (inline, no overhead) ---
+  // Returns the DisplayDriver text-size index for "small/body" text.
+  // T-Deck Pro: 0 = built-in 6×8, 1 = FreeSans9pt.
+  // T5S3: both 0 and 1 are 12pt fonts (regular vs bold) with identical line
+  //        height, so large_font has no layout effect there.
+  inline uint8_t smallTextSize() const {
+    return large_font ? 1 : 0;
+  }
+
+  // Returns the virtual-coordinate line height matching smallTextSize().
+  // T-Deck Pro size 0 → 9 (6×8 + 1px gap), size 1 → 11 (9pt ascent+descent).
+  // T5S3 size 0/1 → same 12pt height → always 9 in virtual coords.
+  inline int smallLineH() const {
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    return 9;
+#else
+    return large_font ? 11 : 9;
+#endif
+  }
+
+  // Returns the Y offset for selection highlight fillRect (T-Deck Pro only).
+  // Size 0 (built-in font): cursor positions at top-left, +5 offset in
+  //   setCursor places text below → fillRect at y+5 aligns with text.
+  // Size 1 (FreeSans9pt): cursor positions at baseline, ascenders render
+  //   upward → fillRect must start above baseline to cover ascenders.
+  // T5S3: always 0 (both sizes use baseline fonts with highlight at y).
+  inline int smallHighlightOff() const {
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    return 0;
+#else
+    return large_font ? -2 : 5;
+#endif
+  }
 };
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
--- a/examples/companion_radio/ui-new/Alarmscreen.h
+++ b/examples/companion_radio/ui-new/Alarmscreen.h
--- a/examples/companion_radio/ui-new/Audiobookplayerscreen.h
+++ b/examples/companion_radio/ui-new/Audiobookplayerscreen.h
@@ -43,6 +43,8 @@
 // JPEG decoder for cover art — JPEGDEC by bitbank2
 #include <JPEGDEC.h>

+#include "../NodePrefs.h"
+
 // Forward declarations
 class UITask;

@@ -151,6 +153,7 @@ public:

 private:
  UITask*  _task;
+  NodePrefs* _prefs;
  Audio*   _audio;
  Mode     _mode;
  bool     _sdReady;
@@ -1193,10 +1196,10 @@ private:
    }

    // Switch to tiny font for file list (6x8 built-in)
-    display.setTextSize(0);
+    display.setTextSize(_prefs ? _prefs->smallTextSize() : 0);

-    // Calculate visible items — tiny font uses ~8 virtual units per line
-    int itemHeight = 8;
+    // Calculate visible items
+    int itemHeight = (_prefs ? _prefs->smallLineH() : 9) - 1;
    int listTop = 13;
    int listBottom = display.height() - 14;  // Reserve footer space
    int visibleItems = (listBottom - listTop) / itemHeight;
@@ -1208,7 +1211,7 @@ private:
      _scrollOffset = _selectedFile - visibleItems + 1;
    }

-    // Approx chars that fit in tiny font (~36 on 128 virtual width)
+    // Approx chars for suffix/type tag sizing (still needed for type tag assembly)
    const int charsPerLine = 36;

    // Draw file list
@@ -1218,9 +1221,7 @@ private:

      if (fileIdx == _selectedFile) {
        display.setColor(DisplayDriver::LIGHT);
-        // setCursor adds +5 to y internally, but fillRect does not.
-        // Offset fillRect by +5 to align highlight bar with text.
-        display.fillRect(0, y + 5, display.width(), itemHeight - 1);
+        display.fillRect(0, y + (_prefs ? _prefs->smallHighlightOff() : 5), display.width(), itemHeight - 1);
        display.setColor(DisplayDriver::DARK);
      } else {
        display.setColor(DisplayDriver::LIGHT);
@@ -1231,29 +1232,15 @@ private:
      char fullLine[96];

      if (fe.isDir) {
-        // Directory entry: show as "/ FolderName" or just ".."
        if (fe.name == "..") {
          snprintf(fullLine, sizeof(fullLine), ".. (up)");
        } else {
          snprintf(fullLine, sizeof(fullLine), "/%s", fe.name.c_str());
-          // Truncate if needed
-          if ((int)strlen(fullLine) > charsPerLine - 1) {
-            fullLine[charsPerLine - 4] = '.';
-            fullLine[charsPerLine - 3] = '.';
-            fullLine[charsPerLine - 2] = '.';
-            fullLine[charsPerLine - 1] = '\0';
-          }
        }
      } else {
        // Audio file: "Title - Author [TYPE]"
        char lineBuf[80];

-        // Reserve space for type tag and bookmark indicator
-        int suffixLen = fe.fileType.length() + 3;  // " [M4B]" or " [MP3]"
-        int bmkLen = fe.hasBookmark ? 2 : 0;       // " >"
-        int availChars = charsPerLine - suffixLen - bmkLen;
-        if (availChars < 10) availChars = 10;
-
        if (fe.displayAuthor.length() > 0) {
          snprintf(lineBuf, sizeof(lineBuf), "%s - %s",
                   fe.displayTitle.c_str(), fe.displayAuthor.c_str());
@@ -1261,24 +1248,13 @@ private:
          snprintf(lineBuf, sizeof(lineBuf), "%s", fe.displayTitle.c_str());
        }

-        // Truncate with ellipsis if needed
-        if ((int)strlen(lineBuf) > availChars) {
-          if (availChars > 3) {
-            lineBuf[availChars - 3] = '.';
-            lineBuf[availChars - 2] = '.';
-            lineBuf[availChars - 1] = '.';
-            lineBuf[availChars] = '\0';
-          } else {
-            lineBuf[availChars] = '\0';
-          }
-        }
-
        // Append file type tag
        snprintf(fullLine, sizeof(fullLine), "%s [%s]", lineBuf, fe.fileType.c_str());
      }

-      display.setCursor(2, y);
-      display.print(fullLine);
+      // Pixel-aware ellipsis — reserve space for bookmark indicator
+      int reserveRight = (!fe.isDir && fe.hasBookmark) ? 10 : 2;
+      display.drawTextEllipsized(2, y, display.width() - reserveRight, fullLine);

      // Bookmark indicator (right-aligned, files only)
      if (!fe.isDir && fe.hasBookmark) {
@@ -1464,8 +1440,8 @@ private:
  }

 public:
-  AudiobookPlayerScreen(UITask* task, Audio* audio)
-    : _task(task), _audio(audio), _mode(FILE_LIST),
+  AudiobookPlayerScreen(UITask* task, Audio* audio, NodePrefs* prefs = nullptr)
+    : _task(task), _prefs(prefs), _audio(audio), _mode(FILE_LIST),
      _sdReady(false), _i2sInitialized(false), _dacPowered(false),
      _displayRef(nullptr),
      _selectedFile(0), _scrollOffset(0),
--- a/examples/companion_radio/ui-new/CardKBKeyboard.h
+++ b/examples/companion_radio/ui-new/CardKBKeyboard.h
@@ -0,0 +1,122 @@
+#pragma once
+// =============================================================================
+// CardKBKeyboard — M5Stack CardKB (or compatible) I2C keyboard driver
+//
+// Polls 0x5F on the shared I2C bus via QWIIC connector.
+// Maps CardKB special key codes to Meck key constants.
+//
+// Usage:
+//   CardKBKeyboard cardkb;
+//   if (cardkb.begin()) { /* detected */ }
+//   char key = cardkb.readKey();  // returns 0 if no key
+// =============================================================================
+
+#if defined(LilyGo_T5S3_EPaper_Pro) && defined(MECK_CARDKB)
+#ifndef CARDKB_KEYBOARD_H
+#define CARDKB_KEYBOARD_H
+
+#include <Arduino.h>
+#include <Wire.h>
+#include "variant.h"  // For I2C_SDA, I2C_SCL (bus recovery)
+
+// I2C address (defined in variant.h, fallback here)
+#ifndef CARDKB_I2C_ADDR
+#define CARDKB_I2C_ADDR 0x5F
+#endif
+
+// CardKB special key codes (from M5Stack documentation)
+#define CARDKB_KEY_UP      0xB5
+#define CARDKB_KEY_DOWN    0xB6
+#define CARDKB_KEY_LEFT    0xB4
+#define CARDKB_KEY_RIGHT   0xB7
+#define CARDKB_KEY_TAB     0x09
+#define CARDKB_KEY_ESC     0x1B
+#define CARDKB_KEY_BS      0x08
+#define CARDKB_KEY_ENTER   0x0D
+#define CARDKB_KEY_DEL     0x7F
+#define CARDKB_KEY_FN      0x00   // Fn modifier (swallowed by CardKB internally)
+
+class CardKBKeyboard {
+public:
+  CardKBKeyboard() : _detected(false) {}
+
+  // Probe for CardKB on the I2C bus. Call after Wire.begin().
+  bool begin() {
+    Wire.beginTransmission(CARDKB_I2C_ADDR);
+    _detected = (Wire.endTransmission() == 0);
+    if (_detected) {
+      Serial.println("[CardKB] Detected at 0x5F");
+    }
+    return _detected;
+  }
+
+  // Re-probe (e.g. for hot-plug detection every few seconds)
+  bool probe() {
+    Wire.beginTransmission(CARDKB_I2C_ADDR);
+    _detected = (Wire.endTransmission() == 0);
+    return _detected;
+  }
+
+  bool isDetected() const { return _detected; }
+
+  // Poll for a keypress. Returns 0 if no key available.
+  // Returns raw ASCII for printable chars, or Meck KEY_* constants for nav keys.
+  // Throttled to avoid flooding I2C bus — polls at most every 50ms.
+  // On read failure, backs off 500ms and re-inits Wire to recover bus state.
+  char readKey() {
+    if (!_detected) return 0;
+
+    unsigned long now = millis();
+    if (now - _lastPoll < _pollInterval) return 0;
+    _lastPoll = now;
+
+    Wire.requestFrom((uint8_t)CARDKB_I2C_ADDR, (uint8_t)1);
+    if (!Wire.available()) {
+      _errorCount++;
+      if (_errorCount >= 3) {
+        // I2C bus may be stuck — re-init to recover
+        Wire.begin(I2C_SDA, I2C_SCL);
+        Wire.setClock(100000);
+        _pollInterval = 500;  // Back off for 500ms
+        _errorCount = 0;
+        Serial.println("[CardKB] I2C error recovery — bus re-init");
+      }
+      return 0;
+    }
+
+    _errorCount = 0;
+    _pollInterval = 50;  // Normal polling rate
+
+    uint8_t raw = Wire.read();
+    if (raw == 0) return 0;
+
+    // Map CardKB special keys to Meck constants
+    switch (raw) {
+      case CARDKB_KEY_UP:    return 0xF2;  // KEY_PREV
+      case CARDKB_KEY_DOWN:  return 0xF1;  // KEY_NEXT
+      case CARDKB_KEY_LEFT:  return 0xF3;  // KEY_LEFT
+      case CARDKB_KEY_RIGHT: return 0xF4;  // KEY_RIGHT
+      case CARDKB_KEY_ENTER: return '\r';
+      case CARDKB_KEY_BS:    return '\b';
+      case CARDKB_KEY_DEL:   return '\b';  // Treat delete same as backspace
+      case CARDKB_KEY_ESC:   return 0x1B;  // ESC — handled by caller
+      case CARDKB_KEY_TAB:   return 0x09;  // Tab — available for future use
+      default:
+        // Printable ASCII — pass through unchanged
+        if (raw >= 0x20 && raw <= 0x7E) {
+          return (char)raw;
+        }
+        // Unknown code — ignore
+        return 0;
+    }
+  }
+
+private:
+  bool _detected;
+  unsigned long _lastPoll = 0;
+  unsigned long _pollInterval = 50;  // ms between polls (increases on error)
+  uint8_t _errorCount = 0;
+};
+
+#endif // CARDKB_KEYBOARD_H
+#endif // LilyGo_T5S3_EPaper_Pro && MECK_CARDKB
--- a/examples/companion_radio/ui-new/ChannelScreen.h
+++ b/examples/companion_radio/ui-new/ChannelScreen.h
@@ -59,11 +59,19 @@ public:
    uint8_t path_len;
    uint8_t channel_idx;  // Which channel this message belongs to
    int8_t  snr;          // Receive SNR × 4 (0 if locally sent or unknown)
+    uint32_t dm_peer_hash; // DM peer name hash (for conversation filtering)
    uint8_t path[MSG_PATH_MAX];  // Repeater hop hashes
    char text[CHANNEL_MSG_TEXT_LEN];
    bool valid;
  };

+  // Simple hash for DM peer matching
+  static uint32_t peerHash(const char* s) {
+    uint32_t h = 5381;
+    while (*s) { h = ((h << 5) + h) ^ (uint8_t)*s++; }
+    return h;
+  }
+
 private:
  UITask* _task;
  mesh::RTCClock* _rtc;
@@ -84,6 +92,31 @@ private:
  int  _replySelectPos;        // Index into chronological channelMsgs[] (0=oldest)
  int  _replyChannelMsgCount;  // Cached count from last render (for input bounds)

+  // DM tab (channel_idx == 0xFF) two-level view:
+  //   Inbox mode: list of contacts you have DMs from
+  //   Conversation mode: messages filtered to one contact
+  bool _dmInboxMode;           // true = showing inbox list, false = conversation
+  int  _dmInboxScroll;         // Scroll position in inbox list
+  char _dmFilterName[32];      // Selected contact name for conversation view
+  int  _dmContactIdx;          // Contact index for conversation (-1 if unknown)
+  uint8_t _dmContactPerms;     // Last login permissions for this contact (0=none/guest)
+  const uint8_t* _dmUnreadPtr; // Pointer to per-contact DM unread array (from UITask)
+
+  // Helper: does a message belong to the current view?
+  bool msgMatchesView(const ChannelMessage& msg) const {
+    if (!msg.valid) return false;
+    if (_viewChannelIdx != 0xFF) {
+      return msg.channel_idx == _viewChannelIdx;
+    }
+    // DM tab in conversation mode: filter by peer hash
+    if (!_dmInboxMode && _dmFilterName[0] != '\0') {
+      if (msg.channel_idx != 0xFF) return false;
+      return msg.dm_peer_hash == peerHash(_dmFilterName);
+    }
+    // Inbox mode or no filter — match all DMs
+    return msg.channel_idx == 0xFF;
+  }
+
  // Per-channel unread message counts (standalone mode)
  // Index 0..MAX_GROUP_CHANNELS-1 for channel messages
  // Index MAX_GROUP_CHANNELS for DMs (channel_idx == 0xFF)
@@ -93,10 +126,13 @@ public:
  ChannelScreen(UITask* task, mesh::RTCClock* rtc) 
    : _task(task), _rtc(rtc), _msgCount(0), _newestIdx(-1), _scrollPos(0), 
      _msgsPerPage(6), _viewChannelIdx(0), _sdReady(false), _showPathOverlay(false), _pathScrollPos(0), _pathHopsVisible(20),
-      _replySelectMode(false), _replySelectPos(-1), _replyChannelMsgCount(0) {
+      _replySelectMode(false), _replySelectPos(-1), _replyChannelMsgCount(0),
+      _dmInboxMode(true), _dmInboxScroll(0), _dmContactIdx(-1), _dmContactPerms(0), _dmUnreadPtr(nullptr) {
+    _dmFilterName[0] = '\0';
    // Initialize all messages as invalid
    for (int i = 0; i < CHANNEL_MSG_HISTORY_SIZE; i++) {
      _messages[i].valid = false;
+      _messages[i].dm_peer_hash = 0;
      memset(_messages[i].path, 0, MSG_PATH_MAX);
    }
    // Initialize unread counts
@@ -106,8 +142,9 @@ public:
  void setSDReady(bool ready) { _sdReady = ready; }

  // Add a new message to the history
+  // peer_name: for DMs, the contact this message belongs to (sender for received, recipient for sent)
  void addMessage(uint8_t channel_idx, uint8_t path_len, const char* sender, const char* text,
-                  const uint8_t* path_bytes = nullptr, int8_t snr = 0) {
+                  const uint8_t* path_bytes = nullptr, int8_t snr = 0, const char* peer_name = nullptr) {
    // Move to next slot in circular buffer
    _newestIdx = (_newestIdx + 1) % CHANNEL_MSG_HISTORY_SIZE;
    
@@ -118,6 +155,13 @@ public:
    msg->snr = snr;
    msg->valid = true;
    
+    // Set DM peer hash for conversation filtering
+    if (channel_idx == 0xFF) {
+      msg->dm_peer_hash = peerHash(peer_name ? peer_name : sender);
+    } else {
+      msg->dm_peer_hash = 0;
+    }
+    
    // Store path hop hashes
    memset(msg->path, 0, MSG_PATH_MAX);
    if (path_bytes && path_len > 0 && path_len != 0xFF) {
@@ -158,7 +202,7 @@ public:
  int getMessageCountForChannel() const {
    int count = 0;
    for (int i = 0; i < CHANNEL_MSG_HISTORY_SIZE; i++) {
-      if (_messages[i].valid && _messages[i].channel_idx == _viewChannelIdx) {
+      if (msgMatchesView(_messages[i])) {
        count++;
      }
    }
@@ -173,11 +217,47 @@ public:
    _scrollPos = 0;
    _showPathOverlay = false;
    _pathScrollPos = 0;
+    // Reset DM inbox state when entering DM tab
+    if (idx == 0xFF) {
+      _dmInboxMode = true;
+      _dmInboxScroll = 0;
+      _dmFilterName[0] = '\0';
+      _dmContactIdx = -1;
+      _dmContactPerms = 0;
+    }
    markChannelRead(idx);
  }
+  bool isDMTab() const { return _viewChannelIdx == 0xFF; }
+  bool isDMInboxMode() const { return _viewChannelIdx == 0xFF && _dmInboxMode; }
+  bool isDMConversation() const { return _viewChannelIdx == 0xFF && !_dmInboxMode; }
+  const char* getDMFilterName() const { return _dmFilterName; }
+
+  // Open a specific contact's DM conversation directly (skipping inbox)
+  void openConversation(const char* contactName, int contactIdx = -1, uint8_t perms = 0) {
+    strncpy(_dmFilterName, contactName, sizeof(_dmFilterName) - 1);
+    _dmFilterName[sizeof(_dmFilterName) - 1] = '\0';
+    _dmInboxMode = false;
+    _dmContactIdx = contactIdx;
+    _dmContactPerms = perms;
+    _scrollPos = 0;
+  }
+
+  int getDMContactIdx() const { return _dmContactIdx; }
+  uint8_t getDMContactPerms() const { return _dmContactPerms; }
+  void setDMContactPerms(uint8_t p) { _dmContactPerms = p; }
  bool isShowingPathOverlay() const { return _showPathOverlay; }
  void dismissPathOverlay() { _showPathOverlay = false; _pathScrollPos = 0; }

+  // Set pointer to per-contact DM unread array (called by UITask after allocation)
+  void setDMUnreadPtr(const uint8_t* ptr) { _dmUnreadPtr = ptr; }
+
+  // Subtract a specific amount from the DM unread slot (used by per-contact clearing)
+  void subtractDMUnread(int count) {
+    int slot = MAX_GROUP_CHANNELS;  // DM slot
+    _unread[slot] -= count;
+    if (_unread[slot] < 0) _unread[slot] = 0;
+  }
+
  // --- Reply select mode (R key → pick a message → Enter to @mention reply) ---
  bool isReplySelectMode() const { return _replySelectMode; }
  void exitReplySelect() { _replySelectMode = false; _replySelectPos = -1; }
@@ -206,7 +286,7 @@ public:
      int idx = _newestIdx - i;
      while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
      idx = idx % CHANNEL_MSG_HISTORY_SIZE;
-      if (_messages[idx].valid && _messages[idx].channel_idx == _viewChannelIdx) {
+      if (_messages[idx].valid && msgMatchesView(_messages[idx])) {
        rsMsgs[count++] = idx;
      }
    }
@@ -230,7 +310,7 @@ public:
      int idx = _newestIdx - i;
      while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
      idx = idx % CHANNEL_MSG_HISTORY_SIZE;
-      if (_messages[idx].valid && _messages[idx].channel_idx == _viewChannelIdx) {
+      if (_messages[idx].valid && msgMatchesView(_messages[idx])) {
        rsMsgs[count++] = idx;
      }
    }
@@ -277,7 +357,7 @@ public:
      int idx = _newestIdx - i;
      while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
      idx = idx % CHANNEL_MSG_HISTORY_SIZE;
-      if (_messages[idx].valid && _messages[idx].channel_idx == _viewChannelIdx
+      if (msgMatchesView(_messages[idx])
          && _messages[idx].path_len != 0) {
        return &_messages[idx];
      }
@@ -449,7 +529,15 @@ public:
    
    // Get channel name
    ChannelDetails channel;
-    if (the_mesh.getChannel(_viewChannelIdx, channel)) {
+    if (_viewChannelIdx == 0xFF) {
+      if (_dmInboxMode) {
+        display.print("Direct Messages");
+      } else {
+        char hdr[40];
+        snprintf(hdr, sizeof(hdr), "DM: %s", _dmFilterName);
+        display.print(hdr);
+      }
+    } else if (the_mesh.getChannel(_viewChannelIdx, channel)) {
      display.print(channel.name);
    } else {
      sprintf(tmp, "Channel %d", _viewChannelIdx);
@@ -464,11 +552,201 @@ public:
    
    // Divider line
    display.drawRect(0, 11, display.width(), 1);
+
+    // === DM Inbox mode: show list of contacts with DMs ===
+    if (_viewChannelIdx == 0xFF && _dmInboxMode) {
+      #define DM_INBOX_MAX 20
+      struct DMInboxEntry {
+        uint32_t hash;
+        char name[32];
+        int msgCount;
+        int unreadCount;
+        uint32_t newestTs;
+      };
+      DMInboxEntry inbox[DM_INBOX_MAX];
+      int inboxCount = 0;
+
+      // Scan all DMs and group by peer hash
+      for (int i = 0; i < _msgCount && i < CHANNEL_MSG_HISTORY_SIZE; i++) {
+        int idx = _newestIdx - i;
+        while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
+        idx = idx % CHANNEL_MSG_HISTORY_SIZE;
+        if (!_messages[idx].valid || _messages[idx].channel_idx != 0xFF) continue;
+        if (_messages[idx].dm_peer_hash == 0) continue;
+
+        uint32_t h = _messages[idx].dm_peer_hash;
+
+        // Find existing entry by hash
+        int found = -1;
+        for (int j = 0; j < inboxCount; j++) {
+          if (inbox[j].hash == h) { found = j; break; }
+        }
+        if (found < 0 && inboxCount < DM_INBOX_MAX) {
+          found = inboxCount++;
+          inbox[found].hash = h;
+          inbox[found].name[0] = '\0';
+          inbox[found].msgCount = 0;
+          inbox[found].unreadCount = 0;
+          inbox[found].newestTs = 0;
+
+          // Look up name from contacts by matching peer hash
+          uint32_t numC = the_mesh.getNumContacts();
+          ContactInfo ci;
+          for (uint32_t c = 0; c < numC; c++) {
+            if (the_mesh.getContactByIdx(c, ci) && peerHash(ci.name) == h) {
+              strncpy(inbox[found].name, ci.name, 31);
+              inbox[found].name[31] = '\0';
+              break;
+            }
+          }
+          // Fallback: extract from text if contact not found
+          if (inbox[found].name[0] == '\0') {
+            extractSenderName(_messages[idx].text, inbox[found].name, sizeof(inbox[found].name));
+          }
+        }
+        if (found >= 0) {
+          inbox[found].msgCount++;
+          if (_messages[idx].timestamp > inbox[found].newestTs)
+            inbox[found].newestTs = _messages[idx].timestamp;
+        }
+      }
+
+      // Look up unread counts from per-contact array
+      if (_dmUnreadPtr) {
+        for (int e = 0; e < inboxCount; e++) {
+          uint32_t numC = the_mesh.getNumContacts();
+          ContactInfo ci;
+          for (uint32_t c = 0; c < numC; c++) {
+            if (the_mesh.getContactByIdx(c, ci) && peerHash(ci.name) == inbox[e].hash) {
+              inbox[e].unreadCount = _dmUnreadPtr[c];
+              break;
+            }
+          }
+        }
+      }
+
+      // Sort by newest timestamp descending (insertion sort)
+      for (int i = 1; i < inboxCount; i++) {
+        DMInboxEntry tmp2 = inbox[i];
+        int j = i - 1;
+        while (j >= 0 && inbox[j].newestTs < tmp2.newestTs) {
+          inbox[j + 1] = inbox[j];
+          j--;
+        }
+        inbox[j + 1] = tmp2;
+      }
+
+      // Render inbox list
+      display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+      int lineH = the_mesh.getNodePrefs()->smallLineH();
+      int headerH = 14;
+      int footerH = 14;
+      int maxY = display.height() - footerH;
+      int y = headerH;
+      int maxVisible = (maxY - headerH) / lineH;
+      if (maxVisible < 3) maxVisible = 3;
+
+      // Clamp scroll
+      if (_dmInboxScroll >= inboxCount) _dmInboxScroll = inboxCount > 0 ? inboxCount - 1 : 0;
+
+      if (inboxCount == 0) {
+        display.setColor(DisplayDriver::LIGHT);
+        display.setCursor(0, y);
+        display.print("No direct messages");
+        display.setCursor(0, y + lineH);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+        display.print("DMs from contacts appear here");
+#else
+        display.print("A/D: Switch channel");
+#endif
+      } else {
+        int startIdx = max(0, min(_dmInboxScroll - maxVisible / 2,
+                                  inboxCount - maxVisible));
+        int endIdx = min(inboxCount, startIdx + maxVisible);
+
+        for (int i = startIdx; i < endIdx && y + lineH <= maxY; i++) {
+          bool selected = (i == _dmInboxScroll);
+
+          if (selected) {
+            display.setColor(DisplayDriver::LIGHT);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+            display.fillRect(0, y, display.width(), lineH);
+#else
+            display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineH);
+#endif
+            display.setColor(DisplayDriver::DARK);
+          } else {
+            display.setColor(DisplayDriver::LIGHT);
+          }
+
+          display.setCursor(0, y);
+
+          // Prefix: > for selected, unread indicator
+          char prefix[6];
+          if (inbox[i].unreadCount > 0) {
+            snprintf(prefix, sizeof(prefix), "%s*%d", selected ? ">" : " ", inbox[i].unreadCount);
+          } else {
+            snprintf(prefix, sizeof(prefix), "%s ", selected ? ">" : " ");
+          }
+          display.print(prefix);
+
+          // Name (truncated)
+          char filteredName[32];
+          display.translateUTF8ToBlocks(filteredName, inbox[i].name, sizeof(filteredName));
+
+          // Right side: message count + age
+          char ageStr[8];
+          uint32_t age = _rtc->getCurrentTime() - inbox[i].newestTs;
+          if (age < 60) snprintf(ageStr, sizeof(ageStr), "%ds", age);
+          else if (age < 3600) snprintf(ageStr, sizeof(ageStr), "%dm", age / 60);
+          else if (age < 86400) snprintf(ageStr, sizeof(ageStr), "%dh", age / 3600);
+          else snprintf(ageStr, sizeof(ageStr), "%dd", age / 86400);
+
+          char rightStr[16];
+          snprintf(rightStr, sizeof(rightStr), "(%d) %s", inbox[i].msgCount, ageStr);
+          int rightW = display.getTextWidth(rightStr) + 2;
+
+          int nameX = display.getTextWidth(prefix) + 2;
+          int nameMaxW = display.width() - nameX - rightW - 2;
+          display.drawTextEllipsized(nameX, y, nameMaxW, filteredName);
+
+          display.setCursor(display.width() - rightW, y);
+          display.print(rightStr);
+
+          y += lineH;
+        }
+      }
+
+      // Footer
+      display.setTextSize(1);
+      int footerY = display.height() - 12;
+      display.drawRect(0, footerY - 2, display.width(), 1);
+      display.setColor(DisplayDriver::YELLOW);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+      display.setCursor(0, footerY);
+      display.print("Swipe:Nav");
+      const char* rtInbox = "Hold:Open";
+      display.setCursor(display.width() - display.getTextWidth(rtInbox) - 2, footerY);
+      display.print(rtInbox);
+#else
+      display.setCursor(0, footerY);
+      display.print("Q:Bck A/D:Ch");
+      const char* rtInbox = "Ent:Open";
+      display.setCursor(display.width() - display.getTextWidth(rtInbox) - 2, footerY);
+      display.print(rtInbox);
+#endif
+
+#ifdef USE_EINK
+      return 5000;
+#else
+      return 1000;
+#endif
+    }
    
    // --- Path detail overlay ---
    if (_showPathOverlay) {
-      display.setTextSize(0);
-      int lineH = 9;
+      display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+      int lineH = the_mesh.getNodePrefs()->smallLineH();
      int y = 14;
      
      ChannelMessage* msg = getNewestReceivedMsg();
@@ -664,24 +942,160 @@ public:
    }
    
    if (channelMsgCount == 0) {
-      display.setTextSize(0);  // Tiny font for body text
+      display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());  // Tiny font for body text
      display.setCursor(0, 20);
      display.setColor(DisplayDriver::LIGHT);
-      display.print("No messages yet");
-      display.setCursor(0, 30);
+      if (_viewChannelIdx == 0xFF) {
+        char noMsg[48];
+        snprintf(noMsg, sizeof(noMsg), "No messages from %s", _dmFilterName);
+        display.print(noMsg);
+        display.setCursor(0, 30);
 #if defined(LilyGo_T5S3_EPaper_Pro)
-      display.print("Swipe: Switch channel");
-      display.setCursor(0, 40);
-      display.print("Long press: Compose");
+        display.print("Hold: Compose reply");
 #else
-      display.print("A/D: Switch channel");
-      display.setCursor(0, 40);
-      display.print("C: Compose message");
+        display.print("Q: Back to inbox");
+        display.setCursor(0, 40);
+        display.print("Ent: Compose reply");
 #endif
+      } else {
+        display.print("No messages yet");
+        display.setCursor(0, 30);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+        display.print("Swipe: Switch channel");
+        display.setCursor(0, 40);
+        display.print("Long press: Compose");
+#else
+        display.print("A/D: Switch channel");
+        display.setCursor(0, 40);
+        display.print("C: Compose message");
+#endif
+      }
      display.setTextSize(1);  // Restore for footer
+    } else if (_viewChannelIdx == 0xFF && _dmInboxMode) {
+      // =================================================================
+      // DM Inbox: list of contacts/rooms you have DM history with
+      // =================================================================
+      display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+      int lineHeight = the_mesh.getNodePrefs()->smallLineH();
+      int headerHeight = 14;
+      int footerHeight = 14;
+      int maxY = display.height() - footerHeight;
+      int y = headerHeight;
+
+      // Scan all DM messages and collect unique senders
+      #define DM_INBOX_MAX 16
+      struct InboxEntry {
+        char name[24];
+        int count;
+        uint32_t newest_ts;
+      };
+      static InboxEntry inbox[DM_INBOX_MAX];
+      int inboxCount = 0;
+
+      for (int i = 0; i < _msgCount; i++) {
+        int idx = _newestIdx - i;
+        while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
+        idx = idx % CHANNEL_MSG_HISTORY_SIZE;
+        if (!_messages[idx].valid || _messages[idx].channel_idx != 0xFF) continue;
+
+        char sender[24];
+        if (!extractSenderName(_messages[idx].text, sender, sizeof(sender))) continue;
+
+        // Find or add sender in inbox
+        bool found = false;
+        for (int j = 0; j < inboxCount; j++) {
+          if (strcmp(inbox[j].name, sender) == 0) {
+            inbox[j].count++;
+            if (_messages[idx].timestamp > inbox[j].newest_ts)
+              inbox[j].newest_ts = _messages[idx].timestamp;
+            found = true;
+            break;
+          }
+        }
+        if (!found && inboxCount < DM_INBOX_MAX) {
+          strncpy(inbox[inboxCount].name, sender, 23);
+          inbox[inboxCount].name[23] = '\0';
+          inbox[inboxCount].count = 1;
+          inbox[inboxCount].newest_ts = _messages[idx].timestamp;
+          inboxCount++;
+        }
+      }
+
+      // Sort by newest timestamp descending (most recent first)
+      for (int i = 1; i < inboxCount; i++) {
+        InboxEntry tmp2 = inbox[i];
+        int j = i - 1;
+        while (j >= 0 && inbox[j].newest_ts < tmp2.newest_ts) {
+          inbox[j + 1] = inbox[j];
+          j--;
+        }
+        inbox[j + 1] = tmp2;
+      }
+
+      if (inboxCount == 0) {
+        display.setColor(DisplayDriver::LIGHT);
+        display.setCursor(0, y);
+        display.print("No conversations");
+      } else {
+        // Clamp scroll
+        if (_dmInboxScroll >= inboxCount) _dmInboxScroll = inboxCount - 1;
+        if (_dmInboxScroll < 0) _dmInboxScroll = 0;
+
+        int maxVisible = (maxY - headerHeight) / lineHeight;
+        if (maxVisible < 3) maxVisible = 3;
+        int startIdx = max(0, min(_dmInboxScroll - maxVisible / 2,
+                                  inboxCount - maxVisible));
+        int endIdx = min(inboxCount, startIdx + maxVisible);
+
+        uint32_t now = _rtc->getCurrentTime();
+        for (int i = startIdx; i < endIdx && y + lineHeight <= maxY; i++) {
+          bool selected = (i == _dmInboxScroll);
+
+          if (selected) {
+            display.setColor(DisplayDriver::LIGHT);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+            display.fillRect(0, y, display.width(), lineHeight);
+#else
+            display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineHeight);
+#endif
+            display.setColor(DisplayDriver::DARK);
+          } else {
+            display.setColor(DisplayDriver::LIGHT);
+          }
+
+          display.setCursor(0, y);
+          display.print(selected ? ">" : " ");
+
+          // Name (ellipsized)
+          char filteredName[24];
+          display.translateUTF8ToBlocks(filteredName, inbox[i].name, sizeof(filteredName));
+
+          // Right side: message count + age
+          char ageStr[8];
+          uint32_t age = now - inbox[i].newest_ts;
+          if (age < 60) snprintf(ageStr, sizeof(ageStr), "%ds", age);
+          else if (age < 3600) snprintf(ageStr, sizeof(ageStr), "%dm", age / 60);
+          else if (age < 86400) snprintf(ageStr, sizeof(ageStr), "%dh", age / 3600);
+          else snprintf(ageStr, sizeof(ageStr), "%dd", age / 86400);
+
+          char rightStr[16];
+          snprintf(rightStr, sizeof(rightStr), "[%d] %s", inbox[i].count, ageStr);
+          int rightW = display.getTextWidth(rightStr) + 2;
+
+          int nameX = display.getTextWidth(">") + 2;
+          int nameMaxW = display.width() - nameX - rightW - 2;
+          display.drawTextEllipsized(nameX, y, nameMaxW, filteredName);
+
+          display.setCursor(display.width() - rightW, y);
+          display.print(rightStr);
+
+          y += lineHeight;
+        }
+      }
+      display.setTextSize(1);
    } else {
-      display.setTextSize(0);  // Tiny font for message body
-      int lineHeight = 9;   // 8px font + 1px spacing
+      display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());  // Tiny font for message body
+      int lineHeight = the_mesh.getNodePrefs()->smallLineH();   // 8px font + 1px spacing
      int headerHeight = 14;
      int footerHeight = 14;
      int scrollBarW = 4;   // Width of scroll indicator on right edge
@@ -701,7 +1115,7 @@ public:
        while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
        idx = idx % CHANNEL_MSG_HISTORY_SIZE;
        
-        if (_messages[idx].valid && _messages[idx].channel_idx == _viewChannelIdx) {
+        if (msgMatchesView(_messages[idx])) {
          channelMsgs[numChannelMsgs++] = idx;
        }
      }
@@ -749,7 +1163,7 @@ public:
          #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, contentW, maxFillH);
 #else
-          display.fillRect(0, y + 5, contentW, maxFillH);
+          display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), contentW, maxFillH);
 #endif
        }
        
@@ -910,7 +1324,7 @@ public:
 #if defined(LilyGo_T5S3_EPaper_Pro)
            display.fillRect(0, y, contentW, maxFillH - usedH);
 #else
-            display.fillRect(0, y + 5, contentW, maxFillH - usedH);
+            display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), contentW, maxFillH - usedH);
 #endif
          }
        }
@@ -968,13 +1382,20 @@ public:
    
 #if defined(LilyGo_T5S3_EPaper_Pro)
    display.setCursor(0, footerY);
-    display.print("Swipe:Ch/Scroll");
-    const char* midCh = "Tap:Path";
-    display.setCursor((display.width() - display.getTextWidth(midCh)) / 2, footerY);
-    display.print(midCh);
-    const char* rtCh = "Hold:Compose";
-    display.setCursor(display.width() - display.getTextWidth(rtCh) - 2, footerY);
-    display.print(rtCh);
+    if (_viewChannelIdx == 0xFF) {
+      display.print("Swipe:Scroll");
+      const char* rtCh = "Hold:Reply";
+      display.setCursor(display.width() - display.getTextWidth(rtCh) - 2, footerY);
+      display.print(rtCh);
+    } else {
+      display.print("Swipe:Ch/Scroll");
+      const char* midCh = "Tap:Path";
+      display.setCursor((display.width() - display.getTextWidth(midCh)) / 2, footerY);
+      display.print(midCh);
+      const char* rtCh = "Hold:Compose";
+      display.setCursor(display.width() - display.getTextWidth(rtCh) - 2, footerY);
+      display.print(rtCh);
+    }
 #else
    // Left side: abbreviated controls
    if (_replySelectMode) {
@@ -982,6 +1403,15 @@ public:
      const char* rightText = "Ent:Reply";
      display.setCursor(display.width() - display.getTextWidth(rightText) - 2, footerY);
      display.print(rightText);
+    } else if (_viewChannelIdx == 0xFF) {
+      if (_dmContactPerms > 0) {
+        display.print("Q:Exit L:Admin");
+      } else {
+        display.print("Q:Exit");
+      }
+      const char* rightText = "Ent:Reply";
+      display.setCursor(display.width() - display.getTextWidth(rightText) - 2, footerY);
+      display.print(rightText);
    } else {
      display.print("Q:Bck A/D:Ch R:Rply");
      const char* rightText = "Ent:New";
@@ -1080,10 +1510,92 @@ public:
      return true;  // Consume all other keys in reply select
    }

+    // --- DM Inbox mode (two-level DM view) ---
+    if (_viewChannelIdx == 0xFF && _dmInboxMode) {
+      // W - scroll up in inbox
+      if (c == 'w' || c == 'W' || c == 0xF2) {
+        if (_dmInboxScroll > 0) { _dmInboxScroll--; return true; }
+        return false;
+      }
+      // S - scroll down in inbox
+      if (c == 's' || c == 'S' || c == 0xF1) {
+        _dmInboxScroll++;  // Clamped during render
+        return true;
+      }
+      // Enter - open conversation for selected entry
+      if (c == '\r' || c == 13) {
+        // Rebuild inbox by hash to find the selected entry
+        uint32_t seenHash[DM_INBOX_MAX];
+        int cur = 0;
+        for (int i = 0; i < _msgCount; i++) {
+          int idx = _newestIdx - i;
+          while (idx < 0) idx += CHANNEL_MSG_HISTORY_SIZE;
+          idx = idx % CHANNEL_MSG_HISTORY_SIZE;
+          if (!_messages[idx].valid || _messages[idx].channel_idx != 0xFF) continue;
+          if (_messages[idx].dm_peer_hash == 0) continue;
+
+          uint32_t h = _messages[idx].dm_peer_hash;
+          bool dup = false;
+          for (int k = 0; k < cur; k++) {
+            if (seenHash[k] == h) { dup = true; break; }
+          }
+          if (dup) continue;
+          if (cur < DM_INBOX_MAX) seenHash[cur] = h;
+
+          if (cur == _dmInboxScroll) {
+            // Found the selected entry — look up name from contacts
+            _dmFilterName[0] = '\0';
+            _dmContactIdx = -1;
+            _dmContactPerms = 0;
+            uint32_t numC = the_mesh.getNumContacts();
+            ContactInfo ci;
+            for (uint32_t c2 = 0; c2 < numC; c2++) {
+              if (the_mesh.getContactByIdx(c2, ci) && peerHash(ci.name) == h) {
+                strncpy(_dmFilterName, ci.name, sizeof(_dmFilterName) - 1);
+                _dmFilterName[sizeof(_dmFilterName) - 1] = '\0';
+                _dmContactIdx = (int)c2;
+                break;
+              }
+            }
+            // Fallback to text extraction if contact not found
+            if (_dmFilterName[0] == '\0') {
+              extractSenderName(_messages[idx].text, _dmFilterName, sizeof(_dmFilterName));
+            }
+            _dmInboxMode = false;
+            _scrollPos = 0;
+            return true;
+          }
+          cur++;
+        }
+        return true;
+      }
+      // Q - let main.cpp handle (back to home)
+      if (c == 'q' || c == 'Q' || c == '\b') {
+        return false;
+      }
+      // A/D pass through to channel switching below
+      if (c == 'a' || c == 'A' || c == 'd' || c == 'D') {
+        // Fall through to channel switching
+      } else {
+        return true;  // Consume other keys
+      }
+    }
+
+    // --- DM Conversation mode: Q goes back to inbox ---
+    if (_viewChannelIdx == 0xFF && !_dmInboxMode) {
+      if (c == 'q' || c == 'Q' || c == '\b') {
+        _dmInboxMode = true;
+        _dmFilterName[0] = '\0';
+        _scrollPos = 0;
+        return true;
+      }
+    }
+
    int channelMsgCount = getMessageCountForChannel();

-    // R - enter reply select mode
+    // R - enter reply select mode (group channels only — DM tab uses Enter to reply)
    if (c == 'r' || c == 'R') {
+      if (_viewChannelIdx == 0xFF) return false;  // Not applicable on DM tab
      if (channelMsgCount > 0) {
        _replySelectMode = true;
        // Start with newest message selected
@@ -1120,14 +1632,12 @@ public:
      }
    }
    
-    // A - previous channel
+    // A - previous channel (includes DM tab at 0xFF)
    if (c == 'a' || c == 'A') {
      _replySelectMode = false;
      _replySelectPos = -1;
-      if (_viewChannelIdx > 0) {
-        _viewChannelIdx--;
-      } else {
-        // Wrap to last valid channel
+      if (_viewChannelIdx == 0xFF) {
+        // DM tab → go to last valid group channel
        for (uint8_t i = MAX_GROUP_CHANNELS - 1; i > 0; i--) {
          ChannelDetails ch;
          if (the_mesh.getChannel(i, ch) && ch.name[0] != '\0') {
@@ -1135,22 +1645,64 @@ public:
            break;
          }
        }
+      } else if (_viewChannelIdx > 0) {
+        // Skip backwards over any empty/gap slots
+        uint8_t prev = _viewChannelIdx - 1;
+        bool found = false;
+        while (true) {
+          ChannelDetails ch;
+          if (the_mesh.getChannel(prev, ch) && ch.name[0] != '\0') {
+            _viewChannelIdx = prev;
+            found = true;
+            break;
+          }
+          if (prev == 0) break;
+          prev--;
+        }
+        if (!found) {
+          // No valid channel below → wrap to DM tab
+          _viewChannelIdx = 0xFF;
+          _dmInboxMode = true;
+          _dmInboxScroll = 0;
+          _dmFilterName[0] = '\0';
+        }
+      } else {
+        // Channel 0 → wrap to DM tab
+        _viewChannelIdx = 0xFF;
+        _dmInboxMode = true;
+        _dmInboxScroll = 0;
+        _dmFilterName[0] = '\0';
      }
      _scrollPos = 0;
      markChannelRead(_viewChannelIdx);
      return true;
    }
    
-    // D - next channel
+    // D - next channel (includes DM tab at 0xFF)
    if (c == 'd' || c == 'D') {
      _replySelectMode = false;
      _replySelectPos = -1;
-      ChannelDetails ch;
-      uint8_t nextIdx = _viewChannelIdx + 1;
-      if (the_mesh.getChannel(nextIdx, ch) && ch.name[0] != '\0') {
-        _viewChannelIdx = nextIdx;
-      } else {
+      if (_viewChannelIdx == 0xFF) {
+        // DM tab → wrap to channel 0
        _viewChannelIdx = 0;
+      } else {
+        // Skip forward over any empty/gap slots
+        bool found = false;
+        for (uint8_t next = _viewChannelIdx + 1; next < MAX_GROUP_CHANNELS; next++) {
+          ChannelDetails ch;
+          if (the_mesh.getChannel(next, ch) && ch.name[0] != '\0') {
+            _viewChannelIdx = next;
+            found = true;
+            break;
+          }
+        }
+        if (!found) {
+          // Past last channel → go to DM tab
+          _viewChannelIdx = 0xFF;
+          _dmInboxMode = true;
+          _dmInboxScroll = 0;
+          _dmFilterName[0] = '\0';
+        }
      }
      _scrollPos = 0;
      markChannelRead(_viewChannelIdx);
--- a/examples/companion_radio/ui-new/Contactsscreen.h
+++ b/examples/companion_radio/ui-new/Contactsscreen.h
@@ -40,6 +40,9 @@ private:
  // How many rows fit on screen (computed during render)
  int _rowsPerPage;

+  // Pointer to per-contact DM unread array (owned by UITask, set via setter)
+  const uint8_t* _dmUnread = nullptr;
+
  // --- helpers ---

  static const char* filterLabel(FilterMode f) {
@@ -145,6 +148,9 @@ public:

  void invalidateCache() { _cacheValid = false; }

+  // Set pointer to per-contact DM unread array (called by UITask after allocation)
+  void setDMUnreadPtr(const uint8_t* ptr) { _dmUnread = ptr; }
+
  void resetScroll() {
    _scrollPos = 0;
    _cacheValid = false;
@@ -152,6 +158,31 @@ public:

  FilterMode getFilter() const { return _filter; }

+  // Tap-to-select: given virtual Y, select contact row.
+  // Returns: 0=miss, 1=moved, 2=tapped current row.
+  int selectRowAtVY(int vy) {
+    if (_filteredCount == 0) return 0;
+    const int headerH = 14, footerH = 14, lineH = the_mesh.getNodePrefs()->smallLineH();
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    const int bodyTop = headerH;
+#else
+    const int bodyTop = headerH + the_mesh.getNodePrefs()->smallHighlightOff();
+#endif
+    if (vy < bodyTop || vy >= 128 - footerH) return 0;
+
+    int maxVisible = (128 - headerH - footerH) / lineH;
+    if (maxVisible < 3) maxVisible = 3;
+    int startIdx = max(0, min(_scrollPos - maxVisible / 2,
+                              _filteredCount - maxVisible));
+
+    int tappedRow = startIdx + (vy - bodyTop) / lineH;
+    if (tappedRow < 0 || tappedRow >= _filteredCount) return 0;
+
+    if (tappedRow == _scrollPos) return 2;
+    _scrollPos = tappedRow;
+    return 1;
+  }
+
  // Get the raw contact table index for the currently highlighted item
  // Returns -1 if no valid selection
  int getSelectedContactIdx() const {
@@ -204,8 +235,8 @@ public:
    display.drawRect(0, 11, display.width(), 1);

    // === Body - contact rows ===
-    display.setTextSize(0);  // tiny font for compact rows
-    int lineHeight = 9;      // 8px font + 1px gap
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());  // tiny font for compact rows
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();      // 8px font + 1px gap
    int headerHeight = 14;
    int footerHeight = 14;
    int maxY = display.height() - footerHeight;
@@ -244,7 +275,7 @@ public:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width(), lineHeight);
 #else
-          display.fillRect(0, y + 5, display.width(), lineHeight);
+          display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineHeight);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -278,9 +309,14 @@ public:
        char ageStr[6];
        formatAge(ageStr, sizeof(ageStr), now, contact.last_advert_timestamp);

-        // Build right-side string: "hops age"
-        char rightStr[14];
-        snprintf(rightStr, sizeof(rightStr), "%sh %s", hopStr, ageStr);
+        // Build right-side string: "*N hops age" if unread, else "hops age"
+        int dmCount = (_dmUnread && _filteredIdx[i] < MAX_CONTACTS) ? _dmUnread[_filteredIdx[i]] : 0;
+        char rightStr[20];
+        if (dmCount > 0) {
+          snprintf(rightStr, sizeof(rightStr), "*%d %sh %s", dmCount, hopStr, ageStr);
+        } else {
+          snprintf(rightStr, sizeof(rightStr), "%sh %s", hopStr, ageStr);
+        }
        int rightWidth = display.getTextWidth(rightStr) + 2;

        // Name region: after prefix + small gap, before right info
@@ -314,15 +350,10 @@ public:
 #else
    // Left: Q:Bk
    display.setCursor(0, footerY);
-    display.print("Q:Bk");
+    display.print("Q:Bk A/D:Filter");

-    // Center: A/D:Filter
-    const char* mid = "A/D:Filtr";
-    display.setCursor((display.width() - display.getTextWidth(mid)) / 2, footerY);
-    display.print(mid);
-
-    // Right: F:Dscvr
-    const char* right = "F:Dscvr";
+    // Right: Tap/Ent:Select
+    const char* right = "Tap/Ent:Select";
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #endif
--- a/examples/companion_radio/ui-new/Discoveryscreen.h
+++ b/examples/companion_radio/ui-new/Discoveryscreen.h
@@ -44,6 +44,32 @@ public:

  int getSelectedIdx() const { return _scrollPos; }

+  // Tap-to-select: given virtual Y, select discovered node row.
+  // Returns: 0=miss, 1=moved, 2=tapped current row.
+  int selectRowAtVY(int vy) {
+    int count = the_mesh.getDiscoveredCount();
+    if (count == 0) return 0;
+    const int headerH = 14, footerH = 14, lineH = the_mesh.getNodePrefs()->smallLineH();
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    const int bodyTop = headerH;
+#else
+    const int bodyTop = headerH + the_mesh.getNodePrefs()->smallHighlightOff();
+#endif
+    if (vy < bodyTop || vy >= 128 - footerH) return 0;
+
+    int maxVisible = (128 - headerH - footerH) / lineH;
+    if (maxVisible < 3) maxVisible = 3;
+    int startIdx = max(0, min(_scrollPos - maxVisible / 2,
+                              count - maxVisible));
+
+    int tappedRow = startIdx + (vy - bodyTop) / lineH;
+    if (tappedRow < 0 || tappedRow >= count) return 0;
+
+    if (tappedRow == _scrollPos) return 2;
+    _scrollPos = tappedRow;
+    return 1;
+  }
+
  int render(DisplayDriver& display) override {
    int count = the_mesh.getDiscoveredCount();
    bool active = the_mesh.isDiscoveryActive();
@@ -65,8 +91,8 @@ public:
    display.drawRect(0, 11, display.width(), 1);

    // === Body — discovered node rows ===
-    display.setTextSize(0);  // tiny font for compact rows
-    int lineHeight = 9;
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());  // tiny font for compact rows
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();
    int headerHeight = 14;
    int footerHeight = 14;
    int maxY = display.height() - footerHeight;
@@ -103,7 +129,7 @@ public:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width(), lineHeight);
 #else
-          display.fillRect(0, y + 5, display.width(), lineHeight);
+          display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineHeight);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -177,13 +203,9 @@ public:
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #else
-    display.print("Q:Back");
+    display.print("Q:Bk F:Rescan");

-    const char* mid = "Ent:Add";
-    display.setCursor((display.width() - display.getTextWidth(mid)) / 2, footerY);
-    display.print(mid);
-
-    const char* right = "F:Rescan";
+    const char* right = "Tap/Ent:Add";
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #endif
--- a/examples/companion_radio/ui-new/Lastheardscreen.h
+++ b/examples/companion_radio/ui-new/Lastheardscreen.h
@@ -0,0 +1,237 @@
+#pragma once
+
+#include <helpers/ui/UIScreen.h>
+#include <helpers/ui/DisplayDriver.h>
+#include <helpers/AdvertDataHelpers.h>
+#include <MeshCore.h>
+
+extern MyMesh the_mesh;
+
+// ==========================================================================
+// Last Heard Screen — passive advert list
+// Shows all recently heard nodes from the advert path table, sorted by
+// recency. Unlike Discovery (active zero-hop scan), this is purely passive
+// — it shows nodes whose adverts have been received over time.
+// ==========================================================================
+class LastHeardScreen : public UIScreen {
+  mesh::RTCClock* _rtc;
+  int _scrollPos;
+
+  // Local sorted copy of advert paths (refreshed each render)
+  AdvertPath _entries[ADVERT_PATH_TABLE_SIZE];
+  int _count;
+
+  static char typeChar(uint8_t adv_type) {
+    switch (adv_type) {
+      case ADV_TYPE_CHAT:     return 'C';
+      case ADV_TYPE_REPEATER: return 'R';
+      case ADV_TYPE_ROOM:     return 'S';
+      case ADV_TYPE_SENSOR:   return 'N';
+      default:                return '?';
+    }
+  }
+
+  // Format age as human-readable string (e.g. "2m", "1h", "3d")
+  static void formatAge(uint32_t now, uint32_t timestamp, char* buf, int bufLen) {
+    if (timestamp == 0 || now < timestamp) {
+      snprintf(buf, bufLen, "---");
+      return;
+    }
+    uint32_t age = now - timestamp;
+    if (age < 60)         snprintf(buf, bufLen, "%ds", age);
+    else if (age < 3600)  snprintf(buf, bufLen, "%dm", age / 60);
+    else if (age < 86400) snprintf(buf, bufLen, "%dh", age / 3600);
+    else                  snprintf(buf, bufLen, "%dd", age / 86400);
+  }
+
+public:
+  LastHeardScreen(mesh::RTCClock* rtc)
+    : _rtc(rtc), _scrollPos(0), _count(0) {}
+
+  void resetScroll() { _scrollPos = 0; }
+
+  int getSelectedIdx() const { return _scrollPos; }
+
+  // Check if selected node is already in contacts
+  bool isSelectedInContacts() const {
+    if (_scrollPos < 0 || _scrollPos >= _count) return false;
+    return the_mesh.lookupContactByPubKey(_entries[_scrollPos].pubkey_prefix, 8) != nullptr;
+  }
+
+  // Get selected entry (for add/delete operations)
+  const AdvertPath* getSelectedEntry() const {
+    if (_scrollPos < 0 || _scrollPos >= _count) return nullptr;
+    return &_entries[_scrollPos];
+  }
+
+  // Tap-to-select: given virtual Y, select row.
+  // Returns: 0=miss, 1=moved, 2=tapped current row.
+  int selectRowAtVY(int vy) {
+    if (_count == 0) return 0;
+    const int headerH = 14, footerH = 14, lineH = the_mesh.getNodePrefs()->smallLineH();
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    const int bodyTop = headerH;
+#else
+    const int bodyTop = headerH + the_mesh.getNodePrefs()->smallHighlightOff();
+#endif
+    if (vy < bodyTop || vy >= 128 - footerH) return 0;
+
+    int maxVisible = (128 - headerH - footerH) / lineH;
+    if (maxVisible < 3) maxVisible = 3;
+    int startIdx = max(0, min(_scrollPos - maxVisible / 2,
+                              _count - maxVisible));
+
+    int tappedRow = startIdx + (vy - bodyTop) / lineH;
+    if (tappedRow < 0 || tappedRow >= _count) return 0;
+
+    if (tappedRow == _scrollPos) return 2;
+    _scrollPos = tappedRow;
+    return 1;
+  }
+
+  int render(DisplayDriver& display) override {
+    // Refresh sorted list from mesh
+    _count = the_mesh.getRecentlyHeard(_entries, ADVERT_PATH_TABLE_SIZE);
+
+    // Filter out empty entries (recv_timestamp == 0)
+    int validCount = 0;
+    for (int i = 0; i < _count; i++) {
+      if (_entries[i].recv_timestamp > 0) validCount++;
+      else break;  // sorted by recency, so first zero means rest are empty
+    }
+    _count = validCount;
+
+    if (_scrollPos >= _count) _scrollPos = max(0, _count - 1);
+
+    uint32_t now = _rtc->getCurrentTime();
+
+    // === Header ===
+    display.setTextSize(1);
+    display.setColor(DisplayDriver::GREEN);
+    display.setCursor(0, 0);
+
+    char hdr[32];
+    snprintf(hdr, sizeof(hdr), "Last Heard: %d nodes", _count);
+    display.print(hdr);
+
+    display.drawRect(0, 11, display.width(), 1);
+
+    // === Body — node rows ===
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();
+    int headerHeight = 14;
+    int footerHeight = 14;
+    int maxY = display.height() - footerHeight;
+    int y = headerHeight;
+
+    if (_count == 0) {
+      display.setColor(DisplayDriver::LIGHT);
+      display.setCursor(4, 28);
+      display.print("No adverts received yet");
+      display.setCursor(4, 38);
+      display.print("Nodes appear as adverts arrive");
+    } else {
+      int maxVisible = (maxY - headerHeight) / lineHeight;
+      if (maxVisible < 3) maxVisible = 3;
+      int startIdx = max(0, min(_scrollPos - maxVisible / 2,
+                                _count - maxVisible));
+      int endIdx = min(_count, startIdx + maxVisible);
+
+      for (int i = startIdx; i < endIdx && y + lineHeight <= maxY; i++) {
+        const AdvertPath& entry = _entries[i];
+        bool selected = (i == _scrollPos);
+
+        // Highlight selected row
+        if (selected) {
+          display.setColor(DisplayDriver::LIGHT);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+          display.fillRect(0, y, display.width(), lineHeight);
+#else
+          display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineHeight);
+#endif
+          display.setColor(DisplayDriver::DARK);
+        } else {
+          display.setColor(DisplayDriver::LIGHT);
+        }
+
+        display.setCursor(0, y);
+
+        // Prefix: cursor + type char
+        char prefix[4];
+        snprintf(prefix, sizeof(prefix), "%c%c",
+                 selected ? '>' : ' ', typeChar(entry.type));
+        display.print(prefix);
+
+        // Right side: age + hops + [★] for favourites, [+] for other contacts
+        char rightStr[20];
+        char ageBuf[8];
+        formatAge(now, entry.recv_timestamp, ageBuf, sizeof(ageBuf));
+
+        ContactInfo* ci = the_mesh.lookupContactByPubKey(entry.pubkey_prefix, 8);
+        bool inContacts = (ci != nullptr);
+        bool isFav = inContacts && (ci->flags & 0x01);
+        if (isFav) {
+          snprintf(rightStr, sizeof(rightStr), "%s %dh [*]", ageBuf, entry.path_len & 63);
+        } else if (inContacts) {
+          snprintf(rightStr, sizeof(rightStr), "%s %dh [+]", ageBuf, entry.path_len & 63);
+        } else {
+          snprintf(rightStr, sizeof(rightStr), "%s %dh", ageBuf, entry.path_len & 63);
+        }
+        int rightWidth = display.getTextWidth(rightStr) + 2;
+
+        // Name (truncated with ellipsis)
+        char filteredName[32];
+        display.translateUTF8ToBlocks(filteredName, entry.name, sizeof(filteredName));
+        int nameX = display.getTextWidth(prefix) + 2;
+        int nameMaxW = display.width() - nameX - rightWidth - 2;
+        display.drawTextEllipsized(nameX, y, nameMaxW, filteredName);
+
+        // Right-aligned info
+        display.setCursor(display.width() - rightWidth, y);
+        display.print(rightStr);
+
+        y += lineHeight;
+      }
+    }
+
+    display.setTextSize(1);
+
+    // === Footer ===
+    int footerY = display.height() - 12;
+    display.drawRect(0, footerY - 2, display.width(), 1);
+    display.setColor(DisplayDriver::YELLOW);
+
+    display.setCursor(0, footerY);
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    display.print("Swipe:Scroll");
+    const char* right = "Tap:Add/Del";
+    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
+    display.print(right);
+#else
+    display.print("Q:Bk");
+    const char* right = "Tap/Ent:Add/Del";
+    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
+    display.print(right);
+#endif
+
+    return 5000;  // refresh every 5s to update ages
+  }
+
+  bool handleInput(char c) override {
+    // Scroll up
+    if (c == 'w' || c == 'W' || c == 0xF2) {
+      if (_scrollPos > 0) { _scrollPos--; return true; }
+      return false;
+    }
+
+    // Scroll down
+    if (c == 's' || c == 'S' || c == 0xF1) {
+      if (_scrollPos < _count - 1) { _scrollPos++; return true; }
+      return false;
+    }
+
+    // Enter — handled by main.cpp (needs access to private MyMesh methods)
+    // Q — handled by main.cpp (navigation)
+    return false;
+  }
+};
--- a/examples/companion_radio/ui-new/Mapscreen.h
+++ b/examples/companion_radio/ui-new/Mapscreen.h
@@ -137,22 +137,18 @@ public:
      _zoomMin(MAP_MIN_ZOOM),
      _zoomMax(MAP_MAX_ZOOM),
      _pngBuf(nullptr),
+      _lineBuf(nullptr),
      _tileFound(false)
  {
-    // Allocate marker array in PSRAM at construction (~20KB)
-    // so addMarker() works before enter() is called
-    _markers = (MapMarker*)ps_calloc(MAP_MAX_MARKERS, sizeof(MapMarker));
-    if (_markers) {
-      Serial.printf("MapScreen: markers allocated (%d × %d = %d bytes PSRAM)\n",
-                     MAP_MAX_MARKERS, (int)sizeof(MapMarker),
-                     MAP_MAX_MARKERS * (int)sizeof(MapMarker));
-    } else {
-      Serial.println("MapScreen: marker PSRAM alloc FAILED");
-    }
+    // Marker array and PNG buffers are deferred to enter() to avoid
+    // consuming 20KB+ PSRAM at boot when the map may never be opened.
+    _markers = nullptr;
+    _numMarkers = 0;
  }

  ~MapScreen() {
    if (_pngBuf) { free(_pngBuf); _pngBuf = nullptr; }
+    if (_lineBuf) { free(_lineBuf); _lineBuf = nullptr; }
    if (_markers) { free(_markers); _markers = nullptr; }
  }

@@ -184,7 +180,12 @@ public:
  // Add a location marker (call once per contact before entering map)
  void clearMarkers() { _numMarkers = 0; }
  void addMarker(double lat, double lon, const char* name = "", uint8_t type = 0) {
-    if (!_markers || _numMarkers >= MAP_MAX_MARKERS) return;
+    // Lazy-allocate markers on first use (deferred from constructor)
+    if (!_markers) {
+      _markers = (MapMarker*)ps_calloc(MAP_MAX_MARKERS, sizeof(MapMarker));
+      if (!_markers) return;  // Alloc failed — skip silently
+    }
+    if (_numMarkers >= MAP_MAX_MARKERS) return;
    if (lat == 0.0 && lon == 0.0) return;  // Skip no-location contacts
    _markers[_numMarkers].lat = lat;
    _markers[_numMarkers].lon = lon;
@@ -203,6 +204,18 @@ public:
    _einkDisplay = static_cast<GxEPDDisplay*>(&display);
    _needsRedraw = true;

+    // Allocate marker array in PSRAM on first use (~20KB)
+    if (!_markers) {
+      _markers = (MapMarker*)ps_calloc(MAP_MAX_MARKERS, sizeof(MapMarker));
+      if (_markers) {
+        Serial.printf("MapScreen: markers allocated (%d × %d = %d bytes PSRAM)\n",
+                       MAP_MAX_MARKERS, (int)sizeof(MapMarker),
+                       MAP_MAX_MARKERS * (int)sizeof(MapMarker));
+      } else {
+        Serial.println("MapScreen: marker PSRAM alloc FAILED");
+      }
+    }
+
    // Allocate PNG read buffer in PSRAM on first use
    if (!_pngBuf) {
      _pngBuf = (uint8_t*)ps_malloc(MAP_PNG_BUF_SIZE);
@@ -217,6 +230,20 @@ public:
      }
    }

+    // Allocate scanline decode buffer in PSRAM (512 bytes — avoids stack
+    // allocation inside the PNGdec callback which is called 256× per tile)
+    if (!_lineBuf) {
+      _lineBuf = (uint16_t*)ps_malloc(MAP_TILE_SIZE * sizeof(uint16_t));
+      if (!_lineBuf) {
+        _lineBuf = (uint16_t*)malloc(MAP_TILE_SIZE * sizeof(uint16_t));
+      }
+      if (_lineBuf) {
+        Serial.println("MapScreen: lineBuf allocated");
+      } else {
+        Serial.println("MapScreen: lineBuf alloc FAILED");
+      }
+    }
+
    // Detect available zoom levels from SD card directories
    detectZoomRange();
  }
@@ -356,6 +383,7 @@ private:

  // PNG decode buffer (PSRAM)
  uint8_t* _pngBuf;
+  uint16_t* _lineBuf;  // Scanline RGB565 buffer for PNG decode (PSRAM)
  bool _tileFound;      // Did last tile load succeed?

  // PNGdec instance
@@ -381,6 +409,7 @@ private:
    int offsetY;      // Screen Y offset for this tile
    int viewportY;    // Top of viewport (MAP_VIEWPORT_Y)
    int viewportH;    // Height of viewport (MAP_VIEWPORT_H)
+    uint16_t* lineBuf; // Scanline decode buffer (PSRAM-allocated, avoids 512B stack usage per callback)
  };
  DrawContext _drawCtx;

@@ -487,7 +516,7 @@ private:
  // Load a PNG tile from SD and decode it directly to the display
  // screenX, screenY = top-left corner on display where this tile goes
  bool loadAndRenderTile(int tileX, int tileY, int screenX, int screenY) {
-    if (!_pngBuf || !_einkDisplay) return false;
+    if (!_pngBuf || !_lineBuf || !_einkDisplay) return false;

    char path[64];
    buildTilePath(path, sizeof(path), _zoom, tileX, tileY);
@@ -521,6 +550,7 @@ private:
    _drawCtx.offsetY   = screenY;
    _drawCtx.viewportY = MAP_VIEWPORT_Y;
    _drawCtx.viewportH = MAP_VIEWPORT_H;
+    _drawCtx.lineBuf   = _lineBuf;

    // Open PNG from memory buffer
    int rc = _png.openRAM(_pngBuf, fileSize, pngDrawCallback);
@@ -547,7 +577,7 @@ private:
  // Uses getLineAsRGB565 with correct (little) endianness for ESP32.
  static int pngDrawCallback(PNGDRAW* pDraw) {
    DrawContext* ctx = (DrawContext*)pDraw->pUser;
-    if (!ctx || !ctx->display || !ctx->png) return 0;
+    if (!ctx || !ctx->display || !ctx->png || !ctx->lineBuf) return 0;

    int screenY = ctx->offsetY + pDraw->y;

@@ -564,9 +594,8 @@ private:
    }

    uint16_t lineWidth = pDraw->iWidth;
-    uint16_t lineBuf[MAP_TILE_SIZE];
    if (lineWidth > MAP_TILE_SIZE) lineWidth = MAP_TILE_SIZE;
-    ctx->png->getLineAsRGB565(pDraw, lineBuf, PNG_RGB565_LITTLE_ENDIAN, 0xFFFFFFFF);
+    ctx->png->getLineAsRGB565(pDraw, ctx->lineBuf, PNG_RGB565_LITTLE_ENDIAN, 0xFFFFFFFF);

    for (int x = 0; x < lineWidth; x++) {
      int screenX = ctx->offsetX + x;
@@ -574,7 +603,7 @@ private:

      // RGB565 little-endian on ESP32: standard bit layout
      // R[15:11] G[10:5] B[4:0]
-      uint16_t pixel = lineBuf[x];
+      uint16_t pixel = ctx->lineBuf[x];

      // For B&W tiles this is 0x0000 (black) or 0xFFFF (white)
      // Simple threshold on full 16-bit value handles both cleanly
@@ -639,6 +668,7 @@ private:
        } else {
          missing++;
        }
+        yield();  // Feed WDT between tiles — each tile can take 1-2s at 80MHz
      }
    }

--- a/examples/companion_radio/ui-new/Notesscreen.h
+++ b/examples/companion_radio/ui-new/Notesscreen.h
@@ -5,6 +5,7 @@
 #include <SD.h>
 #include <vector>
 #include "Utf8CP437.h"
+#include "../NodePrefs.h"

 // Forward declarations
 class UITask;
@@ -52,9 +53,11 @@ public:

 private:
  UITask* _task;
+  NodePrefs* _prefs;
  Mode _mode;
  bool _sdReady;
  bool _initialized;
+  uint8_t _lastFontPref;
  DisplayDriver* _display;

  // Display layout (calculated once from display metrics)
@@ -102,6 +105,10 @@ private:
  uint32_t _rtcTime;      // Unix timestamp (0 = unavailable)
  int8_t _utcOffset;      // UTC offset in hours

+  // Callback to get fresh RTC time (set by UITask at init)
+  typedef uint32_t (*TimeGetterFn)();
+  TimeGetterFn _getTimeFn = nullptr;
+
  // ---- Helpers ----

  String getFullPath(const String& filename) {
@@ -514,8 +521,8 @@ private:
    display.drawRect(0, 11, display.width(), 1);

    // File list with "+ New Note" at index 0
-    display.setTextSize(0);
-    int listLineH = 9;   // Match contacts/discovery for consistent selection highlight
+    display.setTextSize(_prefs->smallTextSize());
+    int listLineH = _prefs->smallLineH();
    int startY = 14;
    int totalItems = 1 + (int)_fileList.size();
    int maxVisible = (display.height() - startY - _footerHeight) / listLineH;
@@ -535,27 +542,21 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
        display.fillRect(0, y, display.width(), listLineH);
 #else
-        display.fillRect(0, y + 5, display.width(), listLineH);
+        display.fillRect(0, y + _prefs->smallHighlightOff(), display.width(), listLineH);
 #endif
        display.setColor(DisplayDriver::DARK);
      } else {
        display.setColor(DisplayDriver::LIGHT);
      }

-      display.setCursor(0, y);
-
      if (i == 0) {
        display.setColor(selected ? DisplayDriver::DARK : DisplayDriver::GREEN);
-        display.print(selected ? "> + New Note" : "  + New Note");
+        display.drawTextEllipsized(0, y, display.width() - 4,
+                                   selected ? "> + New Note" : "  + New Note");
      } else {
        String line = selected ? "> " : "  ";
-        String name = _fileList[i - 1];
-        int maxLen = _charsPerLine - 4;
-        if ((int)name.length() > maxLen) {
-          name = name.substring(0, maxLen - 3) + "...";
-        }
-        line += name;
-        display.print(line.c_str());
+        line += _fileList[i - 1];
+        display.drawTextEllipsized(0, y, display.width() - 4, line.c_str());
      }
      y += listLineH;
    }
@@ -570,8 +571,8 @@ private:
    display.print("Swipe:Nav");
    const char* right = "Tap:Open";
 #else
-    display.print("Q:Back W/S:Nav");
-    const char* right = "Ent:Open";
+    display.print("Q:Bk");
+    const char* right = "Tap/Ent:Open";
 #endif
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
@@ -592,8 +593,8 @@ private:
      display.print("Tap:Edit");
      const char* right = "Hold:Delete";
 #else
-      display.print("Q:Bck Ent:Edit");
-      const char* right = "Sh+Del:Del";
+      display.print("Q:Bk Ent:Edit");
+      const char* right = "X:Delete";
 #endif
      display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
      display.print(right);
@@ -601,7 +602,7 @@ private:
    }

    // Render current page using tiny font
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);

    int pageStart = _pageOffsets[_currentPage];
@@ -684,9 +685,9 @@ private:

    const char* right = "Tap:Edit";
 #else
-    display.print("Q:Bck Ent:Edit");
+    display.print("Q:Bk Ent:Edit");

-    const char* right = "Sh+Del:Del";
+    const char* right = "X:Delete";
 #endif
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
@@ -718,7 +719,7 @@ private:
    int textAreaTop = 14;
    int textAreaBottom = display.height() - 16;

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());

    // Find cursor line
    int cursorLine = lineForPos(_cursorPos);
@@ -767,7 +768,7 @@ private:

    // If buffer is empty, show cursor at top
    if (_bufLen == 0) {
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::GREEN);
      display.setCursor(0, textAreaTop);
      display.print("|");
@@ -825,7 +826,7 @@ private:
    display.setCursor(0, 20);
    display.setColor(DisplayDriver::LIGHT);
    display.print("From: ");
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    String origDisplay = _renameOriginal;
    if (origDisplay.length() > 30) origDisplay = origDisplay.substring(0, 27) + "...";
    display.print(origDisplay.c_str());
@@ -836,7 +837,7 @@ private:
    display.setColor(DisplayDriver::LIGHT);
    display.print("To:   ");

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::GREEN);
    char displayName[NOTES_RENAME_MAX + 2];
    snprintf(displayName, sizeof(displayName), "%s|", _renameBuf);
@@ -876,7 +877,7 @@ private:
    display.setCursor(0, 25);
    display.print("File:");

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setCursor(0, 38);
    String nameDisplay = _deleteTarget;
    if (nameDisplay.length() > 35) nameDisplay = nameDisplay.substring(0, 32) + "...";
@@ -1077,6 +1078,10 @@ private:
  // ---- Note Creation ----

  void createNewNote() {
+    // Refresh timestamp at creation time for accurate filenames
+    if (_getTimeFn) {
+      _rtcTime = _getTimeFn();
+    }
    _currentFile = generateFilename();
    _buf[0] = '\0';
    _bufLen = 0;
@@ -1088,9 +1093,9 @@ private:
  }

 public:
-  NotesScreen(UITask* task)
-    : _task(task), _mode(FILE_LIST),
-      _sdReady(false), _initialized(false), _display(nullptr),
+  NotesScreen(UITask* task, NodePrefs* prefs = nullptr)
+    : _task(task), _prefs(prefs), _mode(FILE_LIST),
+      _sdReady(false), _initialized(false), _lastFontPref(0), _display(nullptr),
      _charsPerLine(38), _linesPerPage(22), _lineHeight(5), _footerHeight(14),
      _editCharsPerLine(20), _editLineHeight(12), _editMaxLines(8),
      _selectedFile(0), _buf(nullptr), _bufLen(0), _cursorPos(0),
@@ -1125,15 +1130,31 @@ public:
  // ---- Layout Init ----

  void initLayout(DisplayDriver& display) {
+    // Re-init if font preference changed since last layout
+    uint8_t curFont = _prefs ? _prefs->large_font : 0;
+    if (_initialized && curFont != _lastFontPref) {
+      _initialized = false;
+      Serial.println("Notes: font changed, recalculating layout");
+    }
    if (_initialized) return;
+    _lastFontPref = curFont;
    _display = &display;

-    // Tiny font metrics (for read mode)
-    display.setTextSize(0);
+    // Font metrics (for read mode)
+    display.setTextSize(_prefs->smallTextSize());
    uint16_t tenCharsW = display.getTextWidth("MMMMMMMMMM");
    if (tenCharsW > 0) {
      _charsPerLine = (display.width() * 10) / tenCharsW;
    }
+    // Proportional font: use average-width measurement instead of M-width
+    if (_prefs && _prefs->large_font) {
+      const char* sample = "the quick brown fox jumps over lazy dog";
+      uint16_t sampleW = display.getTextWidth(sample);
+      int sampleLen = strlen(sample);
+      if (sampleW > 0 && sampleLen > 0) {
+        _charsPerLine = (display.width() * sampleLen * 70) / ((int)sampleW * 100);
+      }
+    }
    if (_charsPerLine < 15) _charsPerLine = 15;
    if (_charsPerLine > 60) _charsPerLine = 60;

@@ -1143,6 +1164,10 @@ public:
    } else {
      _lineHeight = 5;
    }
+    // Large font: formula above assumes built-in 6x8 ratio — too small for 9pt
+    if (_prefs && _prefs->large_font) {
+      _lineHeight = _prefs->smallLineH();
+    }

    _footerHeight = 14;
    int textAreaHeight = display.height() - _footerHeight;
@@ -1176,6 +1201,8 @@ public:
    _utcOffset = utcOffset;
  }

+  void setTimeGetter(TimeGetterFn fn) { _getTimeFn = fn; }
+
  void enter(DisplayDriver& display) {
    initLayout(display);
    scanFiles();
--- a/examples/companion_radio/ui-new/Repeateradminscreen.h
+++ b/examples/companion_radio/ui-new/Repeateradminscreen.h
@@ -475,6 +475,7 @@ public:

  int getContactIdx() const { return _contactIdx; }
  AdminState getState() const { return _state; }
+  uint8_t getPermissions() const { return _permissions; }

  void onLoginResult(bool success, uint8_t permissions, uint32_t server_time) {
    _waitingForLogin = false;
@@ -561,7 +562,9 @@ public:
    display.setTextSize(1);
    display.setColor(DisplayDriver::GREEN);
    display.setCursor(0, 0);
-    snprintf(tmp, sizeof(tmp), "Admin: %.16s", _repeaterName);
+    const char* hdrPrefix = (_state == STATE_PASSWORD_ENTRY || _state == STATE_LOGGING_IN)
+                             ? "Login" : "Admin";
+    snprintf(tmp, sizeof(tmp), "%s: %.16s", hdrPrefix, _repeaterName);
    display.print(tmp);

    if (_state >= STATE_CATEGORY_MENU && _state <= STATE_RESPONSE_VIEW) {
@@ -774,8 +777,8 @@ private:
  // =====================================================================

  void renderCategoryMenu(DisplayDriver& display, int y, int bodyHeight) {
-    display.setTextSize(0);
-    int lineHeight = 9;
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();

    // Clock drift info line
    if (_serverTime > 0) {
@@ -859,8 +862,8 @@ private:
  // =====================================================================

  void renderCommandMenu(DisplayDriver& display, int y, int bodyHeight) {
-    display.setTextSize(0);
-    int lineHeight = 9;
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();
    const AdminCategoryDef& cat = CATEGORIES[_catSel];

    // Category title
@@ -1022,7 +1025,7 @@ private:
    if (_pendingCmd) display.print(_pendingCmd->label);

    y += 14;
-    display.setTextSize(0);
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
    display.setCursor(0, y);

    // Show the param value if one was collected
@@ -1030,7 +1033,7 @@ private:
      char preview[80];
      snprintf(preview, sizeof(preview), "Value: %s", _paramBuf);
      display.print(preview);
-      y += 10;
+      y += the_mesh.getNodePrefs()->smallLineH() + 1;
      display.setCursor(0, y);
    }

@@ -1068,8 +1071,8 @@ private:
  // =====================================================================

  void renderResponse(DisplayDriver& display, int y, int bodyHeight) {
-    display.setTextSize(0);
-    int lineHeight = 9;
+    display.setTextSize(the_mesh.getNodePrefs()->smallTextSize());
+    int lineHeight = the_mesh.getNodePrefs()->smallLineH();

    display.setColor((_state == STATE_ERROR) ? DisplayDriver::YELLOW : DisplayDriver::LIGHT);

@@ -1163,7 +1166,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
      display.fillRect(0, y, display.width(), lineHeight);
 #else
-      display.fillRect(0, y + 5, display.width(), lineHeight);
+      display.fillRect(0, y + the_mesh.getNodePrefs()->smallHighlightOff(), display.width(), lineHeight);
 #endif
      display.setColor(DisplayDriver::DARK);
    } else if (warn) {
--- a/examples/companion_radio/ui-new/SMSScreen.h
+++ b/examples/companion_radio/ui-new/SMSScreen.h
@@ -36,6 +36,7 @@
 #include "ModemManager.h"
 #include "SMSStore.h"
 #include "SMSContacts.h"
+#include "../NodePrefs.h"

 // Limits
 #define SMS_INBOX_PAGE_SIZE     4
@@ -51,6 +52,7 @@ public:

 private:
  UITask* _task;
+  NodePrefs* _prefs;
  SubView _view;

  // App menu state
@@ -117,8 +119,8 @@ private:
  }

 public:
-  SMSScreen(UITask* task)
-    : _task(task), _view(APP_MENU)
+  SMSScreen(UITask* task, NodePrefs* prefs = nullptr)
+    : _task(task), _prefs(prefs), _view(APP_MENU)
    , _menuCursor(0)
    , _convCount(0), _inboxCursor(0), _inboxScrollTop(0)
    , _msgCount(0), _msgScrollPos(0)
@@ -276,7 +278,7 @@ public:

    // Show modem state text if not ready
    if (ms != ModemState::READY && ms != ModemState::SENDING_SMS) {
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::YELLOW);
      const char* label = ModemManager::stateToString(ms);
      uint16_t labelW = display.getTextWidth(label);
@@ -356,7 +358,7 @@ public:

    // Modem status indicator 
    ModemState ms = modemManager.getState();
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setCursor(4, y + lineHeight + 8);
    if (ms == ModemState::OFF || ms == ModemState::POWERING_ON || 
        ms == ModemState::INITIALIZING) {
@@ -483,7 +485,7 @@ public:
        bool isAction = (row == 4);  // Bottom row has action buttons

        if (isAction) {
-          display.setTextSize(0);
+          display.setTextSize(_prefs->smallTextSize());
          if (col == 2 && _phoneInputPos > 0) {
            display.setColor(DisplayDriver::GREEN);  // CALL
          } else if (col == 1) {
@@ -544,7 +546,7 @@ public:
    display.drawRect(0, 11, display.width(), 1);

    if (_convCount == 0) {
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, 20);
      display.print("No conversations");
@@ -560,8 +562,8 @@ public:
      }
      display.setTextSize(1);
    } else {
-      display.setTextSize(0);
-      int lineHeight = 10;
+      display.setTextSize(_prefs->smallTextSize());
+      int lineHeight = _prefs->smallLineH() + 1;
      int y = 14;

      int visibleCount = (display.height() - 14 - 14) / (lineHeight * 2 + 2);
@@ -643,14 +645,14 @@ public:
    display.drawRect(0, 11, display.width(), 1);

    if (_msgCount == 0) {
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, 25);
      display.print("No messages");
      display.setTextSize(1);
    } else {
-      display.setTextSize(0);
-      int lineHeight = 10;
+      display.setTextSize(_prefs->smallTextSize());
+      int lineHeight = _prefs->smallLineH() + 1;
      int headerHeight = 14;
      int footerHeight = 14;

@@ -764,12 +766,13 @@ public:
      // Message body
      display.setCursor(0, 14);
      display.setColor(DisplayDriver::LIGHT);
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());

      uint16_t testWidth = display.getTextWidth("MMMMMMMMMM");
      int charsPerLine = (testWidth > 0) ? (display.width() * 10) / testWidth : 20;
      if (charsPerLine < 12) charsPerLine = 12;

+      int composeLH = _prefs->smallLineH() + 1;
      int y = 14;
      int x = 0;
      char cs[2] = {0, 0};
@@ -780,7 +783,7 @@ public:
        x++;
        if (x >= charsPerLine) {
          x = 0;
-          y += 10;
+          y += composeLH;
        }
      }

@@ -827,7 +830,7 @@ public:
    int cnt = smsContacts.count();

    if (cnt == 0) {
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, 25);
      display.print("No contacts saved");
@@ -837,8 +840,8 @@ public:
      display.print("and press A to add");
      display.setTextSize(1);
    } else {
-      display.setTextSize(0);
-      int lineHeight = 10;
+      display.setTextSize(_prefs->smallTextSize());
+      int lineHeight = _prefs->smallLineH() + 1;
      int y = 14;

      int visibleCount = (display.height() - 14 - 14) / (lineHeight * 2 + 2);
@@ -900,7 +903,7 @@ public:
    display.drawRect(0, 11, display.width(), 1);

    // Phone number (read-only)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);
    display.setCursor(0, 16);
    display.print("Phone: ");
@@ -956,7 +959,7 @@ public:
    display.print(dispName);

    // Phone number below name (smaller, dimmer)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);
    display.setCursor(4, 36);
    display.print(_callPhone);
@@ -1011,7 +1014,7 @@ public:
    display.print(dispName);

    // Phone number below name (smaller, dimmer)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);
    display.setCursor(4, 36);
    display.print(_callPhone);
@@ -1070,7 +1073,7 @@ public:
    display.print(dispName);

    // Phone number below name (smaller, dimmer)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);
    display.setCursor(4, 36);
    display.print(_callPhone);
@@ -1090,7 +1093,7 @@ public:
    display.print(timeBuf);

    // Volume (left-aligned)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);
    char volLabel[12];
    snprintf(volLabel, sizeof(volLabel), "Vol: %d/5", _callVolume);
--- a/examples/companion_radio/ui-new/Settingsscreen.h
+++ b/examples/companion_radio/ui-new/Settingsscreen.h
--- a/examples/companion_radio/ui-new/Textreaderscreen.h
+++ b/examples/companion_radio/ui-new/Textreaderscreen.h
@@ -6,6 +6,7 @@
 #include <vector>
 #include "Utf8CP437.h"
 #include "EpubProcessor.h"
+#include "../NodePrefs.h"

 // Forward declarations
 class UITask;
@@ -15,7 +16,7 @@ class UITask;
 // ============================================================================
 #define BOOKS_FOLDER      "/books"
 #define INDEX_FOLDER      "/.indexes"
-#define INDEX_VERSION     9  // v9: indexer buffer matches page buffer (fixes chunk boundary gaps)
+#define INDEX_VERSION     12  // v12: indexer breaks page BEFORE overflowing line (matches renderer pre-check)
 #define PREINDEX_PAGES    100
 #define READER_MAX_FILES  50
 #define READER_BUF_SIZE   4096
@@ -115,10 +116,16 @@ inline WrapResult findLineBreakPixel(const char* buffer, int bufLen, int lineSta
  result.nextStart = lineStart;
  if (lineStart >= bufLen || !display) return result;

-  int displayW = display->width() - 3;  // 3-unit right margin (rounding safety for proportional fonts)
+#if defined(LilyGo_T5S3_EPaper_Pro)
+  int rightMargin = 5;  // Wider margin for T5S3 (portrait mode especially tight)
+#else
+  int rightMargin = 3;
+#endif
+  int displayW = display->width() - rightMargin;
  char measBuf[300];                // temp buffer for pixel measurement
  int measLen = 0;
  int lastBreakPoint = -1;
+  int lastBreakMeasLen = 0;         // measLen at lastBreakPoint (for mid-word fallback)
  bool inWord = false;
  int charCount = 0;

@@ -145,6 +152,7 @@ inline WrapResult findLineBreakPixel(const char* buffer, int bufLen, int lineSta
      // UTF-8 handling: decode multi-byte sequences to CP437 for accurate
      // width measurement.  The renderer (renderPage) does this same conversion,
      // so the measurement must match or it underestimates line width.
+      int charStartIdx = i;  // buffer index where this character started
      if ((uint8_t)c >= 0xC0) {
        // UTF-8 lead byte — decode full sequence to CP437
        int decPos = i;
@@ -156,65 +164,54 @@ inline WrapResult findLineBreakPixel(const char* buffer, int bufLen, int lineSta
        }
        i = decPos - 1;  // -1 because the for loop will i++
        inWord = true;
-        continue;
-      }
-      if ((uint8_t)c >= 0x80 && (uint8_t)c < 0xC0) {
+      } else if ((uint8_t)c >= 0x80 && (uint8_t)c < 0xC0) {
        // Orphan continuation byte — treat as CP437 pass-through (same as renderer)
        if (measLen < 298) measBuf[measLen++] = c;
        charCount++;
        inWord = true;
-        continue;
+      } else {
+        // Plain ASCII
+        charCount++;
+        if (measLen < 298) measBuf[measLen++] = c;
+
+        if (c == ' ' || c == '\t') {
+          if (inWord) {
+            lastBreakPoint = i;
+            lastBreakMeasLen = measLen;
+            inWord = false;
+          }
+        } else if (c == '-') {
+          if (inWord) {
+            lastBreakPoint = i + 1;
+            lastBreakMeasLen = measLen;
+          }
+          inWord = true;
+        } else {
+          inWord = true;
+        }
      }

-      // Plain ASCII
-      charCount++;
-      if (measLen < 298) measBuf[measLen++] = c;
-
-      if (c == ' ' || c == '\t') {
-        if (inWord) {
-          // Measure pixel width at this word boundary
-          measBuf[measLen] = '\0';
-          int pw = display->getTextWidth(measBuf);
-          if (pw >= displayW) {
-            // Current word pushes past edge — break at previous word boundary
-            if (lastBreakPoint > lineStart) {
-              result.lineEnd = lastBreakPoint;
-              result.nextStart = lastBreakPoint;
-              while (result.nextStart < bufLen &&
-                     (buffer[result.nextStart] == ' ' || buffer[result.nextStart] == '\t'))
-                result.nextStart++;
-            } else {
-              result.lineEnd = i;
-              result.nextStart = i;
-            }
-            return result;
+      // Per-character pixel width check — catches long words that exceed
+      // displayW without ever hitting a space/hyphen break point.
+      // Only measure every 3 chars to avoid excessive getTextWidth() calls.
+      if ((charCount & 3) == 0 || c == ' ' || c == '-') {
+        measBuf[measLen] = '\0';
+        int pw = display->getTextWidth(measBuf);
+        if (pw >= displayW) {
+          if (lastBreakPoint > lineStart) {
+            // Break at last word boundary
+            result.lineEnd = lastBreakPoint;
+            result.nextStart = lastBreakPoint;
+            while (result.nextStart < bufLen &&
+                   (buffer[result.nextStart] == ' ' || buffer[result.nextStart] == '\t'))
+              result.nextStart++;
+          } else {
+            // No word boundary found — break mid-word before this character
+            result.lineEnd = charStartIdx;
+            result.nextStart = charStartIdx;
          }
-          lastBreakPoint = i;
-          inWord = false;
+          return result;
        }
-      } else if (c == '-') {
-        if (inWord) {
-          // Measure at hyphen break point
-          measBuf[measLen] = '\0';
-          int pw = display->getTextWidth(measBuf);
-          if (pw >= displayW) {
-            if (lastBreakPoint > lineStart) {
-              result.lineEnd = lastBreakPoint;
-              result.nextStart = lastBreakPoint;
-              while (result.nextStart < bufLen &&
-                     (buffer[result.nextStart] == ' ' || buffer[result.nextStart] == '\t'))
-                result.nextStart++;
-            } else {
-              result.lineEnd = i;
-              result.nextStart = i;
-            }
-            return result;
-          }
-          lastBreakPoint = i + 1;
-        }
-        inWord = true;
-      } else {
-        inWord = true;
      }

      // Safety: hard char limit (handles spaceless lines, URLs, etc.)
@@ -242,17 +239,25 @@ inline WrapResult findLineBreakPixel(const char* buffer, int bufLen, int lineSta

 // ============================================================================
 // Page Indexer (word-wrap aware, matches display rendering)
+// When textAreaHeight and lineHeight are provided (both > 0), uses height-based
+// pagination that accounts for blank lines getting 40% height (matching renderer).
+// Otherwise falls back to simple line counting.
 // ============================================================================
 inline int indexPagesWordWrap(File& file, long startPos,
                              std::vector<long>& pagePositions,
                              int linesPerPage, int charsPerLine,
-                              int maxPages) {
+                              int maxPages,
+                              int textAreaHeight = 0, int lineHeight = 0) {
  const int BUF_SIZE = READER_BUF_SIZE;  // Match page buffer to avoid chunk boundary wrap mismatches
  char buffer[BUF_SIZE];

+  bool heightAware = (textAreaHeight > 0 && lineHeight > 0);
+  int blankLineH = heightAware ? max(2, lineHeight * 2 / 5) : 0;
+
  file.seek(startPos);
  int pagesAdded = 0;
  int lineCount = 0;
+  int accHeight = 0;
  int leftover = 0;
  long chunkFileStart = startPos;

@@ -263,17 +268,42 @@ inline int indexPagesWordWrap(File& file, long startPos,

    int pos = 0;
    while (pos < bufLen) {
+      int lineStart = pos;
      WrapResult wrap = findLineBreak(buffer, bufLen, pos, charsPerLine);
      if (wrap.nextStart <= pos && wrap.lineEnd >= bufLen) break;

-      lineCount++;
+      // Blank line = newline at line start (no printable content before it)
+      bool isBlankLine = (wrap.lineEnd == lineStart);
+
+      bool pageBreak = false;
+      if (heightAware) {
+        int thisH = isBlankLine ? blankLineH : lineHeight;
+        // Check BEFORE adding: does this line fit on the current page?
+        // The renderer checks y <= maxY before rendering each line,
+        // so we must break the page BEFORE a line that won't fit.
+        if (accHeight > 0 && accHeight + thisH > textAreaHeight) {
+          // This line doesn't fit — start new page at this line's position
+          long pageFilePos = chunkFileStart + lineStart;
+          pagePositions.push_back(pageFilePos);
+          pagesAdded++;
+          accHeight = 0;
+          if (maxPages > 0 && pagesAdded >= maxPages) break;
+        }
+        accHeight += thisH;
+      } else {
+        lineCount++;
+        if (lineCount >= linesPerPage) {
+          pageBreak = true;
+          lineCount = 0;
+        }
+      }
+
      pos = wrap.nextStart;

-      if (lineCount >= linesPerPage) {
+      if (pageBreak) {
        long pageFilePos = chunkFileStart + pos;
        pagePositions.push_back(pageFilePos);
        pagesAdded++;
-        lineCount = 0;
        if (maxPages > 0 && pagesAdded >= maxPages) break;
      }
      if (pos >= bufLen) break;
@@ -298,12 +328,13 @@ inline int indexPagesWordWrap(File& file, long startPos,
 inline int indexPagesWordWrapPixel(File& file, long startPos,
                                    std::vector<long>& pagePositions,
                                    int linesPerPage, int maxChars,
-                                    DisplayDriver* display, int maxPages) {
+                                    DisplayDriver* display, int maxPages,
+                                    NodePrefs* prefs = nullptr) {
  const int BUF_SIZE = READER_BUF_SIZE;  // Match page buffer to avoid chunk boundary wrap mismatches
  char buffer[BUF_SIZE];

  // Ensure body font is active for pixel measurement
-  display->setTextSize(0);
+  display->setTextSize(prefs ? prefs->smallTextSize() : 0);

  file.seek(startPos);
  int pagesAdded = 0;
@@ -367,9 +398,11 @@ public:

 private:
  UITask* _task;
+  NodePrefs* _prefs;
  Mode _mode;
  bool _sdReady;
  bool _initialized;       // Layout metrics calculated
+  uint8_t _lastFontPref;   // Font preference at last layout init (detect changes)
  bool _bootIndexed;       // Boot-time pre-indexing done
  DisplayDriver* _display; // Stored reference for splash screens

@@ -377,6 +410,7 @@ private:
  int _charsPerLine;
  int _linesPerPage;
  int _lineHeight;     // virtual coord units per text line
+  int _textAreaHeight; // usable height for text (excluding header/footer)
  int _headerHeight;
  int _footerHeight;

@@ -400,6 +434,11 @@ private:
  int _pageBufLen;
  bool _contentDirty;  // Need to re-read from SD

+  // Go-to-page input mode (Enter in reading view)
+  bool _gotoMode = false;
+  char _gotoBuf[6];      // Up to 5 digits + null
+  int _gotoBufLen = 0;
+
  // ---- Splash Screen Drawing ----
  // Draw directly to display outside the normal render cycle.
  // Matches the style of the standalone text reader firmware splash.
@@ -899,22 +938,14 @@ private:
      if (_pagePositions.empty()) {
        // Cache had no pages (e.g. dummy entry) â€” full index from scratch
        _pagePositions.push_back(0);
-#if defined(LilyGo_T5S3_EPaper_Pro)
-        indexPagesWordWrapPixel(_file, 0, _pagePositions,
-                                _linesPerPage, _charsPerLine, _display, 0);
-#else
        indexPagesWordWrap(_file, 0, _pagePositions,
-                           _linesPerPage, _charsPerLine, 0);
-#endif
+                           _linesPerPage, _charsPerLine, 0,
+                           _textAreaHeight, _lineHeight);
      } else {
        long lastPos = cache->pagePositions.back();
-#if defined(LilyGo_T5S3_EPaper_Pro)
-        indexPagesWordWrapPixel(_file, lastPos, _pagePositions,
-                                _linesPerPage, _charsPerLine, _display, 0);
-#else
        indexPagesWordWrap(_file, lastPos, _pagePositions,
-                           _linesPerPage, _charsPerLine, 0);
-#endif
+                           _linesPerPage, _charsPerLine, 0,
+                           _textAreaHeight, _lineHeight);
      }
    } else {
      // No cache â€” full index from scratch
@@ -932,13 +963,9 @@ private:
      drawSplash("Indexing...", "Please wait", shortName);

      _pagePositions.push_back(0);
-#if defined(LilyGo_T5S3_EPaper_Pro)
-      indexPagesWordWrapPixel(_file, 0, _pagePositions,
-                              _linesPerPage, _charsPerLine, _display, 0);
-#else
      indexPagesWordWrap(_file, 0, _pagePositions,
-                         _linesPerPage, _charsPerLine, 0);
-#endif
+                         _linesPerPage, _charsPerLine, 0,
+                         _textAreaHeight, _lineHeight);
    }

    // Save complete index
@@ -1061,8 +1088,8 @@ private:
      display.setCursor(0, 42);
      display.print("/books/ on SD card");
    } else {
-      display.setTextSize(0);  // Tiny font for file list
-      int listLineH = 8;  // Approximate tiny font line height in virtual coords
+      display.setTextSize(_prefs->smallTextSize());  // Tiny font for file list
+      int listLineH = _prefs->smallLineH();
      int startY = 14;
      int maxVisible = (display.height() - startY - _footerHeight) / listLineH;
      if (maxVisible < 3) maxVisible = 3;
@@ -1083,7 +1110,7 @@ private:
 #else
          // setCursor adds +5 to y internally, but fillRect does not.
          // Offset fillRect by +5 to align highlight bar with text.
-          display.fillRect(0, y + 5, display.width(), listLineH);
+          display.fillRect(0, y + _prefs->smallHighlightOff(), display.width(), listLineH);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -1091,8 +1118,6 @@ private:
        }

        // Set cursor AFTER fillRect so text draws on top of highlight
-        display.setCursor(0, y);
-
        int type = itemTypeAt(i);
        String line = selected ? "> " : "  ";

@@ -1102,10 +1127,6 @@ private:
        } else if (type == 1) {
          // Subdirectory
          line += "/" + dirNameAt(i);
-          // Truncate if needed
-          if ((int)line.length() > _charsPerLine) {
-            line = line.substring(0, _charsPerLine - 3) + "...";
-          }
        } else {
          // File
          int fi = fileIndexAt(i);
@@ -1118,16 +1139,11 @@ private:
              suffix = " *";
            }
          }
-
-          // Truncate if needed
-          int maxLen = _charsPerLine - 4 - suffix.length();
-          if ((int)name.length() > maxLen) {
-            name = name.substring(0, maxLen - 3) + "...";
-          }
          line += name + suffix;
        }

-        display.print(line.c_str());
+        // Pixel-aware ellipsis — small margin prevents GxEPD edge wrapping
+        display.drawTextEllipsized(0, y, display.width() - 4, line.c_str());
        y += listLineH;
      }
      display.setTextSize(1);  // Restore
@@ -1140,13 +1156,13 @@ private:
    display.setColor(DisplayDriver::YELLOW);

 #if defined(LilyGo_T5S3_EPaper_Pro)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.drawTextCentered(display.width() / 2, footerY, "Swipe: Scroll   Tap: Open   Boot: home");
 #else
    display.setCursor(0, footerY);
-    display.print("Q:Back W/S:Nav");
+    display.print("Q:Bk");

-    const char* right = "Ent:Open";
+    const char* right = "Tap/Ent:Open";
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #endif
@@ -1154,7 +1170,7 @@ private:

  void renderPage(DisplayDriver& display) {
    // Use tiny font for maximum text density
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);

    int y = 0;
@@ -1165,13 +1181,9 @@ private:
    // Render all lines in the page buffer using word wrap.
    // The buffer contains exactly the bytes for this page (from indexed positions),
    // so we render everything in it.
-    while (pos < _pageBufLen && lineCount < _linesPerPage && y <= maxY) {
+    while (pos < _pageBufLen && y <= maxY) {
      int oldPos = pos;
-#if defined(LilyGo_T5S3_EPaper_Pro)
-      WrapResult wrap = findLineBreakPixel(_pageBuf, _pageBufLen, pos, &display, _charsPerLine);
-#else
      WrapResult wrap = findLineBreak(_pageBuf, _pageBufLen, pos, _charsPerLine);
-#endif

      // Safety: stop if findLineBreak made no progress (stuck at end of buffer)
      if (wrap.nextStart <= oldPos && wrap.lineEnd >= _pageBufLen) break;
@@ -1242,31 +1254,37 @@ private:

    char status[30];
    int pct = _totalPages > 1 ? (_currentPage * 100) / (_totalPages - 1) : 100;
-    sprintf(status, "%d/%d %d%%", _currentPage + 1, _totalPages, pct);
+
+    if (_gotoMode) {
+      // Go-to-page input mode — show typed digits in footer
+      snprintf(status, sizeof(status), "Go to: %.*s_", _gotoBufLen, _gotoBuf);
+    } else {
+      sprintf(status, "%d/%d %d%%", _currentPage + 1, _totalPages, pct);
+    }

 #if defined(LilyGo_T5S3_EPaper_Pro)
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setCursor(0, footerY);
    display.print(status);
-    const char* right = "Swipe: Page   Tap: Next   Hold: Close";
+    const char* right = "Swipe:Page  Tap:GoTo  Hold:Close";
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #else
    display.setCursor(0, footerY);
    display.print(status);

-    const char* right = "W/S:Nav Q:Back";
+    const char* right = _gotoMode ? "Ent:Go Q:Cancel" : "Entr:Pg# Q:Bk";
    display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY);
    display.print(right);
 #endif
  }

 public:
-  TextReaderScreen(UITask* task)
-    : _task(task), _mode(FILE_LIST), _sdReady(false), _initialized(false),
+  TextReaderScreen(UITask* task, NodePrefs* prefs = nullptr)
+    : _task(task), _prefs(prefs), _mode(FILE_LIST), _sdReady(false), _initialized(false), _lastFontPref(0),
      _bootIndexed(false), _display(nullptr),
      _charsPerLine(38), _linesPerPage(22), _lineHeight(5),
-      _headerHeight(14), _footerHeight(14),
+      _textAreaHeight(100), _headerHeight(14), _footerHeight(14),
      _selectedFile(0), _currentPath(BOOKS_FOLDER),
      _fileOpen(false), _currentPage(0), _totalPages(0),
      _pageBufLen(0), _contentDirty(true) {
@@ -1288,25 +1306,53 @@ public:

  // Call once after display is available to calculate layout metrics
  void initLayout(DisplayDriver& display) {
+    // Re-init if font preference changed since last layout
+    uint8_t curFont = _prefs ? _prefs->large_font : 0;
+    if (_initialized && curFont != _lastFontPref) {
+      _initialized = false;
+      Serial.println("TextReader: font changed, recalculating layout");
+    }
    if (_initialized) return;
+    _lastFontPref = curFont;

    // Store display reference for splash screens during openBook
    _display = &display;

    // Measure tiny font metrics using the display driver
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());

-    // Measure character width: use 10 M's to get accurate average
+    // Measure character width: use 10 M's for monospace (T-Deck Pro tiny font).
+    // Proportional fonts (T5S3 and T-Deck Pro large_font) override below with
+    // average-width measurement since M is the widest glyph (~40% wider than average).
    uint16_t tenCharsW = display.getTextWidth("MMMMMMMMMM");
    if (tenCharsW > 0) {
      _charsPerLine = (display.width() * 10) / tenCharsW;
    }
 #if defined(LilyGo_T5S3_EPaper_Pro)
-    // T5S3 uses pixel-based line breaking (findLineBreakPixel) which measures
-    // actual text width via getTextWidth(). _charsPerLine serves only as a
-    // safety upper bound for lines without word breaks (URLs, etc.).
-    _charsPerLine = 120;
+    // T5S3 uses proportional font (FreeSans12pt) — measure average character
+    // width from a representative English sample.  M-based measurement is far
+    // too conservative (M is the widest glyph), leaving half the line empty.
+    {
+      const char* sample = "the quick brown fox jumps over lazy dog";
+      uint16_t sampleW = display.getTextWidth(sample);
+      int sampleLen = strlen(sample);
+      if (sampleW > 0 && sampleLen > 0) {
+        // 95% factor as small safety margin for slightly-wider-than-average text
+        _charsPerLine = (display.width() * sampleLen * 95) / ((int)sampleW * 100);
+      }
+    }
+    if (_charsPerLine < 15) _charsPerLine = 15;
+    if (_charsPerLine > 80) _charsPerLine = 80;
 #else
+    // T-Deck Pro: large_font uses FreeSans9pt (proportional) — same fix
+    if (_prefs && _prefs->large_font) {
+      const char* sample = "the quick brown fox jumps over lazy dog";
+      uint16_t sampleW = display.getTextWidth(sample);
+      int sampleLen = strlen(sample);
+      if (sampleW > 0 && sampleLen > 0) {
+        _charsPerLine = (display.width() * sampleLen * 70) / ((int)sampleW * 100);
+      }
+    }
    if (_charsPerLine < 15) _charsPerLine = 15;
    if (_charsPerLine > 60) _charsPerLine = 60;
 #endif
@@ -1326,27 +1372,31 @@ public:

 #if defined(LilyGo_T5S3_EPaper_Pro)
    // T5S3 uses FreeSans12pt/FreeSerif12pt for size 0 (yAdvance=29px).
-    // Line height in virtual coords depends on orientation:
-    //   Landscape: 29px / scale_y(4.22) ≈ 7 + 1 spacing = 8
-    //   Portrait:  29px / scale_y(7.50) ≈ 4 + 1 spacing = 5
    {
      extern DISPLAY_CLASS display;
      _lineHeight = display.isPortraitMode() ? 5 : 8;
    }
+#else
+    // T-Deck Pro large_font uses FreeSans9pt (yAdvance=22px at scale 1.5625×).
+    // The 6x8 formula above gives ~5-7 which is way too small — lines overlap.
+    // Use smallLineH() which is already tuned for this font.
+    if (_prefs && _prefs->large_font) {
+      _lineHeight = _prefs->smallLineH();
+    }
 #endif

    _headerHeight = 0;  // No header in reading mode (maximize text area)
    _footerHeight = 14;
-    int textAreaHeight = display.height() - _headerHeight - _footerHeight;
-    _linesPerPage = textAreaHeight / _lineHeight;
+    _textAreaHeight = display.height() - _headerHeight - _footerHeight;
+    _linesPerPage = _textAreaHeight / _lineHeight;
    if (_linesPerPage < 5) _linesPerPage = 5;
    if (_linesPerPage > 40) _linesPerPage = 40;

    display.setTextSize(1);  // Restore
    _initialized = true;

-    Serial.printf("TextReader layout: %d chars/line, %d lines/page, lineH=%d (display %dx%d)\n",
-                  _charsPerLine, _linesPerPage, _lineHeight, display.width(), display.height());
+    Serial.printf("TextReader layout: %d chars/line, %d lines/page, lineH=%d, textH=%d (display %dx%d)\n",
+                  _charsPerLine, _linesPerPage, _lineHeight, _textAreaHeight, display.width(), display.height());
  }

  // ---- Boot-time Indexing ----
@@ -1457,15 +1507,10 @@ public:
        cache.pagePositions.clear();
        cache.pagePositions.push_back(0);

-#if defined(LilyGo_T5S3_EPaper_Pro)
-        int added = indexPagesWordWrapPixel(file, 0, cache.pagePositions,
-                                            _linesPerPage, _charsPerLine,
-                                            _display, PREINDEX_PAGES - 1);
-#else
        int added = indexPagesWordWrap(file, 0, cache.pagePositions,
                                       _linesPerPage, _charsPerLine,
-                                       PREINDEX_PAGES - 1);
-#endif
+                                       PREINDEX_PAGES - 1,
+                                       _textAreaHeight, _lineHeight);
        cache.fullyIndexed = !file.available();
        file.close();

@@ -1508,13 +1553,9 @@ public:
      // Layout was invalidated (orientation change) — reindex the open book
      Serial.println("TextReader: Reindexing after layout change");
      _pagePositions.push_back(0);
-#if defined(LilyGo_T5S3_EPaper_Pro)
-      indexPagesWordWrapPixel(_file, 0, _pagePositions,
-                              _linesPerPage, _charsPerLine, _display, 0);
-#else
      indexPagesWordWrap(_file, 0, _pagePositions,
-                         _linesPerPage, _charsPerLine, 0);
-#endif
+                         _linesPerPage, _charsPerLine, 0,
+                         _textAreaHeight, _lineHeight);
      _totalPages = _pagePositions.size();
      if (_currentPage >= _totalPages) _currentPage = 0;
      _mode = READING;
@@ -1529,6 +1570,49 @@ public:
  bool isReading() const { return _mode == READING; }
  bool isInFileList() const { return _mode == FILE_LIST; }

+  // Jump to a specific page number (1-based for user-facing, converted to 0-based)
+  void gotoPage(int pageNum) {
+    if (!_fileOpen || _totalPages == 0) return;
+    int target = pageNum - 1;  // Convert 1-based input to 0-based
+    if (target < 0) target = 0;
+    if (target >= _totalPages) target = _totalPages - 1;
+    _currentPage = target;
+    loadPageContent();
+    Serial.printf("TextReader: Go to page %d/%d\n", _currentPage + 1, _totalPages);
+  }
+
+  int getTotalPages() const { return _totalPages; }
+  int getCurrentPage() const { return _currentPage; }
+
+  // Tap-to-select: given virtual Y, select file list row.
+  // Returns: 0=miss, 1=moved, 2=tapped current row.
+  int selectRowAtVY(int vy) {
+    if (_mode != FILE_LIST) return 0;
+    const int startY = 14, footerH = 14;
+    const int listLineH = _prefs ? _prefs->smallLineH() : 9;
+#if defined(LilyGo_T5S3_EPaper_Pro)
+    const int bodyTop = startY;
+#else
+    const int bodyTop = startY + (_prefs ? _prefs->smallHighlightOff() : 5);
+#endif
+    if (vy < bodyTop || vy >= 128 - footerH) return 0;
+
+    int totalItems = totalListItems();
+    if (totalItems == 0) return 0;
+    int maxVisible = (128 - startY - footerH) / listLineH;
+    if (maxVisible < 3) maxVisible = 3;
+    if (maxVisible > 15) maxVisible = 15;
+    int startIdx = max(0, min(_selectedFile - maxVisible / 2,
+                              totalItems - maxVisible));
+
+    int tappedRow = startIdx + (vy - bodyTop) / listLineH;
+    if (tappedRow < 0 || tappedRow >= totalItems) return 0;
+
+    if (tappedRow == _selectedFile) return 2;
+    _selectedFile = tappedRow;
+    return 1;
+  }
+
  int render(DisplayDriver& display) override {
    if (!_sdReady) {
      display.setCursor(0, 20);
@@ -1553,6 +1637,7 @@ public:
    if (_mode == FILE_LIST) {
      return handleFileListInput(c);
    } else if (_mode == READING) {
+      if (_gotoMode) return handleGotoInput(c);
      return handleReadingInput(c);
    }
    return false;
@@ -1639,15 +1724,10 @@ public:
            cache.lastReadPage = 0;
            cache.pagePositions.clear();
            cache.pagePositions.push_back(0);
-#if defined(LilyGo_T5S3_EPaper_Pro)
-            indexPagesWordWrapPixel(file, 0, cache.pagePositions,
-                                    _linesPerPage, _charsPerLine,
-                                    _display, PREINDEX_PAGES - 1);
-#else
            indexPagesWordWrap(file, 0, cache.pagePositions,
                               _linesPerPage, _charsPerLine,
-                               PREINDEX_PAGES - 1);
-#endif
+                               PREINDEX_PAGES - 1,
+                               _textAreaHeight, _lineHeight);
            cache.fullyIndexed = !file.available();
            file.close();
            saveIndex(cache.filename, cache.pagePositions, cache.fileSize,
@@ -1673,9 +1753,9 @@ public:
      return false;
    }

-    // S/D/Space/Enter - next page
+    // S/D/Space - next page
    if (c == 's' || c == 'S' || c == 'd' || c == 'D' ||
-        c == ' ' || c == '\r' || c == 13 || c == 0xF1) {
+        c == ' ' || c == 0xF1) {
      if (_currentPage < _totalPages - 1) {
        _currentPage++;
        loadPageContent();
@@ -1684,6 +1764,14 @@ public:
      return false;
    }

+    // Enter - go-to-page input mode
+    if (c == '\r' || c == 13) {
+      _gotoMode = true;
+      _gotoBufLen = 0;
+      _gotoBuf[0] = '\0';
+      return true;
+    }
+
    // Q - close book, back to file list
    if (c == 'q' || c == 'Q') {
      closeBook();
@@ -1694,6 +1782,42 @@ public:
    return false;
  }

+  bool handleGotoInput(char c) {
+    // Enter — commit page number
+    if (c == '\r' || c == 13) {
+      if (_gotoBufLen > 0) {
+        int pageNum = atoi(_gotoBuf);
+        gotoPage(pageNum);
+      }
+      _gotoMode = false;
+      return true;
+    }
+
+    // Q or Escape — cancel
+    if (c == 'q' || c == 'Q' || c == 0x1B) {
+      _gotoMode = false;
+      return true;
+    }
+
+    // Backspace — delete last digit
+    if (c == '\b' || c == 0x7F) {
+      if (_gotoBufLen > 0) {
+        _gotoBufLen--;
+        _gotoBuf[_gotoBufLen] = '\0';
+      }
+      return true;
+    }
+
+    // Digit — append (max 5 digits)
+    if (c >= '0' && c <= '9' && _gotoBufLen < 5) {
+      _gotoBuf[_gotoBufLen++] = c;
+      _gotoBuf[_gotoBufLen] = '\0';
+      return true;
+    }
+
+    return true;  // Consume all other keys while in goto mode
+  }
+
  // External close (called when leaving reader screen entirely)
  void exitReader() {
    if (_fileOpen) closeBook();
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
--- a/examples/companion_radio/ui-new/UITask.h
+++ b/examples/companion_radio/ui-new/UITask.h
@@ -30,6 +30,10 @@
  #include "WebReaderScreen.h"
 #endif

+#ifdef MECK_AUDIO_VARIANT
+  #include "AlarmScreen.h"
+#endif
+
 #if defined(LilyGo_T5S3_EPaper_Pro)
  #include "VirtualKeyboard.h"
 #endif
@@ -56,6 +60,9 @@ class UITask : public AbstractUITask {
  NodePrefs* _node_prefs;
  char _alert[80];
  unsigned long _alert_expiry;
+  bool _hintActive = false;          // Boot navigation hint overlay
+  unsigned long _hintExpiry = 0;     // Auto-dismiss time for hint
+  bool _pendingBootHint = false;     // Deferred hint — show after splash screen
  int _msgcount;
  unsigned long ui_started_at, next_batt_chck;
  uint8_t _low_batt_count = 0;  // Consecutive low-voltage readings for debounce
@@ -79,11 +86,15 @@ class UITask : public AbstractUITask {
  UIScreen* notes_screen;    // Notes editor screen
  UIScreen* settings_screen; // Settings/onboarding screen
  UIScreen* audiobook_screen; // Audiobook player screen (null if not available)
+#ifdef MECK_AUDIO_VARIANT
+  UIScreen* alarm_screen;     // Alarm clock screen (audio variant only)
+#endif
 #ifdef HAS_4G_MODEM
  UIScreen* sms_screen;      // SMS messaging screen (4G variant only)
 #endif
  UIScreen* repeater_admin;   // Repeater admin screen
  UIScreen* discovery_screen;  // Node discovery scan screen
+  UIScreen* last_heard_screen; // Last heard passive advert list
 #ifdef MECK_WEB_READER
  UIScreen* web_reader;       // Web reader screen (lazy-init, WiFi required)
 #endif
@@ -95,12 +106,50 @@ class UITask : public AbstractUITask {
  UIScreen* lock_screen;     // Lock screen (big clock + battery + unread)
  UIScreen* _screenBeforeLock = nullptr;
  bool _locked = false;
+  unsigned long _lastInputMillis = 0;  // Auto-lock idle tracking
+  unsigned long _lastLockRefresh = 0;  // Periodic lock screen clock update

  VirtualKeyboard _vkb;
  bool _vkbActive = false;
  UIScreen* _screenBeforeVKB = nullptr;
  unsigned long _vkbOpenedAt = 0;
+
+  // Powersaving: light sleep when locked + idle (standalone only — no BLE/WiFi)
+  // Wakes on LoRa packet (DIO1), boot button (GPIO0), or 30-min timer
+#if !defined(BLE_PIN_CODE) && !defined(MECK_WIFI_COMPANION)
+  unsigned long _psLastActive = 0;       // millis() at last wake or lock entry
+  unsigned long _psNextSleepSecs = 60;   // Seconds before first sleep (60s), then 5s cycles
 #endif
+#ifdef MECK_CARDKB
+  bool _cardkbDetected = false;
+#endif
+#elif defined(LilyGo_TDeck_Pro)
+  UIScreen* lock_screen;     // Lock screen (big clock + battery + unread)
+  UIScreen* _screenBeforeLock = nullptr;
+  bool _locked = false;
+  unsigned long _lastInputMillis = 0;  // Auto-lock idle tracking
+  unsigned long _lastLockRefresh = 0;  // Periodic lock screen clock update
+#endif
+
+  // --- Message dedup ring buffer (suppress retry spam at UI level) ---
+  #define MSG_DEDUP_SIZE 8
+  #define MSG_DEDUP_WINDOW_MS 60000  // 60 seconds
+  struct MsgDedup {
+    uint32_t name_hash;
+    uint32_t text_hash;
+    unsigned long millis;
+  };
+  MsgDedup _dedup[MSG_DEDUP_SIZE];
+  int _dedupIdx = 0;
+
+  // --- Per-contact DM unread tracking ---
+  uint8_t* _dmUnread = nullptr;  // PSRAM-allocated, MAX_CONTACTS entries
+
+  static uint32_t simpleHash(const char* s) {
+    uint32_t h = 5381;
+    while (*s) { h = ((h << 5) + h) ^ (uint8_t)*s++; }
+    return h;
+  }

  void userLedHandler();

@@ -129,14 +178,21 @@ public:

  void gotoHomeScreen();
  void gotoChannelScreen();  // Navigate to channel message screen
+  void gotoDMTab();          // Navigate directly to DM tab on channel screen
+  void gotoDMConversation(const char* contactName, int contactIdx = -1, uint8_t perms = 0);
  void gotoContactsScreen(); // Navigate to contacts list
  void gotoTextReader();     // *** NEW: Navigate to text reader ***
  void gotoNotesScreen();    // Navigate to notes editor
  void gotoSettingsScreen(); // Navigate to settings
  void gotoOnboarding();     // Navigate to settings in onboarding mode
  void gotoAudiobookPlayer(); // Navigate to audiobook player
+#ifdef MECK_AUDIO_VARIANT
+  void gotoAlarmScreen();     // Navigate to alarm clock
+#endif
  void gotoRepeaterAdmin(int contactIdx);  // Navigate to repeater admin
+  void gotoRepeaterAdminDirect(int contactIdx);  // Auto-login admin (L key from conversation)
  void gotoDiscoveryScreen();              // Navigate to node discovery scan
+  void gotoLastHeardScreen();              // Navigate to last heard passive list
 #if HAS_GPS
  void gotoMapScreen();         // Navigate to map tile screen
 #endif
@@ -150,6 +206,9 @@ public:
 #endif
  void showAlert(const char* text, int duration_millis) override;
  void forceRefresh() override { _next_refresh = 100; }
+  void showBootHint(bool immediate = false);  // Show navigation hint overlay on first boot
+  void dismissBootHint();  // Dismiss hint and save preference
+  bool isHintActive() const { return _hintActive; }
  // Wake display and extend auto-off timer. Call this when handling keys
  // outside of injectKey() to prevent display auto-off during direct input.
  void keepAlive() {
@@ -158,6 +217,14 @@ public:
  }
  int  getMsgCount() const { return _msgcount; }
  int  getUnreadMsgCount() const;  // Per-channel unread tracking (standalone)
+  
+  // Per-contact DM unread tracking
+  bool hasDMUnread(int contactIdx) const;
+  int  getDMUnreadCount(int contactIdx) const;
+  void clearDMUnread(int contactIdx);
+
+  // Flag: suppress room→conversation redirect on next login (L key admin access)
+  bool _skipRoomRedirect = false;
  bool hasDisplay() const { return _display != NULL; }
  bool isButtonPressed() const;
  bool isOnChannelScreen() const { return curr == channel_screen; }
@@ -171,19 +238,30 @@ public:
  bool isOnNotesScreen() const { return curr == notes_screen; }
  bool isOnSettingsScreen() const { return curr == settings_screen; }
  bool isOnAudiobookPlayer() const { return curr == audiobook_screen; }
+#ifdef MECK_AUDIO_VARIANT
+  bool isOnAlarmScreen() const { return curr == alarm_screen; }
+#endif
  bool isOnRepeaterAdmin() const { return curr == repeater_admin; }
  bool isOnDiscoveryScreen() const { return curr == discovery_screen; }
+  bool isOnLastHeardScreen() const { return curr == last_heard_screen; }
  bool isOnMapScreen() const { return curr == map_screen; }
-#if defined(LilyGo_T5S3_EPaper_Pro)
+#if defined(LilyGo_T5S3_EPaper_Pro) || defined(LilyGo_TDeck_Pro)
  bool isLocked() const { return _locked; }
  void lockScreen();
  void unlockScreen();
+#endif
+#if defined(LilyGo_T5S3_EPaper_Pro)
  bool isVKBActive() const { return _vkbActive; }
  unsigned long vkbOpenedAt() const { return _vkbOpenedAt; }
  VirtualKeyboard& getVKB() { return _vkb; }
  void showVirtualKeyboard(VKBPurpose purpose, const char* label, const char* initial, int maxLen, int contextIdx = 0);
  void onVKBSubmit();
  void onVKBCancel();
+#ifdef MECK_CARDKB
+  void setCardKBDetected(bool v) { _cardkbDetected = v; }
+  bool hasCardKB() const { return _cardkbDetected; }
+  void feedCardKBChar(char c);
+#endif
 #endif
 #ifdef MECK_WEB_READER
  bool isOnWebReader() const { return curr == web_reader; }
@@ -202,12 +280,15 @@ public:

  // Check if home screen is in an editing mode (e.g. UTC offset editor)
  bool isEditingHomeScreen() const;
+  // Check if home screen is showing the Recent Adverts page
+  bool isHomeOnRecentPage() const;

  // Inject a key press from external source (e.g., keyboard)
  void injectKey(char c);
  
  // Add a sent message to the channel screen history
  void addSentChannelMessage(uint8_t channel_idx, const char* sender, const char* text) override;
+  void addSentDM(const char* recipientName, const char* sender, const char* text);

  // Mark channel as read when BLE companion app syncs messages
  void markChannelReadFromBLE(uint8_t channel_idx) override;
@@ -225,10 +306,16 @@ public:
  UIScreen* getContactsScreen() const { return contacts_screen; }
  UIScreen* getChannelScreen() const { return channel_screen; }
  UIScreen* getSettingsScreen() const { return settings_screen; }
+  NodePrefs* getNodePrefs() const { return _node_prefs; }
  UIScreen* getAudiobookScreen() const { return audiobook_screen; }
  void setAudiobookScreen(UIScreen* s) { audiobook_screen = s; }
+#ifdef MECK_AUDIO_VARIANT
+  UIScreen* getAlarmScreen() const { return alarm_screen; }
+  void setAlarmScreen(UIScreen* s) { alarm_screen = s; }
+#endif
  UIScreen* getRepeaterAdminScreen() const { return repeater_admin; }
  UIScreen* getDiscoveryScreen() const { return discovery_screen; }
+  UIScreen* getLastHeardScreen() const { return last_heard_screen; }
  UIScreen* getMapScreen() const { return map_screen; }
 #ifdef MECK_WEB_READER
  UIScreen* getWebReaderScreen() const { return web_reader; }
--- a/examples/companion_radio/ui-new/Webreaderscreen.h
+++ b/examples/companion_radio/ui-new/Webreaderscreen.h
@@ -39,6 +39,7 @@
 #include "ModemManager.h"
 #endif
 #include "Utf8CP437.h"
+#include "../NodePrefs.h"

 // Forward declarations
 class UITask;
@@ -1030,8 +1031,10 @@ public:

 private:
  UITask* _task;
+  NodePrefs* _prefs;
  Mode _mode;
  bool _initialized;
+  uint8_t _lastFontPref;
  DisplayDriver* _display;

  // Display layout (calculated once)
@@ -1424,7 +1427,7 @@ private:
      _display->print("WiFi Setup");
      _display->drawRect(0, 11, _display->width(), 1);
      _display->setColor(DisplayDriver::LIGHT);
-      _display->setTextSize(0);
+      _display->setTextSize(_prefs->smallTextSize());
      _display->setCursor(0, 18);
      _display->print("Scanning for networks...");
      _display->endFrame();
@@ -1524,7 +1527,7 @@ private:
      _display->print("Web Reader");
      _display->drawRect(0, 11, _display->width(), 1);

-      _display->setTextSize(0);
+      _display->setTextSize(_prefs->smallTextSize());
      _display->setCursor(0, 18);
      _display->print("Connected!");
      _display->setCursor(0, 30);
@@ -2306,7 +2309,7 @@ private:
        _display->print("Web Reader");
        _display->drawRect(0, 11, _display->width(), 1);
        _display->setColor(DisplayDriver::YELLOW);
-        _display->setTextSize(0);
+        _display->setTextSize(_prefs->smallTextSize());
        _display->setCursor(0, 18);
        _display->print("Fetch failed:");
        _display->setColor(DisplayDriver::LIGHT);
@@ -2442,7 +2445,7 @@ private:
          _display->setTextSize(2);
          _display->setCursor(10, 20);
          _display->print("Logging in...");
-          _display->setTextSize(0);
+          _display->setTextSize(_prefs->smallTextSize());
          _display->setColor(DisplayDriver::LIGHT);
          _display->setCursor(10, 45);
          _display->print("Refreshing session...");
@@ -2656,14 +2659,14 @@ private:
    display.drawRect(0, 11, display.width(), 1);

    display.setColor(DisplayDriver::LIGHT);
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());

    if (_wifiState == WIFI_SCANNING) {
      display.setCursor(0, 18);
      display.print("Scanning for networks...");
    } else if (_wifiState == WIFI_SCAN_DONE) {
      int y = 14;
-      int listLineH = 8;
+      int listLineH = _prefs ? _prefs->smallLineH() : 9;
      for (int i = 0; i < _ssidCount && y < display.height() - 24; i++) {
        bool selected = (i == _selectedSSID);
        if (selected) {
@@ -2671,7 +2674,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width(), listLineH);
 #else
-          display.fillRect(0, y + 5, display.width(), listLineH);
+          display.fillRect(0, y + _prefs->smallHighlightOff(), display.width(), listLineH);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -2695,7 +2698,7 @@ private:
      y += 12;
      display.setCursor(0, y);
      display.print("Password:");
-      y += 10;
+      y += _prefs->smallLineH() + 1;
      display.setCursor(0, y);
      // Show masked password with brief reveal of last char
      char passBuf[WEB_WIFI_PASS_LEN + 2];
@@ -2771,7 +2774,7 @@ private:

    if (isNetworkAvailable()) {
      display.print("Web Reader");
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::GREEN);
      if (isWiFiConnected()) {
        IPAddress ip = WiFi.localIP();
@@ -2797,7 +2800,7 @@ private:
    const int footerY = display.height() - 12;
    const int viewportH = display.height() - headerY - footerH;
    const int scrollbarW = 4;
-    const int listLineH = 8;
+    const int listLineH = _prefs ? _prefs->smallLineH() : 9;
    const int sepH = 8;            // Separator between IRC and web sections
    const int sectionH = listLineH; // Section header height
    int maxChars = _charsPerLine - 2; // Account for "> " prefix
@@ -2875,7 +2878,7 @@ private:
    if (totalContentH <= viewportH) _homeScrollY = 0;

    // ---- Render pass (with scroll offset) ----
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    int y = headerY - _homeScrollY;  // Start Y in screen coords
    itemIdx = 0;
    bool needsScroll = (totalContentH > viewportH);
@@ -2895,7 +2898,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #else
-          display.fillRect(0, y + 5, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
+          display.fillRect(0, y + _prefs->smallHighlightOff(), display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -2934,7 +2937,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #else
-          display.fillRect(0, y + 5, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
+          display.fillRect(0, y + _prefs->smallHighlightOff(), display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -2971,7 +2974,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
          display.fillRect(0, y, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #else
-          display.fillRect(0, y + 5, display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
+          display.fillRect(0, y + _prefs->smallHighlightOff(), display.width() - (needsScroll ? scrollbarW + 1 : 0), listLineH);
 #endif
          display.setColor(DisplayDriver::DARK);
        } else {
@@ -3024,7 +3027,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
            display.fillRect(0, y, contentW, itemH);
 #else
-            display.fillRect(0, y + 5, contentW, itemH);
+            display.fillRect(0, y + _prefs->smallHighlightOff(), contentW, itemH);
 #endif
            display.setColor(DisplayDriver::DARK);
          } else {
@@ -3076,7 +3079,7 @@ private:
 #if defined(LilyGo_T5S3_EPaper_Pro)
            display.fillRect(0, y, contentW, itemH);
 #else
-            display.fillRect(0, y + 5, contentW, itemH);
+            display.fillRect(0, y + _prefs->smallHighlightOff(), contentW, itemH);
 #endif
            display.setColor(DisplayDriver::DARK);
          } else {
@@ -3198,7 +3201,7 @@ private:
    display.setCursor(10, 20);
    display.print("Loading...");

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);

    // Word-wrap the URL across multiple lines
@@ -3243,7 +3246,7 @@ private:
      display.print("Download Complete");
      display.drawRect(0, 11, display.width(), 1);

-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, 16);
      display.print("Saved to /books/:");
@@ -3277,7 +3280,7 @@ private:
      display.print("Download Failed");
      display.drawRect(0, 11, display.width(), 1);

-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, 18);
      display.print(_fetchError.c_str());
@@ -3314,7 +3317,7 @@ private:
      return;
    }

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    display.setColor(DisplayDriver::LIGHT);

    // Determine page bounds
@@ -3476,9 +3479,16 @@ private:
  // ---- Layout Initialization ----

  void initLayout(DisplayDriver& display) {
+    // Re-init if font preference changed since last layout
+    uint8_t curFont = _prefs ? _prefs->large_font : 0;
+    if (_initialized && curFont != _lastFontPref) {
+      _initialized = false;
+      Serial.println("WebReader: font changed, recalculating layout");
+    }
    if (_initialized) return;
+    _lastFontPref = curFont;

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    uint16_t mWidth = display.getTextWidth("M");
    if (mWidth > 0) {
      _charsPerLine = display.width() / mWidth;
@@ -3487,6 +3497,19 @@ private:
      _charsPerLine = 40;
      _lineHeight = 5;
    }
+    // Proportional font: use average-width measurement instead of M-width
+    if (_prefs && _prefs->large_font && mWidth > 0) {
+      const char* sample = "the quick brown fox jumps over lazy dog";
+      uint16_t sampleW = display.getTextWidth(sample);
+      int sampleLen = strlen(sample);
+      if (sampleW > 0 && sampleLen > 0) {
+        _charsPerLine = (display.width() * sampleLen * 70) / ((int)sampleW * 100);
+      }
+    }
+    // Large font: formula above assumes built-in 6x8 ratio — too small for 9pt
+    if (_prefs && _prefs->large_font) {
+      _lineHeight = _prefs->smallLineH();
+    }

    _footerHeight = 14;
    int textAreaHeight = display.height() - _footerHeight;
@@ -3931,7 +3954,7 @@ private:
    if (_activeForm < 0 || _activeForm >= _formCount) return;
    WebForm& form = _forms[_activeForm];

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());

    // Header
    display.setColor(DisplayDriver::GREEN);
@@ -3954,7 +3977,7 @@ private:
    display.drawRect(0, 9, display.width(), 1);

    int y = 12;
-    int lineH = 10; // Taller lines for form fields
+    int lineH = _prefs->smallLineH() + 1; // Taller lines for form fields
    int visCount = getVisibleFieldCount(form);

    // Render each visible field
@@ -4662,9 +4685,9 @@ private:
    display.print("IRC Setup");
    display.drawRect(0, 11, display.width(), 1);

-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    int y = 16;
-    int lineH = 10;
+    int lineH = _prefs->smallLineH() + 1;

    const char* labels[] = {"Server:", "Port:", "Nick:", "Channel:", "[ Connect ]"};
    const char* chanDisp = (_ircChannel[0] != '\0') ? _ircChannel : "(none)";
@@ -4822,7 +4845,7 @@ private:
    display.print(header);

    // Connection indicator on right
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    if (!_ircConnected) {
      display.setColor(DisplayDriver::YELLOW);
      display.setCursor(display.width() - 42, -3);
@@ -4848,7 +4871,7 @@ private:

    if (_ircComposing) {
      // Compose text just above separator (tiny font to match messages)
-      display.setTextSize(0);
+      display.setTextSize(_prefs->smallTextSize());
      display.setColor(DisplayDriver::LIGHT);
      display.setCursor(0, footerY - 12);
      char compDisp[IRC_COMPOSE_MAX + 4];
@@ -4878,10 +4901,10 @@ private:
    }

    // Message area
-    display.setTextSize(0);
+    display.setTextSize(_prefs->smallTextSize());
    int msgAreaTop = 14;
    int msgAreaBottom = _ircComposing ? footerY - 16 : footerY - 4;
-    int lineH = 8;
+    int lineH = _prefs->smallLineH() - 1;
    int scrollBarW = 4;
    int lineW = _charsPerLine - 1;  // Reserve space for scroll bar
    _ircLinesPerPage = (msgAreaBottom - msgAreaTop) / lineH;
@@ -5065,8 +5088,8 @@ private:
  }

 public:
-  WebReaderScreen(UITask* task)
-    : _task(task), _mode(HOME), _initialized(false), _display(nullptr),
+  WebReaderScreen(UITask* task, NodePrefs* prefs = nullptr)
+    : _task(task), _prefs(prefs), _mode(HOME), _initialized(false), _lastFontPref(0), _display(nullptr),
      _charsPerLine(40), _linesPerPage(15), _lineHeight(5), _footerHeight(14),
      _wifiState(WIFI_IDLE), _ssidCount(0), _selectedSSID(0), _wifiPassLen(0),
      _urlLen(0), _urlCursor(0),
@@ -5150,7 +5173,7 @@ public:
      _display->print("Web Reader");
      _display->drawRect(0, 11, _display->width(), 1);
      _display->setColor(DisplayDriver::LIGHT);
-      _display->setTextSize(0);
+      _display->setTextSize(_prefs->smallTextSize());
      _display->setCursor(0, 18);
      _display->print("Connecting to WiFi...");
      _display->endFrame();
--- a/examples/companion_radio/ui-new/homeicons.h
+++ b/examples/companion_radio/ui-new/homeicons.h
@@ -46,4 +46,18 @@ static const uint8_t icon_notepad[] PROGMEM = {
 static const uint8_t icon_search[] PROGMEM = {
  0x3C,0x00, 0x42,0x00, 0x81,0x00, 0x81,0x00, 0x81,0x00, 0x42,0x00,
  0x3C,0x00, 0x03,0x00, 0x01,0x80, 0x00,0xC0, 0x00,0x40, 0x00,0x00,
+};
+
+// ⏰ Alarm Clock (AlarmScreen) — 12x12 home tile icon
+static const uint8_t icon_alarm[] PROGMEM = {
+  0x40,0x40, 0x9E,0x20, 0x20,0x80, 0x44,0x40, 0x44,0x40, 0x46,0x40,
+  0x40,0x40, 0x20,0x80, 0x1F,0x00, 0x00,0x00, 0x20,0x40, 0x40,0x20,
+};
+
+// 🔔 Bell — 7x8 status bar indicator (alarm enabled)
+// MSB-first, 1 byte per row
+#define BELL_ICON_W 7
+#define BELL_ICON_H 8
+static const uint8_t icon_bell_small[] PROGMEM = {
+  0x10, 0x38, 0x7C, 0x7C, 0x7C, 0xFE, 0x00, 0x10,
 };
--- a/examples/companion_radio/ui-new/virtualkeyboard.h
+++ b/examples/companion_radio/ui-new/virtualkeyboard.h
@@ -29,6 +29,7 @@ enum VKBPurpose {
  VKB_ADMIN_CLI,      // Repeater admin CLI command
  VKB_NOTES,          // Insert text into notes
  VKB_SETTINGS_NAME,  // Edit node name
+  VKB_SETTINGS_TEXT,  // Generic settings text edit (channel name, freq, APN)
  VKB_WIFI_PASSWORD,  // WiFi password entry (settings screen)
 #ifdef MECK_WEB_READER
  VKB_WEB_URL,        // Web reader URL entry
@@ -36,6 +37,7 @@ enum VKBPurpose {
  VKB_WEB_WIFI_PASS,  // Web reader WiFi password
  VKB_WEB_LINK,       // Web reader link number entry
 #endif
+  VKB_TEXT_PAGE,       // Text reader: go to page number
 };

 class VirtualKeyboard {
@@ -215,6 +217,32 @@ public:
  // Swipe up on keyboard = cancel
  void cancel() { _status = VKB_CANCELLED; }

+  // --- Feed a raw ASCII character from an external physical keyboard ---
+  // Maps standard ASCII control chars to internal VKB actions.
+  // Returns true if the character was consumed.
+#ifdef MECK_CARDKB
+  bool feedChar(char c) {
+    if (_status != VKB_EDITING) return false;
+    switch (c) {
+      case '\r':   processKey('>');  return true;  // Enter → submit
+      case '\b':   processKey('<');  return true;  // Backspace
+      case 0x7F:   processKey('<');  return true;  // Delete → backspace
+      case 0x1B:   _status = VKB_CANCELLED; return true;  // ESC → cancel
+      case ' ':    processKey('~');  return true;  // Space
+      default:
+        // Printable ASCII → insert directly
+        if (c >= 0x20 && c <= 0x7E) {
+          if (_textLen < _maxLen) {
+            _text[_textLen++] = c;
+            _text[_textLen] = '\0';
+          }
+          return true;
+        }
+        return false;  // Non-printable / nav keys — not consumed
+    }
+  }
+#endif
+
 private:
  VKBStatus _status;
  VKBPurpose _purpose;
--- a/merge_firmware.py
+++ b/merge_firmware.py
@@ -1,7 +1,10 @@
 """
-PlatformIO post-build script: merge bootloader + partitions + firmware
+PlatformIO post-build script: merge bootloader + partitions + firmware + SPIFFS
 into a single flashable binary.

+Includes a pre-formatted empty SPIFFS image so first-boot doesn't need to
+format the partition (which takes 1-2 minutes on 16MB flash).
+
 Output: .pio/build/<env>/firmware_merged.bin
 Flash:  esptool.py --chip esp32s3 write_flash 0x0 firmware_merged.bin

@@ -12,6 +15,87 @@ Add to each environment (or the base section):

 Import("env")

+def find_spiffs_partition(partitions_bin):
+    """Parse compiled partitions.bin to find SPIFFS partition offset and size.
+    
+    ESP32 partition entry format (32 bytes each):
+      0xAA50 magic, type, subtype, offset(u32le), size(u32le), label(16), flags(u32le)
+    SPIFFS: type=0x01(data), subtype=0x82(spiffs)
+    """
+    import struct
+
+    with open(partitions_bin, "rb") as f:
+        data = f.read()
+
+    for i in range(0, len(data) - 32, 32):
+        magic = struct.unpack_from("<H", data, i)[0]
+        if magic != 0xAA50:
+            continue
+        ptype = data[i + 2]
+        subtype = data[i + 3]
+        offset = struct.unpack_from("<I", data, i + 4)[0]
+        size = struct.unpack_from("<I", data, i + 8)[0]
+        label = data[i + 12:i + 28].split(b'\x00')[0].decode("ascii", errors="ignore")
+        if ptype == 0x01 and subtype == 0x82:  # data/spiffs
+            return offset, size, label
+    return None, None, None
+
+
+def build_spiffs_image(env, size):
+    """Generate an empty formatted SPIFFS image using mkspiffs."""
+    import subprocess, os, tempfile, glob
+
+    build_dir = env.subst("$BUILD_DIR")
+    spiffs_bin = os.path.join(build_dir, "spiffs_empty.bin")
+
+    # If already generated for this build, reuse it
+    if os.path.isfile(spiffs_bin) and os.path.getsize(spiffs_bin) == size:
+        return spiffs_bin
+
+    # Find mkspiffs in PlatformIO packages
+    pio_home = os.path.expanduser("~/.platformio")
+    mkspiffs_paths = glob.glob(os.path.join(pio_home, "packages", "tool-mkspiffs*", "mkspiffs*"))
+    if not mkspiffs_paths:
+        # Also check platform-specific tool paths
+        mkspiffs_paths = glob.glob(os.path.join(pio_home, "packages", "tool-mklittlefs*", "mkspiffs*"))
+    
+    mkspiffs = None
+    for p in mkspiffs_paths:
+        if os.path.isfile(p) and os.access(p, os.X_OK):
+            mkspiffs = p
+            break
+
+    if not mkspiffs:
+        print("[merge] WARNING: mkspiffs not found, skipping SPIFFS image")
+        return None
+
+    # Create empty data directory for mkspiffs
+    data_dir = os.path.join(build_dir, "_empty_spiffs_data")
+    os.makedirs(data_dir, exist_ok=True)
+
+    # SPIFFS block/page sizes — ESP32 Arduino defaults
+    block_size = 4096
+    page_size = 256
+
+    cmd = [
+        mkspiffs,
+        "-c", data_dir,
+        "-b", str(block_size),
+        "-p", str(page_size),
+        "-s", str(size),
+        spiffs_bin,
+    ]
+
+    print(f"[merge] Generating empty SPIFFS image ({size // 1024} KB)...")
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    if result.returncode == 0 and os.path.isfile(spiffs_bin):
+        print(f"[merge] SPIFFS image OK: {spiffs_bin}")
+        return spiffs_bin
+    else:
+        print(f"[merge] mkspiffs failed: {result.stderr}")
+        return None
+
+
 def merge_bin(source, target, env):
    import subprocess, os

@@ -21,7 +105,7 @@ def merge_bin(source, target, env):
    bootloader = os.path.join(build_dir, "bootloader.bin")
    partitions = os.path.join(build_dir, "partitions.bin")
    firmware   = os.path.join(build_dir, "firmware.bin")
-    output     = os.path.join(build_dir, "firmware_merged.bin")
+    output     = os.path.join(build_dir, "firmware-merged.bin")

    # Verify all inputs exist
    for f in [bootloader, partitions, firmware]:
@@ -52,8 +136,18 @@ def merge_bin(source, target, env):
        "0x10000", firmware,
    ]

+    # Try to include a pre-formatted SPIFFS image (eliminates 1-2 min first-boot format)
+    spiffs_offset, spiffs_size, spiffs_label = find_spiffs_partition(partitions)
+    if spiffs_offset and spiffs_size:
+        spiffs_bin = build_spiffs_image(env, spiffs_size)
+        if spiffs_bin:
+            cmd.extend([f"0x{spiffs_offset:x}", spiffs_bin])
+            print(f"[merge] Including SPIFFS image at 0x{spiffs_offset:x} ({spiffs_size // 1024} KB)")
+    else:
+        print("[merge] No SPIFFS partition found in partition table, skipping SPIFFS image")
+
    print(f"\n[merge] Creating merged firmware for {env_name}...")
-    print(f"[merge] {' '.join(cmd[-6:])}")
+    print(f"[merge] {' '.join(cmd[-8:])}")

    result = subprocess.run(cmd, capture_output=True, text=True)
    if result.returncode == 0:
--- a/readback.bin
+++ b/readback.bin
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -36,7 +36,7 @@ uint32_t Dispatcher::getCADFailRetryDelay() const {
  return 200;
 }
 uint32_t Dispatcher::getCADFailMaxDuration() const {
-  return 4000;   // 4 seconds
+  return 6000;   // 6 seconds
 }

 void Dispatcher::loop() {
@@ -273,12 +273,16 @@ void Dispatcher::checkSend() {
      outbound_start = _ms->getMillis();
      bool success = _radio->startSendRaw(raw, len);
      if (!success) {
-        MESH_DEBUG_PRINTLN("%s Dispatcher::loop(): ERROR: send start failed!", getLogDateTime());
+        MESH_DEBUG_PRINTLN("%s Dispatcher::checkSend(): ERROR: send start failed!", getLogDateTime());

        logTxFail(outbound, outbound->getRawLength());
-  
-        releasePacket(outbound);  // return to pool
+
+        // re-queue instead of dropping so the packet gets another chance
+        int retry_delay = getCADFailRetryDelay();
+        unsigned long retry_time = futureMillis(retry_delay);
+        _mgr->queueOutbound(outbound, 0, retry_time);
        outbound = NULL;
+        next_tx_time = retry_time;
        return;
      }
      outbound_expiry = futureMillis(max_airtime);
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -10,10 +10,10 @@
 #endif

 void BaseChatMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
+  sendFlood(pkt, delay_millis, getPathHashSize());
 }
 void BaseChatMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
+  sendFlood(pkt, delay_millis, getPathHashSize());
 }

 mesh::Packet* BaseChatMesh::createSelfAdvert(const char* name) {
--- a/src/helpers/BaseChatMesh.h
+++ b/src/helpers/BaseChatMesh.h
@@ -130,6 +130,7 @@ protected:
  virtual void onContactResponse(const ContactInfo& contact, const uint8_t* data, uint8_t len) = 0;
  virtual void handleReturnPathRetry(const ContactInfo& contact, const uint8_t* path, uint8_t path_len);

+  virtual uint8_t getPathHashSize() const = 0;
  virtual void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0);
  virtual void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0);

--- a/src/helpers/ESP32Board.h
+++ b/src/helpers/ESP32Board.h
@@ -10,6 +10,7 @@
 #include <Wire.h>
 #include "esp_wifi.h"
 #include "driver/rtc_io.h"
+#include "driver/gpio.h"

 class ESP32Board : public mesh::MainBoard {
 protected:
@@ -60,13 +61,20 @@ public:
 #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(P_LORA_DIO_1) // Supported ESP32 variants
    if (rtc_gpio_is_valid_gpio((gpio_num_t)P_LORA_DIO_1)) { // Only enter sleep mode if P_LORA_DIO_1 is RTC pin
      esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-      esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); // To wake up when receiving a LoRa packet
+      esp_sleep_enable_ext1_wakeup((1ULL << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); // Wake on LoRa packet
+
+      // T5S3: Also wake on boot button press (GPIO0, active LOW).
+      // gpio_wakeup uses level trigger — works for light sleep only.
+#if defined(LilyGo_T5S3_EPaper_Pro) && defined(PIN_USER_BTN)
+      gpio_wakeup_enable((gpio_num_t)PIN_USER_BTN, GPIO_INTR_LOW_LEVEL);
+      esp_sleep_enable_gpio_wakeup();
+#endif

      if (secs > 0) {
-        esp_sleep_enable_timer_wakeup(secs * 1000000); // To wake up every hour to do periodically jobs
+        esp_sleep_enable_timer_wakeup(secs * 1000000ULL); // Timer wake (microseconds)
      }

-      esp_light_sleep_start(); // CPU enters light sleep
+      esp_light_sleep_start(); // CPU halts here, resumes on wake
    }
 #endif
  }
@@ -154,4 +162,4 @@ public:
  }
 };

-#endif
+#endif
--- a/src/helpers/ui/GxEPDDisplay.cpp
+++ b/src/helpers/ui/GxEPDDisplay.cpp
@@ -52,7 +52,7 @@ bool GxEPDDisplay::begin() {

 void GxEPDDisplay::turnOn() {
  if (!_init) begin();
-#if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
+#if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN) && !defined(LilyGo_TDeck_Pro)
  digitalWrite(DISP_BACKLIGHT, HIGH);
 #elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
  expander.digitalWrite(EXP_PIN_BACKLIGHT, HIGH);
@@ -61,12 +61,17 @@ void GxEPDDisplay::turnOn() {
 }

 void GxEPDDisplay::turnOff() {
-#if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
+#if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN) && !defined(LilyGo_TDeck_Pro)
+  // Only toggle backlight on boards that actually have one.
+  // T-Deck Pro defines DISP_BACKLIGHT (GPIO 45) but has no physical backlight —
+  // setting _isOn=false would stop the render loop, making the device appear frozen.
  digitalWrite(DISP_BACKLIGHT, LOW);
+  _isOn = false;
 #elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
  expander.digitalWrite(EXP_PIN_BACKLIGHT, LOW);
-#endif
  _isOn = false;
+#endif
+  // T-Deck Pro: _isOn stays true — e-ink has no backlight, render loop must keep running
 }

 void GxEPDDisplay::clear() {
@@ -100,15 +105,23 @@ void GxEPDDisplay::setTextSize(int sz) {
      break;
    case 1:  // Small - use 9pt (was 9pt)
      display.setFont(&FreeSans9pt7b);
+      display.setTextSize(1);
      break;
    case 2:  // Medium Bold - use 9pt bold instead of 12pt
      display.setFont(&FreeSans9pt7b);
+      display.setTextSize(1);
      break;
    case 3:  // Large - use 12pt instead of 18pt
      display.setFont(&FreeSansBold12pt7b);
+      display.setTextSize(1);
+      break;
+    case 5:  // Extra Large - lock screen clock face
+      display.setFont(&FreeSansBold12pt7b);
+      display.setTextSize(2);  // GxEPD2 native 2× scaling on 12pt bold
      break;
    default:
      display.setFont(&FreeSans9pt7b);
+      display.setTextSize(1);
      break;
  }
 }
--- a/variants/lilygo_t5s3_epaper_pro/CPUPowerManager.h
+++ b/variants/lilygo_t5s3_epaper_pro/CPUPowerManager.h
@@ -8,9 +8,10 @@
 //   240 MHz  ~70-80 mA
 //   160 MHz  ~50-60 mA
 //    80 MHz  ~30-40 mA
+//    40 MHz  ~15-20 mA  (low-power / lock screen mode)
 //
 // SPI peripherals and UART use their own clock dividers from the APB clock,
-// so LoRa, e-ink, and GPS serial all work fine at 80MHz.
+// so LoRa, e-ink, and GPS serial all work fine at 80MHz and 40MHz.

 #ifdef ESP32

@@ -22,23 +23,36 @@
 #define CPU_FREQ_BOOST  240    // MHz — heavy processing
 #endif

+#ifndef CPU_FREQ_LOW_POWER
+#define CPU_FREQ_LOW_POWER 80   // MHz — lock screen / idle standby (40 MHz breaks I2C)
+#endif
+
 #ifndef CPU_BOOST_TIMEOUT_MS
 #define CPU_BOOST_TIMEOUT_MS  10000  // 10 seconds
 #endif

 class CPUPowerManager {
 public:
-  CPUPowerManager() : _boosted(false), _boost_started(0) {}
+  CPUPowerManager() : _boosted(false), _lowPower(false), _boost_started(0) {}

  void begin() {
    setCpuFrequencyMhz(CPU_FREQ_IDLE);
    _boosted = false;
+    _lowPower = false;
    MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
  }

  void loop() {
    if (_boosted && (millis() - _boost_started >= CPU_BOOST_TIMEOUT_MS)) {
-      setIdle();
+      // Return to low-power if locked, otherwise normal idle
+      if (_lowPower) {
+        setCpuFrequencyMhz(CPU_FREQ_LOW_POWER);
+        MESH_DEBUG_PRINTLN("CPU power: boost expired, returning to low-power %d MHz", CPU_FREQ_LOW_POWER);
+      } else {
+        setCpuFrequencyMhz(CPU_FREQ_IDLE);
+        MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
+      }
+      _boosted = false;
    }
  }

@@ -57,13 +71,42 @@ public:
      _boosted = false;
      MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
    }
+    if (_lowPower) {
+      _lowPower = false;
+    }
+  }
+
+  // Low-power mode — drops CPU to 40 MHz for lock screen standby.
+  // If currently boosted, the boost timeout will return to 40 MHz
+  // instead of 80 MHz.
+  void setLowPower() {
+    _lowPower = true;
+    if (!_boosted) {
+      setCpuFrequencyMhz(CPU_FREQ_LOW_POWER);
+      MESH_DEBUG_PRINTLN("CPU power: low-power at %d MHz", CPU_FREQ_LOW_POWER);
+    }
+    // If boosted, the loop() timeout will drop to low-power instead of idle
+  }
+
+  // Exit low-power mode — returns to normal idle (80 MHz).
+  // If currently boosted, the boost timeout will return to idle
+  // instead of low-power.
+  void clearLowPower() {
+    _lowPower = false;
+    if (!_boosted) {
+      setCpuFrequencyMhz(CPU_FREQ_IDLE);
+      MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz (low-power cleared)", CPU_FREQ_IDLE);
+    }
+    // If boosted, the loop() timeout will drop to idle as normal
  }

  bool isBoosted() const { return _boosted; }
+  bool isLowPower() const { return _lowPower; }
  uint32_t getFrequencyMHz() const { return getCpuFrequencyMhz(); }

 private:
  bool _boosted;
+  bool _lowPower;
  unsigned long _boost_started;
 };

--- a/variants/lilygo_t5s3_epaper_pro/T5S3Board.cpp
+++ b/variants/lilygo_t5s3_epaper_pro/T5S3Board.cpp
@@ -188,9 +188,15 @@ int16_t T5S3Board::getBattTemperature() {
 }

 // ---- BQ27220 Design Capacity configuration ----
-// Identical procedure to TDeckBoard — sets 1500 mAh for T5S3's larger cell.
-// The BQ27220 ships with 3000 mAh default. This writes once on first boot
-// and persists in battery-backed RAM.
+// The BQ27220 ships with a 3000 mAh default. T5S3 uses a 1500 mAh cell.
+// This function checks on boot and writes the correct value via the
+// MAC Data Memory interface if needed. The value persists in battery-backed
+// RAM, so this typically only writes once (or after a full battery disconnect).
+//
+// When DC and DE are already correct but FCC is stuck (common after initial
+// flash), the root cause is Qmax Cell 0 (0x9106) and stored FCC (0x929D)
+// retaining factory 3000 mAh defaults. This function detects and fixes all
+// three layers: DC/DE, Qmax, and stored FCC.

 bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
 #if HAS_BQ27220
@@ -198,23 +204,169 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
  Serial.printf("BQ27220: Design Capacity = %d mAh (target %d)\n", currentDC, designCapacity_mAh);

  if (currentDC == designCapacity_mAh) {
+    // Design Capacity correct, but check if Full Charge Capacity is sane.
    uint16_t fcc = bq27220_read16(BQ27220_REG_FULL_CAP);
-    Serial.printf("BQ27220: Design Capacity correct, FCC=%d mAh\n", fcc);
-    if (fcc < designCapacity_mAh * 3 / 2) {
-      return true;  // FCC is sane, nothing to do
+    Serial.printf("BQ27220: Design Capacity already correct, FCC=%d mAh\n", fcc);
+    if (fcc >= designCapacity_mAh * 3 / 2) {
+      // FCC is >=150% of design — stale from factory defaults (typically 3000 mAh).
+      uint16_t designEnergy = (uint16_t)((uint32_t)designCapacity_mAh * 37 / 10);
+      Serial.printf("BQ27220: FCC %d >> DC %d, checking Design Energy (target %d mWh)\n",
+                    fcc, designCapacity_mAh, designEnergy);
+
+      // Unseal to read data memory and issue RESET
+      bq27220_writeControl(0x0414); delay(2);
+      bq27220_writeControl(0x3672); delay(2);
+      // Full Access
+      bq27220_writeControl(0xFFFF); delay(2);
+      bq27220_writeControl(0xFFFF); delay(2);
+
+      // Enter CFG_UPDATE to access data memory
+      bq27220_writeControl(0x0090);
+      bool ready = false;
+      for (int i = 0; i < 50; i++) {
+        delay(20);
+        uint16_t opSt = bq27220_read16(BQ27220_REG_OP_STATUS);
+        if (opSt & 0x0400) { ready = true; break; }
+      }
+      if (ready) {
+        // Read Design Energy at data memory address 0x92A1
+        Wire.beginTransmission(BQ27220_I2C_ADDR);
+        Wire.write(0x3E); Wire.write(0xA1); Wire.write(0x92);
+        Wire.endTransmission();
+        delay(10);
+        uint8_t oldMSB = bq27220_read8(0x40);
+        uint8_t oldLSB = bq27220_read8(0x41);
+        uint16_t currentDE = (oldMSB << 8) | oldLSB;
+
+        if (currentDE != designEnergy) {
+          // Design Energy actually needs updating — write it
+          uint8_t oldChk = bq27220_read8(0x60);
+          uint8_t dLen   = bq27220_read8(0x61);
+          uint8_t newMSB = (designEnergy >> 8) & 0xFF;
+          uint8_t newLSB = designEnergy & 0xFF;
+          uint8_t temp = (255 - oldChk - oldMSB - oldLSB);
+          uint8_t newChk = 255 - ((temp + newMSB + newLSB) & 0xFF);
+
+          Serial.printf("BQ27220: DE old=%d new=%d mWh, writing\n", currentDE, designEnergy);
+
+          Wire.beginTransmission(BQ27220_I2C_ADDR);
+          Wire.write(0x3E); Wire.write(0xA1); Wire.write(0x92);
+          Wire.write(newMSB); Wire.write(newLSB);
+          Wire.endTransmission();
+          delay(5);
+          Wire.beginTransmission(BQ27220_I2C_ADDR);
+          Wire.write(0x60); Wire.write(newChk); Wire.write(dLen);
+          Wire.endTransmission();
+          delay(10);
+
+          // Exit with reinit since we actually changed data
+          bq27220_writeControl(0x0091);  // EXIT_CFG_UPDATE_REINIT
+          delay(200);
+          Serial.println("BQ27220: Design Energy written, exited CFG_UPDATE");
+        } else {
+          // DC and DE are both correct, but FCC is stuck.
+          // Root cause: Qmax Cell 0 (0x9106) and stored FCC (0x929D) retain
+          // factory 3000 mAh defaults. Overwrite both with designCapacity_mAh.
+          Serial.printf("BQ27220: DE correct (%d mWh) — fixing Qmax + stored FCC\n", currentDE);
+
+          // --- Helper lambda for MAC data memory 2-byte write ---
+          // Reads old value + checksum, computes differential checksum, writes new value.
+          auto writeDM16 = [](uint16_t addr, uint16_t newVal) -> bool {
+            // Select address
+            Wire.beginTransmission(BQ27220_I2C_ADDR);
+            Wire.write(0x3E);
+            Wire.write(addr & 0xFF);
+            Wire.write((addr >> 8) & 0xFF);
+            Wire.endTransmission();
+            delay(10);
+
+            uint8_t oldMSB = bq27220_read8(0x40);
+            uint8_t oldLSB = bq27220_read8(0x41);
+            uint8_t oldChk = bq27220_read8(0x60);
+            uint8_t dLen   = bq27220_read8(0x61);
+            uint16_t oldVal = (oldMSB << 8) | oldLSB;
+
+            if (oldVal == newVal) {
+              Serial.printf("BQ27220:   [0x%04X] already %d, skip\n", addr, newVal);
+              return true;  // already correct
+            }
+
+            uint8_t newMSB = (newVal >> 8) & 0xFF;
+            uint8_t newLSB = newVal & 0xFF;
+            uint8_t temp = (255 - oldChk - oldMSB - oldLSB);
+            uint8_t newChk = 255 - ((temp + newMSB + newLSB) & 0xFF);
+
+            Serial.printf("BQ27220:   [0x%04X] %d -> %d\n", addr, oldVal, newVal);
+
+            // Write new value
+            Wire.beginTransmission(BQ27220_I2C_ADDR);
+            Wire.write(0x3E);
+            Wire.write(addr & 0xFF);
+            Wire.write((addr >> 8) & 0xFF);
+            Wire.write(newMSB);
+            Wire.write(newLSB);
+            Wire.endTransmission();
+            delay(5);
+
+            // Write checksum
+            Wire.beginTransmission(BQ27220_I2C_ADDR);
+            Wire.write(0x60);
+            Wire.write(newChk);
+            Wire.write(dLen);
+            Wire.endTransmission();
+            delay(10);
+            return true;
+          };
+
+          // Overwrite Qmax Cell 0 (IT Cfg) — this is what FCC is derived from
+          writeDM16(0x9106, designCapacity_mAh);
+
+          // Overwrite stored FCC reference (Gas Gauging, 2 bytes before DC)
+          writeDM16(0x929D, designCapacity_mAh);
+
+          // Exit with reinit to apply the new values
+          bq27220_writeControl(0x0091);  // EXIT_CFG_UPDATE_REINIT
+          delay(200);
+          Serial.println("BQ27220: Qmax + stored FCC updated, exited CFG_UPDATE");
+        }
+      } else {
+        Serial.println("BQ27220: Failed to enter CFG_UPDATE for DE check");
+      }
+
+      // Seal first, then issue RESET.
+      // RESET forces the gauge to fully reinitialize its Impedance Track
+      // algorithm and recalculate FCC from the current DC/DE values.
+      bq27220_writeControl(0x0030);  // SEAL
+      delay(5);
+      Serial.println("BQ27220: Issuing RESET to force FCC recalculation...");
+      bq27220_writeControl(0x0041);  // RESET
+      delay(2000);  // Full reset needs generous settle time
+
+      fcc = bq27220_read16(BQ27220_REG_FULL_CAP);
+      Serial.printf("BQ27220: FCC after RESET: %d mAh (target <= %d)\n", fcc, designCapacity_mAh);
+
+      if (fcc > designCapacity_mAh * 3 / 2) {
+        // RESET didn't fix FCC — the gauge IT algorithm is stubbornly
+        // retaining its learned value. This typically resolves after one
+        // full charge/discharge cycle. Software clamp in
+        // getFullChargeCapacity() ensures correct display regardless.
+        Serial.printf("BQ27220: FCC still stale at %d — software clamp active\n", fcc);
+      }
    }
-    // FCC is stale from factory — fall through to reconfigure
-    Serial.printf("BQ27220: FCC %d >> DC %d, reconfiguring\n", fcc, designCapacity_mAh);
+    return true;
  }

-  // Unseal
+  Serial.printf("BQ27220: Updating Design Capacity from %d to %d mAh\n", currentDC, designCapacity_mAh);
+
+  // Step 1: Unseal (default unseal keys)
  bq27220_writeControl(0x0414); delay(2);
  bq27220_writeControl(0x3672); delay(2);
-  // Full Access
+
+  // Step 2: Full Access
  bq27220_writeControl(0xFFFF); delay(2);
  bq27220_writeControl(0xFFFF); delay(2);

-  // Enter CFG_UPDATE
+  // Step 3: Enter CFG_UPDATE
  bq27220_writeControl(0x0090);
  bool cfgReady = false;
  for (int i = 0; i < 50; i++) {
@@ -229,7 +381,7 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
    return false;
  }

-  // Write Design Capacity at 0x929F
+  // Step 4: Write Design Capacity at 0x929F
  Wire.beginTransmission(BQ27220_I2C_ADDR);
  Wire.write(0x3E); Wire.write(0x9F); Wire.write(0x92);
  Wire.endTransmission();
@@ -255,7 +407,7 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
  Wire.endTransmission();
  delay(10);

-  // Write Design Energy at 0x92A1
+  // Step 4a: Write Design Energy at 0x92A1
  {
    uint16_t designEnergy = (uint16_t)((uint32_t)designCapacity_mAh * 37 / 10);
    Wire.beginTransmission(BQ27220_I2C_ADDR);
@@ -271,6 +423,9 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
    uint8_t deTemp = (255 - deOldChk - deOldMSB - deOldLSB);
    uint8_t deNewChk = 255 - ((deTemp + deNewMSB + deNewLSB) & 0xFF);

+    Serial.printf("BQ27220: Design Energy: old=%d new=%d mWh\n",
+                  (deOldMSB << 8) | deOldLSB, designEnergy);
+
    Wire.beginTransmission(BQ27220_I2C_ADDR);
    Wire.write(0x3E); Wire.write(0xA1); Wire.write(0x92);
    Wire.write(deNewMSB); Wire.write(deNewLSB);
@@ -282,16 +437,17 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
    delay(10);
  }

-  // Exit CFG_UPDATE with reinit
+  // Step 5: Exit CFG_UPDATE with reinit
  bq27220_writeControl(0x0091);
+  Serial.println("BQ27220: Sent EXIT_CFG_UPDATE_REINIT, waiting...");
  delay(200);

-  // Seal
+  // Step 6: Seal
  bq27220_writeControl(0x0030);
  delay(5);

-  // Force RESET to reinitialize FCC
-  bq27220_writeControl(0x0041);
+  // Step 7: Force RESET to reinitialize FCC from new DC/DE
+  bq27220_writeControl(0x0041);  // RESET
  delay(1000);

  uint16_t verifyDC = bq27220_read16(BQ27220_REG_DESIGN_CAP);
@@ -302,4 +458,4 @@ bool T5S3Board::configureFuelGauge(uint16_t designCapacity_mAh) {
 #else
  return false;
 #endif
-}
+}
--- a/variants/lilygo_t5s3_epaper_pro/platformio.ini
+++ b/variants/lilygo_t5s3_epaper_pro/platformio.ini
@@ -63,10 +63,13 @@ build_src_filter = ${esp32_base.build_src_filter}
  +<../variants/LilyGo_T5S3_EPaper_Pro>
 lib_deps =
  ${esp32_base.lib_deps}
+  WebServer
+  Update

 ; ---------------------------------------------------------------------------
 ; T5S3 standalone — touch UI (stub), verify display rendering
 ; Uses FastEPD for parallel e-ink, Adafruit GFX for drawing
+; OTA enabled: WiFi AP activates only during user-initiated firmware updates.
 ; ---------------------------------------------------------------------------
 [env:meck_t5s3_standalone]
 extends = LilyGo_T5S3_EPaper_Pro
@@ -79,7 +82,8 @@ build_flags =
  -D CHANNEL_MSG_HISTORY_SIZE=800
  -D DISPLAY_CLASS=FastEPDDisplay
  -D USE_EINK
-  ; Font family: comment/uncomment to toggle (delete .indexes on SD after switching)
+  -D MECK_CARDKB
+  -D MECK_OTA_UPDATE=1
  ; -D MECK_SERIF_FONT  ; FreeSerif (Times New Roman-like)
  ;                      ; Default (no flag): FreeSans (Arial-like)
 build_src_filter = ${LilyGo_T5S3_EPaper_Pro.build_src_filter}
@@ -98,6 +102,7 @@ lib_deps =
 ; ---------------------------------------------------------------------------
 ; T5S3 BLE companion — touch UI, BLE phone bridging
 ; Connect via MeshCore iOS/Android app over Bluetooth
+; OTA enabled: WiFi AP activates only during user-initiated firmware updates.
 ; Flash: pio run -e meck_t5s3_ble -t upload
 ; ---------------------------------------------------------------------------
 [env:meck_t5s3_ble]
@@ -111,6 +116,8 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=256
  -D DISPLAY_CLASS=FastEPDDisplay
  -D USE_EINK
+  -D MECK_CARDKB
+  -D MECK_OTA_UPDATE=1
  ; -D MECK_SERIF_FONT
 build_src_filter = ${LilyGo_T5S3_EPaper_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
@@ -140,10 +147,12 @@ build_flags =
  -D MAX_GROUP_CHANNELS=20
  -D MECK_WIFI_COMPANION=1
  -D MECK_WEB_READER=1
+  -D MECK_OTA_UPDATE=1
  -D TCP_PORT=5000
  -D OFFLINE_QUEUE_SIZE=256
  -D DISPLAY_CLASS=FastEPDDisplay
  -D USE_EINK
+  -D MECK_CARDKB
  ; -D MECK_SERIF_FONT
 build_src_filter = ${LilyGo_T5S3_EPaper_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
@@ -156,5 +165,4 @@ lib_deps =
  densaugeo/base64 @ ~1.4.0
  adafruit/Adafruit GFX Library@^1.11.0
  https://github.com/mverch67/FastEPD/archive/0df1bff329b6fc782e062f611758880762340647.zip
-  https://github.com/lewisxhe/SensorLib/archive/refs/tags/v0.3.4.zip
-
+  https://github.com/lewisxhe/SensorLib/archive/refs/tags/v0.3.4.zip
--- a/variants/lilygo_t5s3_epaper_pro/variant.h
+++ b/variants/lilygo_t5s3_epaper_pro/variant.h
@@ -29,6 +29,7 @@
 #define I2C_ADDR_BQ27220     0x55  // Fuel gauge
 #define I2C_ADDR_BQ25896     0x6B  // Battery charger
 #define I2C_ADDR_TPS65185    0x68  // E-ink power driver
+#define CARDKB_I2C_ADDR      0x5F  // M5Stack CardKB (external, via QWIIC)

 // -----------------------------------------------------------------------------
 // SPI Bus — shared by LoRa and SD card
--- a/variants/lilygo_tdeck/TDeckBoard.cpp
+++ b/variants/lilygo_tdeck/TDeckBoard.cpp
@@ -1,35 +0,0 @@
-#include <Arduino.h>
-#include "TDeckBoard.h"
-
-uint32_t deviceOnline = 0x00;
-
-void TDeckBoard::begin() {
-  
-  ESP32Board::begin();
-  
-  // Enable peripheral power
-  pinMode(PIN_PERF_POWERON, OUTPUT);
-  digitalWrite(PIN_PERF_POWERON, HIGH);
-
-  // Configure user button
-  pinMode(PIN_USER_BTN, INPUT);
-
-  // Configure LoRa Pins
-  pinMode(P_LORA_MISO, INPUT_PULLUP);
-  // pinMode(P_LORA_DIO_1, INPUT_PULLUP);
-
-  #ifdef P_LORA_TX_LED
-    digitalWrite(P_LORA_TX_LED, HIGH); // inverted pin for SX1276 - HIGH for off
-  #endif
-
-  esp_reset_reason_t reason = esp_reset_reason();
-  if (reason == ESP_RST_DEEPSLEEP) {
-    long wakeup_source = esp_sleep_get_ext1_wakeup_status();
-    if (wakeup_source & (1 << P_LORA_DIO_1)) {
-      startup_reason = BD_STARTUP_RX_PACKET; // received a LoRa packet (while in deep sleep)
-    }
-
-    rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS);
-    rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1);
-  }
-}
--- a/variants/lilygo_tdeck/TDeckBoard.h
+++ b/variants/lilygo_tdeck/TDeckBoard.h
@@ -1,68 +0,0 @@
-#pragma once
-
-#include <Wire.h>
-#include <Arduino.h>
-#include "helpers/ESP32Board.h"
-#include <driver/rtc_io.h>
-
-#define PIN_VBAT_READ 4
-#define BATTERY_SAMPLES 8
-#define ADC_MULTIPLIER (2.0f * 3.3f * 1000)
-
-class TDeckBoard : public ESP32Board {
-public:
-  void begin();
-
-  #ifdef P_LORA_TX_LED
-    void onBeforeTransmit() override{
-      digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED on - invert pin for SX1276
-    }
-
-    void onAfterTransmit() override{
-      digitalWrite(P_LORA_TX_LED, HIGH); // turn TX LED off - invert pin for SX1276
-    }
-  #endif
-
-  void enterDeepSleep(uint32_t secs, int pin_wake_btn) {
-    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-
-    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
-    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
-    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
-
-    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
-
-    if (pin_wake_btn < 0) {
-      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); // wake up on: recv LoRa packet
-    } else {
-      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH); // wake up on: recv LoRa packet OR wake btn
-    }
-
-    if (secs > 0) {
-      esp_sleep_enable_timer_wakeup(secs * 1000000);
-    }
-
-    // Finally set ESP32 into sleep
-    esp_deep_sleep_start(); // CPU halts here and never returns!
-  }
-
-  uint16_t getBattMilliVolts() {
-    #if defined(PIN_VBAT_READ) && defined(ADC_MULTIPLIER)
-      analogReadResolution(12);
-
-      uint32_t raw = 0;
-      for (int i = 0; i < BATTERY_SAMPLES; i++) {
-        raw += analogRead(PIN_VBAT_READ);
-      }
-
-      raw = raw / BATTERY_SAMPLES;
-      return (ADC_MULTIPLIER * raw) / 4096;
-    #else
-      return 0;
-    #endif
-  }
-
-  const char* getManufacturerName() const{
-    return "LilyGo T-Deck";
-  }
-};
--- a/variants/lilygo_tdeck/platformio.ini
+++ b/variants/lilygo_tdeck/platformio.ini
@@ -1,115 +0,0 @@
-[LilyGo_TDeck]
-extends = esp32_base
-board = t-deck
-build_flags =
-  ${esp32_base.build_flags}
-  ${sensor_base.build_flags}
-  -I variants/lilygo_tdeck
-  -D LILYGO_TDECK
-  -D BOARD_HAS_PSRAM=1
-  -D CORE_DEBUG_LEVEL=1
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D PIN_USER_BTN=0  ; Trackball button
-  -D PIN_PERF_POWERON=10 ; Peripheral power pin
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
-  -D SX126X_DIO2_AS_RF_SWITCH=false
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8f
-  -D P_LORA_DIO_1=45 ; LORA IRQ pin
-  -D ENV_INCLUDE_GPS=1
-  -D ENV_INCLUDE_AHTX0=0
-  -D ENV_INCLUDE_BME280=0
-  -D ENV_INCLUDE_BMP280=0
-  -D ENV_INCLUDE_SHTC3=0
-  -D ENV_INCLUDE_SHT4X=0
-  -D ENV_INCLUDE_LPS22HB=0
-  -D ENV_INCLUDE_INA3221=0
-  -D ENV_INCLUDE_INA219=0
-  -D ENV_INCLUDE_INA226=0
-  -D ENV_INCLUDE_INA260=0
-  -D ENV_INCLUDE_MLX90614=0
-  -D ENV_INCLUDE_VL53L0X=0
-  -D ENV_INCLUDE_BME680=0
-  -D ENV_INCLUDE_BMP085=0
-  -D P_LORA_NSS=9    ; LORA SS pin
-  -D P_LORA_RESET=17 ; LORA RST pin
-  -D P_LORA_BUSY=13  ; LORA Busy pin
-  -D P_LORA_SCLK=40  ; LORA SCLK pin
-  -D P_LORA_MISO=38  ; LORA MISO pin
-  -D P_LORA_MOSI=41  ; LORA MOSI pin
-  -D DISPLAY_CLASS=ST7789LCDDisplay
-  -D DISPLAY_SCALE_X=2.5
-  -D DISPLAY_SCALE_Y=3.75
-  -D PIN_TFT_RST=-1
-  -D PIN_TFT_VDD_CTL=-1
-  -D PIN_TFT_LEDA_CTL=42
-  -D PIN_TFT_CS=12
-  -D PIN_TFT_DC=11
-  -D PIN_TFT_SCL=40
-  -D PIN_TFT_SDA=41
-  -D PIN_GPS_RX=43
-  -D PIN_GPS_TX=44
-  -D GPS_BAUD_RATE=38400
-build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/lilygo_tdeck>
-  +<helpers/sensors/*.cpp>
-lib_deps =
-  ${esp32_base.lib_deps}
-  ${sensor_base.lib_deps}
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
-
-[env:LilyGo_TDeck_companion_radio_usb]
-extends = LilyGo_TDeck
-build_flags =
-  ${LilyGo_TDeck.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D OFFLINE_QUEUE_SIZE=256
-build_src_filter = ${LilyGo_TDeck.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-lib_deps =
-  ${LilyGo_TDeck.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:LilyGo_TDeck_companion_radio_ble]
-extends = LilyGo_TDeck
-build_flags =
-  ${LilyGo_TDeck.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-  -D OFFLINE_QUEUE_SIZE=256
-build_src_filter = ${LilyGo_TDeck.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-lib_deps =
-  ${LilyGo_TDeck.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:LilyGo_TDeck_repeater]
-extends = LilyGo_TDeck
-build_flags =
-  ${LilyGo_TDeck.build_flags}
-  -D ADVERT_NAME='"TDeck Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-build_src_filter = ${LilyGo_TDeck.build_src_filter}
-  +<../examples/simple_repeater>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
-lib_deps =
-  ${LilyGo_TDeck.lib_deps}
-  ${esp32_ota.lib_deps}
--- a/variants/lilygo_tdeck/target.cpp
+++ b/variants/lilygo_tdeck/target.cpp
@@ -1,55 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-
-TDeckBoard board;
-
-#if defined(P_LORA_SCLK)
-  static SPIClass spi;
-  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
-#else
-  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
-#endif
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-ESP32RTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider gps(Serial1, &rtc_clock);
-EnvironmentSensorManager sensors(gps);
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-bool radio_init() {
-  fallback_clock.begin();
-  rtc_clock.begin(Wire);
-  Wire.begin(18, 8);
-
-#if defined(P_LORA_SCLK)
-  return radio.std_init(&spi);
-#else
-  return radio.std_init();
-#endif
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng); // create new random identity
-}
--- a/variants/lilygo_tdeck/target.h
+++ b/variants/lilygo_tdeck/target.h
@@ -1,31 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <TDeckBoard.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/SensorManager.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/ST7789LCDDisplay.h>
-  #include <helpers/ui/MomentaryButton.h>
-#endif
-#include "helpers/sensors/EnvironmentSensorManager.h"
-#include "helpers/sensors/MicroNMEALocationProvider.h"
-
-extern TDeckBoard board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();
--- a/variants/lilygo_tdeck_pro/CPUPowerManager.h
+++ b/variants/lilygo_tdeck_pro/CPUPowerManager.h
@@ -8,9 +8,10 @@
 //   240 MHz  ~70-80 mA
 //   160 MHz  ~50-60 mA
 //    80 MHz  ~30-40 mA
+//    40 MHz  ~15-20 mA  (low-power / lock screen mode)
 //
 // SPI peripherals and UART use their own clock dividers from the APB clock,
-// so LoRa, e-ink, and GPS serial all work fine at 80MHz.
+// so LoRa, e-ink, and GPS serial all work fine at 80MHz and 40MHz.

 #ifdef ESP32

@@ -22,23 +23,36 @@
 #define CPU_FREQ_BOOST  240    // MHz — heavy processing
 #endif

+#ifndef CPU_FREQ_LOW_POWER
+#define CPU_FREQ_LOW_POWER 80   // MHz — lock screen / idle standby (40 MHz breaks I2C)
+#endif
+
 #ifndef CPU_BOOST_TIMEOUT_MS
 #define CPU_BOOST_TIMEOUT_MS  10000  // 10 seconds
 #endif

 class CPUPowerManager {
 public:
-  CPUPowerManager() : _boosted(false), _boost_started(0) {}
+  CPUPowerManager() : _boosted(false), _lowPower(false), _boost_started(0) {}

  void begin() {
    setCpuFrequencyMhz(CPU_FREQ_IDLE);
    _boosted = false;
+    _lowPower = false;
    MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
  }

  void loop() {
    if (_boosted && (millis() - _boost_started >= CPU_BOOST_TIMEOUT_MS)) {
-      setIdle();
+      // Return to low-power if locked, otherwise normal idle
+      if (_lowPower) {
+        setCpuFrequencyMhz(CPU_FREQ_LOW_POWER);
+        MESH_DEBUG_PRINTLN("CPU power: boost expired, returning to low-power %d MHz", CPU_FREQ_LOW_POWER);
+      } else {
+        setCpuFrequencyMhz(CPU_FREQ_IDLE);
+        MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
+      }
+      _boosted = false;
    }
  }

@@ -57,13 +71,42 @@ public:
      _boosted = false;
      MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz", CPU_FREQ_IDLE);
    }
+    if (_lowPower) {
+      _lowPower = false;
+    }
+  }
+
+  // Low-power mode — drops CPU to 40 MHz for lock screen standby.
+  // If currently boosted, the boost timeout will return to 40 MHz
+  // instead of 80 MHz.
+  void setLowPower() {
+    _lowPower = true;
+    if (!_boosted) {
+      setCpuFrequencyMhz(CPU_FREQ_LOW_POWER);
+      MESH_DEBUG_PRINTLN("CPU power: low-power at %d MHz", CPU_FREQ_LOW_POWER);
+    }
+    // If boosted, the loop() timeout will drop to low-power instead of idle
+  }
+
+  // Exit low-power mode — returns to normal idle (80 MHz).
+  // If currently boosted, the boost timeout will return to idle
+  // instead of low-power.
+  void clearLowPower() {
+    _lowPower = false;
+    if (!_boosted) {
+      setCpuFrequencyMhz(CPU_FREQ_IDLE);
+      MESH_DEBUG_PRINTLN("CPU power: idle at %d MHz (low-power cleared)", CPU_FREQ_IDLE);
+    }
+    // If boosted, the loop() timeout will drop to idle as normal
  }

  bool isBoosted() const { return _boosted; }
+  bool isLowPower() const { return _lowPower; }
  uint32_t getFrequencyMHz() const { return getCpuFrequencyMhz(); }

 private:
  bool _boosted;
+  bool _lowPower;
  unsigned long _boost_started;
 };

--- a/variants/lilygo_tdeck_pro/Tca8418keyboard.h
+++ b/variants/lilygo_tdeck_pro/Tca8418keyboard.h
@@ -161,24 +161,47 @@ public:
      return false;
    }

-    // Configure keyboard matrix (8 rows x 10 cols)
+    // --- Warm-reboot safe init sequence ---
+    // The TCA8418 stays powered across ESP32 resets (no dedicated RST pin),
+    // so the scanner may still be active from the previous session.
+    // We must disable it before reconfiguring the matrix.
+
+    // 1. Disable scanner — stop all scanning before touching config
+    writeReg(TCA8418_REG_CFG, 0x00);
+
+    // 2. Drain any stale events from the previous session
+    for (int i = 0; i < 16; i++) {
+      if ((readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F) == 0) break;
+      readReg(TCA8418_REG_KEY_EVENT_A);
+    }
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);  // Clear all interrupt flags
+
+    // 3. Explicitly clear GPI event masks (prevent phantom GPI events)
+    writeReg(TCA8418_REG_GPI_EM1, 0x00);
+    writeReg(TCA8418_REG_GPI_EM2, 0x00);
+    writeReg(TCA8418_REG_GPI_EM3, 0x00);
+
+    // 4. Configure keyboard matrix (8 rows x 10 cols)
    writeReg(TCA8418_REG_KP_GPIO1, 0xFF);  // Rows 0-7 as keypad
    writeReg(TCA8418_REG_KP_GPIO2, 0xFF);  // Cols 0-7 as keypad
    writeReg(TCA8418_REG_KP_GPIO3, 0x03);  // Cols 8-9 as keypad

-    // Enable keypad with FIFO overflow detection
-    writeReg(TCA8418_REG_CFG, 0x11);  // KE_IEN + INT_CFG
-
-    // Set debounce
+    // 5. Set debounce
    writeReg(TCA8418_REG_DEBOUNCE, 0x03);

-    // Clear any pending interrupts
+    // 6. Final pre-enable cleanup
    writeReg(TCA8418_REG_INT_STAT, 0x1F);

-    // Flush the FIFO
-    while (readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F) {
+    // 7. Enable scanner — matrix config is stable, safe to start scanning
+    writeReg(TCA8418_REG_CFG, 0x11);  // KE_IEN + INT_CFG
+
+    // 8. Let scanner stabilise, then flush any spurious first-scan events
+    delay(5);
+    for (int i = 0; i < 16; i++) {
+      if ((readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F) == 0) break;
      readReg(TCA8418_REG_KEY_EVENT_A);
    }
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);

    _initialized = true;
    Serial.println("TCA8418: Keyboard initialized OK");
--- a/variants/lilygo_tdeck_pro/platformio.ini
+++ b/variants/lilygo_tdeck_pro/platformio.ini
@@ -83,6 +83,8 @@ build_flags =
  -D PIN_DISPLAY_MOSI=33
  -D PIN_DISPLAY_BL=45
  -D PIN_USER_BTN=0
+  -D HAS_TOUCHSCREEN=1
+  -D CST328_PIN_INT=12
  -D CST328_PIN_RST=38
  -D ARDUINO_LOOP_STACK_SIZE=32768
 build_src_filter = ${esp32_base.build_src_filter}
@@ -94,6 +96,8 @@ lib_deps =
  zinggjm/GxEPD2@^1.5.9
  adafruit/Adafruit GFX Library@^1.11.0
  bitbank2/PNGdec@^1.0.1
+  WebServer
+  Update

 ; ---------------------------------------------------------------------------
 ; Meck unified builds — one codebase, six variants via build flags
@@ -112,6 +116,7 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=256
  -D MECK_AUDIO_VARIANT
  -D MECK_WEB_READER=1
+  -D MECK_OTA_UPDATE=1
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
@@ -144,7 +149,8 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=256
  -D MECK_AUDIO_VARIANT
  -D MECK_WEB_READER=1
-  -D FIRMWARE_VERSION='"Meck v1.0.WiFi"'
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.WiFi"'
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
@@ -159,6 +165,7 @@ lib_deps =

 ; Audio standalone (audio-player hardware, no BLE/WiFi — maximum battery life)
 ; No MECK_WEB_READER: WiFi power draw conflicts with zero-radio-power design.
+; OTA enabled: WiFi AP activates only during user-initiated firmware updates.
 ; Contacts and sort arrays allocated in PSRAM — 1500 contacts uses ~290KB of 8MB.
 [env:meck_audio_standalone]
 extends = LilyGo_TDeck_Pro
@@ -169,6 +176,7 @@ build_flags =
  -D MAX_GROUP_CHANNELS=20
  -D OFFLINE_QUEUE_SIZE=1
  -D MECK_AUDIO_VARIANT
+  -D MECK_OTA_UPDATE=1
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
@@ -194,7 +202,8 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=256
  -D HAS_4G_MODEM=1
  -D MECK_WEB_READER=1
-  -D FIRMWARE_VERSION='"Meck v1.0.4G"'
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.4G"'
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
@@ -224,7 +233,8 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=256
  -D HAS_4G_MODEM=1
  -D MECK_WEB_READER=1
-  -D FIRMWARE_VERSION='"Meck v1.0.4G.WiFi"'
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.4G.WiFi"'
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
@@ -250,7 +260,8 @@ build_flags =
  -D OFFLINE_QUEUE_SIZE=1
  -D HAS_4G_MODEM=1
  -D MECK_WEB_READER=1
-  -D FIRMWARE_VERSION='"Meck v1.0.4G.SA"'
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.4G.SA"'
 build_src_filter = ${LilyGo_TDeck_Pro.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
--- a/variants/lilygo_tdeck_pro_max/TDeckProMaxBoard.cpp
+++ b/variants/lilygo_tdeck_pro_max/TDeckProMaxBoard.cpp
@@ -0,0 +1,347 @@
+#include <Arduino.h>
+#include "variant.h"
+#include "TDeckProMaxBoard.h"
+#include <Mesh.h>  // For MESH_DEBUG_PRINTLN
+
+// LEDC channel for e-ink backlight PWM (Arduino ESP32 core 2.x channel-based API)
+#ifdef PIN_EINK_BL
+  #define EINK_BL_LEDC_CHANNEL 0
+#endif
+
+// =============================================================================
+// TDeckProMaxBoard::begin() — Boot sequence for T-Deck Pro MAX V0.1
+//
+// Critical ordering:
+//   1. I2C bus init (XL9555, BQ27220, and all sensors share this bus)
+//   2. XL9555 init (must be up before ANY peripheral that depends on it)
+//   3. Touch reset pulse via XL9555 (needed before touch driver init)
+//   4. Keyboard reset pulse via XL9555 (clean keyboard state)
+//   5. LoRa power enable via XL9555 (must be on before SPI radio init)
+//   6. GPS power + UART init
+//   7. Parent class init (ESP32Board::begin)
+//   8. LoRa SPI pin config + deep sleep wake handling
+//   9. BQ27220 fuel gauge check
+//  10. Low-voltage protection
+//
+// NOTE: We do NOT call TDeckBoard::begin() — we reimplement the boot sequence
+// to handle XL9555-routed pins. BQ27220 methods are inherited unchanged.
+// =============================================================================
+
+void TDeckProMaxBoard::begin() {
+
+  MESH_DEBUG_PRINTLN("TDeckProMaxBoard::begin() - T-Deck Pro MAX V0.1");
+
+  // ------ Step 1: I2C bus ------
+  // All I2C devices (XL9555, BQ27220, TCA8418, CST328, DRV2605, ES8311,
+  // BQ25896, BHI260AP) share SDA=13, SCL=14.
+  Wire.begin(I2C_SDA, I2C_SCL);
+  Wire.setClock(100000);  // 100kHz — safe for all devices on the bus
+  MESH_DEBUG_PRINTLN("  I2C initialized (SDA=%d SCL=%d)", I2C_SDA, I2C_SCL);
+
+  // ------ Step 2: XL9555 I/O Expander ------
+  // This must happen before anything that needs peripheral power or resets.
+  if (!xl9555_init()) {
+    Serial.println("CRITICAL: XL9555 init failed — peripherals will not work!");
+    // Continue anyway; some things (display, keyboard INT) might still work
+    // without XL9555, but LoRa/GPS/modem will be dead.
+  }
+
+  // ------ Step 3: Touch reset pulse ------
+  // The touch controller (CST328) needs a clean reset via XL9555 IO07
+  // before the touch driver tries to communicate with it.
+  touchReset();
+
+  // ------ Step 4: Keyboard reset pulse ------
+  keyboardReset();
+
+  // ------ Step 5: Parent class init ------
+  // ESP32Board::begin() handles common ESP32 setup.
+  // We skip TDeckBoard::begin() because it uses PIN_PERF_POWERON and
+  // direct GPIO for LoRa/GPS power that don't exist on MAX.
+  ESP32Board::begin();
+
+  // ------ Step 6: GPS UART init ------
+  // GPS power was already enabled by XL9555 boot defaults (GPS_EN HIGH).
+  // Now init the UART with the MAX-specific pins.
+  #if HAS_GPS
+    Serial2.begin(GPS_BAUDRATE, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
+    MESH_DEBUG_PRINTLN("  GPS Serial2 initialized (RX=%d TX=%d @ %d baud)",
+                       GPS_RX_PIN, GPS_TX_PIN, GPS_BAUDRATE);
+  #endif
+
+  // ------ Step 7: Configure user button ------
+  pinMode(PIN_USER_BTN, INPUT);
+
+  // ------ Step 8: Configure LoRa SPI pins ------
+  // LoRa power is already enabled via XL9555 (LORA_EN HIGH in boot defaults).
+  pinMode(P_LORA_MISO, INPUT_PULLUP);
+
+  // ------ Step 9: Handle wake from deep sleep ------
+  esp_reset_reason_t reason = esp_reset_reason();
+  if (reason == ESP_RST_DEEPSLEEP) {
+    uint64_t wakeup_source = esp_sleep_get_ext1_wakeup_status();
+    if (wakeup_source & (1ULL << P_LORA_DIO_1)) {
+      startup_reason = BD_STARTUP_RX_PACKET;
+    }
+    rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS);
+    rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1);
+  }
+
+  // ------ Step 10: BQ27220 fuel gauge ------
+  #if HAS_BQ27220
+    uint16_t voltage = getBattMilliVolts();
+    MESH_DEBUG_PRINTLN("  Battery voltage: %d mV", voltage);
+    configureFuelGauge();   // Inherited from TDeckBoard — sets 1500 mAh
+  #endif
+
+  // ------ Step 11: Early low-voltage protection ------
+  #if HAS_BQ27220 && defined(AUTO_SHUTDOWN_MILLIVOLTS)
+  {
+    uint16_t bootMv = getBattMilliVolts();
+    if (bootMv > 0 && bootMv < AUTO_SHUTDOWN_MILLIVOLTS) {
+      Serial.printf("CRITICAL: Boot voltage %dmV < %dmV — sleeping immediately\n",
+                    bootMv, AUTO_SHUTDOWN_MILLIVOLTS);
+      esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
+      esp_sleep_enable_ext1_wakeup(1ULL << PIN_USER_BTN, ESP_EXT1_WAKEUP_ANY_HIGH);
+      esp_deep_sleep_start();
+    }
+  }
+  #endif
+
+  // ------ Step 12: E-ink backlight (working on MAX!) ------
+  // Configure LEDC PWM for backlight brightness control.
+  // Start with backlight OFF — UI code can enable it when needed.
+  #ifdef PIN_EINK_BL
+    // Arduino ESP32 core 2.x uses channel-based LEDC API
+    ledcSetup(EINK_BL_LEDC_CHANNEL, 1000, 8);  // Channel 0, 1kHz, 8-bit resolution
+    ledcAttachPin(PIN_EINK_BL, EINK_BL_LEDC_CHANNEL);
+    ledcWrite(EINK_BL_LEDC_CHANNEL, 0);        // Off by default
+    MESH_DEBUG_PRINTLN("  Backlight PWM configured on IO%d", PIN_EINK_BL);
+  #endif
+
+  MESH_DEBUG_PRINTLN("TDeckProMaxBoard::begin() - complete");
+}
+
+
+// =============================================================================
+// XL9555 I/O Expander — Lightweight I2C Driver
+// =============================================================================
+
+bool TDeckProMaxBoard::xl9555_writeReg(uint8_t reg, uint8_t val) {
+  Wire.beginTransmission(I2C_ADDR_XL9555);
+  Wire.write(reg);
+  Wire.write(val);
+  return Wire.endTransmission() == 0;
+}
+
+uint8_t TDeckProMaxBoard::xl9555_readReg(uint8_t reg) {
+  Wire.beginTransmission(I2C_ADDR_XL9555);
+  Wire.write(reg);
+  Wire.endTransmission(false);
+  Wire.requestFrom((uint8_t)I2C_ADDR_XL9555, (uint8_t)1);
+  return Wire.available() ? Wire.read() : 0xFF;
+}
+
+bool TDeckProMaxBoard::xl9555_init() {
+  MESH_DEBUG_PRINTLN("  XL9555: Initializing I/O expander at 0x%02X", I2C_ADDR_XL9555);
+
+  // Verify XL9555 is present on the bus
+  Wire.beginTransmission(I2C_ADDR_XL9555);
+  if (Wire.endTransmission() != 0) {
+    Serial.println("  XL9555: NOT FOUND on I2C bus!");
+    _xlReady = false;
+    return false;
+  }
+
+  // Set ALL pins as outputs (config register: 0 = output)
+  // Port 0 (pins 0-7): all output
+  if (!xl9555_writeReg(XL9555_REG_CONFIG_0, 0x00)) return false;
+  // Port 1 (pins 8-15): all output
+  if (!xl9555_writeReg(XL9555_REG_CONFIG_1, 0x00)) return false;
+
+  // Apply boot defaults
+  _xlPort0 = XL9555_BOOT_PORT0;
+  _xlPort1 = XL9555_BOOT_PORT1;
+  if (!xl9555_writeReg(XL9555_REG_OUTPUT_0, _xlPort0)) return false;
+  if (!xl9555_writeReg(XL9555_REG_OUTPUT_1, _xlPort1)) return false;
+
+  _xlReady = true;
+
+  MESH_DEBUG_PRINTLN("  XL9555: Ready (Port0=0x%02X Port1=0x%02X)", _xlPort0, _xlPort1);
+  MESH_DEBUG_PRINTLN("  XL9555: LoRa=%s GPS=%s 1V8=%s Modem=%s Antenna=%s",
+                     (_xlPort0 & (1 << XL_PIN_LORA_EN)) ? "ON" : "OFF",
+                     (_xlPort0 & (1 << XL_PIN_GPS_EN)) ? "ON" : "OFF",
+                     (_xlPort0 & (1 << XL_PIN_1V8_EN)) ? "ON" : "OFF",
+                     (_xlPort0 & (1 << XL_PIN_6609_EN)) ? "ON" : "OFF",
+                     (_xlPort0 & (1 << XL_PIN_LORA_SEL)) ? "internal" : "external");
+
+  return true;
+}
+
+void TDeckProMaxBoard::xl9555_digitalWrite(uint8_t pin, bool value) {
+  if (!_xlReady) return;
+
+  if (pin < 8) {
+    // Port 0
+    if (value) _xlPort0 |= (1 << pin);
+    else       _xlPort0 &= ~(1 << pin);
+    xl9555_writeReg(XL9555_REG_OUTPUT_0, _xlPort0);
+  } else if (pin < 16) {
+    // Port 1 (subtract 8 for bit position)
+    uint8_t bit = pin - 8;
+    if (value) _xlPort1 |= (1 << bit);
+    else       _xlPort1 &= ~(1 << bit);
+    xl9555_writeReg(XL9555_REG_OUTPUT_1, _xlPort1);
+  }
+}
+
+bool TDeckProMaxBoard::xl9555_digitalRead(uint8_t pin) const {
+  if (pin < 8) return (_xlPort0 >> pin) & 1;
+  if (pin < 16) return (_xlPort1 >> (pin - 8)) & 1;
+  return false;
+}
+
+void TDeckProMaxBoard::xl9555_writePort0(uint8_t val) {
+  _xlPort0 = val;
+  if (_xlReady) xl9555_writeReg(XL9555_REG_OUTPUT_0, val);
+}
+
+void TDeckProMaxBoard::xl9555_writePort1(uint8_t val) {
+  _xlPort1 = val;
+  if (_xlReady) xl9555_writeReg(XL9555_REG_OUTPUT_1, val);
+}
+
+
+// =============================================================================
+// High-level peripheral control
+// =============================================================================
+
+// ---- Modem (A7682E) ----
+
+void TDeckProMaxBoard::modemPowerOn() {
+  MESH_DEBUG_PRINTLN("  XL9555: Modem power ON (6609_EN HIGH)");
+  xl9555_digitalWrite(XL_PIN_6609_EN, HIGH);
+  delay(100);  // Allow SGM6609 boost to stabilise
+}
+
+void TDeckProMaxBoard::modemPowerOff() {
+  MESH_DEBUG_PRINTLN("  XL9555: Modem power OFF (6609_EN LOW)");
+  xl9555_digitalWrite(XL_PIN_6609_EN, LOW);
+}
+
+void TDeckProMaxBoard::modemPwrkeyPulse() {
+  // A7682E power-on sequence: pulse PWRKEY LOW for >= 500ms
+  // (Some datasheets say pull HIGH then LOW; LilyGo factory sets HIGH then toggles.)
+  MESH_DEBUG_PRINTLN("  XL9555: Modem PWRKEY pulse");
+  xl9555_digitalWrite(XL_PIN_PWRKEY_EN, HIGH);
+  delay(100);
+  xl9555_digitalWrite(XL_PIN_PWRKEY_EN, LOW);
+  delay(1200);
+  xl9555_digitalWrite(XL_PIN_PWRKEY_EN, HIGH);
+}
+
+// ---- Audio output selection ----
+
+void TDeckProMaxBoard::selectAudioES8311() {
+  MESH_DEBUG_PRINTLN("  XL9555: Audio select → ES8311");
+  xl9555_digitalWrite(XL_PIN_AUDIO_SEL, LOW);
+}
+
+void TDeckProMaxBoard::selectAudioModem() {
+  MESH_DEBUG_PRINTLN("  XL9555: Audio select → A7682E");
+  xl9555_digitalWrite(XL_PIN_AUDIO_SEL, HIGH);
+}
+
+void TDeckProMaxBoard::amplifierEnable() {
+  xl9555_digitalWrite(XL_PIN_AMPLIFIER, HIGH);
+}
+
+void TDeckProMaxBoard::amplifierDisable() {
+  xl9555_digitalWrite(XL_PIN_AMPLIFIER, LOW);
+}
+
+// ---- LoRa antenna selection ----
+
+void TDeckProMaxBoard::loraAntennaInternal() {
+  MESH_DEBUG_PRINTLN("  XL9555: LoRa antenna → internal");
+  xl9555_digitalWrite(XL_PIN_LORA_SEL, HIGH);
+}
+
+void TDeckProMaxBoard::loraAntennaExternal() {
+  MESH_DEBUG_PRINTLN("  XL9555: LoRa antenna → external");
+  xl9555_digitalWrite(XL_PIN_LORA_SEL, LOW);
+}
+
+// ---- Motor (DRV2605) ----
+
+void TDeckProMaxBoard::motorEnable() {
+  xl9555_digitalWrite(XL_PIN_MOTOR_EN, HIGH);
+}
+
+void TDeckProMaxBoard::motorDisable() {
+  xl9555_digitalWrite(XL_PIN_MOTOR_EN, LOW);
+}
+
+// ---- Touch reset ----
+
+void TDeckProMaxBoard::touchReset() {
+  if (!_xlReady) return;
+  MESH_DEBUG_PRINTLN("  XL9555: Touch reset pulse");
+  xl9555_digitalWrite(XL_PIN_TOUCH_RST, LOW);
+  delay(20);
+  xl9555_digitalWrite(XL_PIN_TOUCH_RST, HIGH);
+  delay(50);  // Allow touch controller to come out of reset
+}
+
+// ---- Keyboard reset ----
+
+void TDeckProMaxBoard::keyboardReset() {
+  if (!_xlReady) return;
+  MESH_DEBUG_PRINTLN("  XL9555: Keyboard reset pulse");
+  xl9555_digitalWrite(XL_PIN_KEY_RST, LOW);
+  delay(20);
+  xl9555_digitalWrite(XL_PIN_KEY_RST, HIGH);
+  delay(50);
+}
+
+// ---- GPS power ----
+
+void TDeckProMaxBoard::gpsPowerOn() {
+  xl9555_digitalWrite(XL_PIN_GPS_EN, HIGH);
+  delay(100);
+}
+
+void TDeckProMaxBoard::gpsPowerOff() {
+  xl9555_digitalWrite(XL_PIN_GPS_EN, LOW);
+}
+
+// ---- LoRa power ----
+
+void TDeckProMaxBoard::loraPowerOn() {
+  xl9555_digitalWrite(XL_PIN_LORA_EN, HIGH);
+  delay(10);
+}
+
+void TDeckProMaxBoard::loraPowerOff() {
+  xl9555_digitalWrite(XL_PIN_LORA_EN, LOW);
+}
+
+// ---- E-ink backlight (working on MAX!) ----
+
+void TDeckProMaxBoard::backlightOn() {
+  #ifdef PIN_EINK_BL
+    ledcWrite(EINK_BL_LEDC_CHANNEL, 255);
+  #endif
+}
+
+void TDeckProMaxBoard::backlightOff() {
+  #ifdef PIN_EINK_BL
+    ledcWrite(EINK_BL_LEDC_CHANNEL, 0);
+  #endif
+}
+
+void TDeckProMaxBoard::backlightSetBrightness(uint8_t duty) {
+  #ifdef PIN_EINK_BL
+    ledcWrite(EINK_BL_LEDC_CHANNEL, duty);
+  #endif
+}
--- a/variants/lilygo_tdeck_pro_max/TDeckProMaxBoard.h
+++ b/variants/lilygo_tdeck_pro_max/TDeckProMaxBoard.h
@@ -0,0 +1,108 @@
+#pragma once
+
+// =============================================================================
+// TDeckProMaxBoard — Board support for LilyGo T-Deck Pro MAX V0.1
+//
+// Extends TDeckBoard (which provides all BQ27220 fuel gauge methods) with:
+//   - XL9555 I/O expander initialisation and control
+//   - XL9555-routed peripheral power management
+//   - Touch/keyboard reset via XL9555
+//   - Modem power/PWRKEY via XL9555
+//   - LoRa antenna selection via XL9555
+//   - Audio output mux (ES8311 vs A7682E) via XL9555
+//   - Speaker amplifier enable via XL9555
+//
+// The XL9555 must be initialised before LoRa, GPS, modem, or touch are used.
+// All power enables, resets, and switches go through I2C — not direct GPIO.
+// =============================================================================
+
+#include "variant.h"
+#include "TDeckBoard.h"   // Inherits BQ27220 fuel gauge, deep sleep, power management
+
+class TDeckProMaxBoard : public TDeckBoard {
+public:
+  void begin();
+
+  const char* getManufacturerName() const {
+    return "LilyGo T-Deck Pro MAX";
+  }
+
+  // -------------------------------------------------------------------------
+  // XL9555 I/O Expander — lightweight inline driver
+  //
+  // The XL9555 has 16 I/O pins across two 8-bit ports.
+  // Pin 0-7 = Port 0, Pin 8-15 = Port 1.
+  // We shadow the output state in _xlPort0/_xlPort1 to allow
+  // single-bit set/clear without read-modify-write over I2C.
+  // -------------------------------------------------------------------------
+
+  // Initialise XL9555: set all used pins as outputs, apply boot defaults.
+  // Returns true if I2C communication with XL9555 succeeded.
+  bool xl9555_init();
+
+  // Set a single XL9555 pin HIGH or LOW (pin 0-15).
+  void xl9555_digitalWrite(uint8_t pin, bool value);
+
+  // Read the current output state of a pin (from shadow, not I2C read).
+  bool xl9555_digitalRead(uint8_t pin) const;
+
+  // Write raw port values (for batch updates).
+  void xl9555_writePort0(uint8_t val);
+  void xl9555_writePort1(uint8_t val);
+
+  // -------------------------------------------------------------------------
+  // High-level peripheral control (delegates to XL9555)
+  // -------------------------------------------------------------------------
+
+  // Modem (A7682E) power control
+  void modemPowerOn();       // Enable SGM6609 boost (6609_EN HIGH)
+  void modemPowerOff();      // Disable SGM6609 boost (6609_EN LOW)
+  void modemPwrkeyPulse();   // Toggle PWRKEY: HIGH 100ms → LOW 1200ms → HIGH
+
+  // Audio output selection
+  void selectAudioES8311();  // AUDIO_SEL LOW → ES8311 output to speaker/headphones
+  void selectAudioModem();   // AUDIO_SEL HIGH → A7682E output to speaker/headphones
+  void amplifierEnable();    // NS4150B amplifier ON (louder speaker)
+  void amplifierDisable();   // NS4150B amplifier OFF (saves power)
+
+  // LoRa antenna selection (SKY13453 RF switch)
+  void loraAntennaInternal();  // LORA_SEL HIGH → internal PCB antenna (default)
+  void loraAntennaExternal();  // LORA_SEL LOW → external IPEX antenna
+
+  // Motor (DRV2605) power
+  void motorEnable();          // MOTOR_EN HIGH
+  void motorDisable();         // MOTOR_EN LOW
+
+  // Touch controller reset via XL9555
+  void touchReset();           // Pulse TOUCH_RST: LOW 20ms → HIGH, then 50ms settle
+
+  // Keyboard reset via XL9555
+  void keyboardReset();        // Pulse KEY_RST: LOW 20ms → HIGH, then 50ms settle
+
+  // GPS power control via XL9555
+  void gpsPowerOn();           // GPS_EN HIGH
+  void gpsPowerOff();          // GPS_EN LOW
+
+  // LoRa power control via XL9555
+  void loraPowerOn();          // LORA_EN HIGH
+  void loraPowerOff();         // LORA_EN LOW
+
+  // -------------------------------------------------------------------------
+  // E-ink front-light control
+  // On MAX, IO41 has a working backlight circuit (boost converter + LEDs).
+  // PWM control for brightness is possible via ledc.
+  // -------------------------------------------------------------------------
+  void backlightOn();
+  void backlightOff();
+  void backlightSetBrightness(uint8_t duty);  // 0-255, via LEDC PWM
+
+private:
+  // Shadow registers for XL9555 output ports (avoid I2C read-modify-write)
+  uint8_t _xlPort0 = XL9555_BOOT_PORT0;
+  uint8_t _xlPort1 = XL9555_BOOT_PORT1;
+  bool    _xlReady = false;
+
+  // Low-level I2C helpers
+  bool xl9555_writeReg(uint8_t reg, uint8_t val);
+  uint8_t xl9555_readReg(uint8_t reg);
+};
--- a/variants/lilygo_tdeck_pro_max/Tca8418keyboard.h
+++ b/variants/lilygo_tdeck_pro_max/Tca8418keyboard.h
@@ -0,0 +1,360 @@
+#pragma once
+
+#include <Arduino.h>
+#include <Wire.h>
+
+// TCA8418 Register addresses
+#define TCA8418_REG_CFG         0x01
+#define TCA8418_REG_INT_STAT    0x02
+#define TCA8418_REG_KEY_LCK_EC  0x03
+#define TCA8418_REG_KEY_EVENT_A 0x04
+#define TCA8418_REG_KP_GPIO1    0x1D
+#define TCA8418_REG_KP_GPIO2    0x1E
+#define TCA8418_REG_KP_GPIO3    0x1F
+#define TCA8418_REG_DEBOUNCE    0x29
+#define TCA8418_REG_GPI_EM1     0x20
+#define TCA8418_REG_GPI_EM2     0x21
+#define TCA8418_REG_GPI_EM3     0x22
+
+// Key codes for special keys
+#define KB_KEY_NONE      0
+#define KB_KEY_BACKSPACE '\b'
+#define KB_KEY_ENTER     '\r'
+#define KB_KEY_SPACE     ' '
+#define KB_KEY_EMOJI     0x01   // Non-printable code for $ key (emoji picker)
+#define KB_KEY_BACKLIGHT 0x02   // Non-printable code for Alt+B (backlight toggle, MAX only)
+
+class TCA8418Keyboard {
+private:
+  uint8_t _addr;
+  TwoWire* _wire;
+  bool _initialized;
+  bool _shiftActive;   // Sticky shift (one-shot or held)
+  bool _shiftConsumed; // Was shift active for the last returned key
+  bool _shiftHeld;     // Shift key physically held down
+  bool _shiftUsedWhileHeld; // Was shift consumed by any key while held
+  bool _altActive;     // Sticky alt (one-shot)
+  bool _symActive;     // Sticky sym (one-shot)
+  unsigned long _lastShiftTime;  // For Shift+key combos
+
+  uint8_t readReg(uint8_t reg) {
+    _wire->beginTransmission(_addr);
+    _wire->write(reg);
+    _wire->endTransmission();
+    _wire->requestFrom(_addr, (uint8_t)1);
+    return _wire->available() ? _wire->read() : 0;
+  }
+
+  void writeReg(uint8_t reg, uint8_t val) {
+    _wire->beginTransmission(_addr);
+    _wire->write(reg);
+    _wire->write(val);
+    _wire->endTransmission();
+  }
+
+  // Map raw key codes to characters (from working reader firmware)
+  char getKeyChar(uint8_t keyCode) {
+    switch (keyCode) {
+      // Row 1 - QWERTYUIOP
+      case 10: return 'q';   // Q (was 97 on different hardware)
+      case 9:  return 'w';
+      case 8:  return 'e';
+      case 7:  return 'r';
+      case 6:  return 't';
+      case 5:  return 'y';
+      case 4:  return 'u';
+      case 3:  return 'i';
+      case 2:  return 'o';
+      case 1:  return 'p';
+      
+      // Row 2 - ASDFGHJKL + Backspace
+      case 20: return 'a';   // A (was 98 on different hardware)
+      case 19: return 's';
+      case 18: return 'd';
+      case 17: return 'f';
+      case 16: return 'g';
+      case 15: return 'h';
+      case 14: return 'j';
+      case 13: return 'k';
+      case 12: return 'l';
+      case 11: return '\b'; // Backspace
+      
+      // Row 3 - Alt ZXCVBNM Sym Enter
+      case 30: return 0;    // Alt - handled separately
+      case 29: return 'z';
+      case 28: return 'x';
+      case 27: return 'c';
+      case 26: return 'v';
+      case 25: return 'b';
+      case 24: return 'n';
+      case 23: return 'm';
+      case 22: return 0;    // Symbol key - handled separately
+      case 21: return '\r'; // Enter
+      
+      // Row 4 - Shift Mic Space Sym Shift
+      case 35: return 0;    // Left shift - handled separately
+      case 34: return 0;    // Mic
+      case 33: return ' ';  // Space
+      case 32: return 0;    // Sym - handled separately
+      case 31: return 0;    // Right shift - handled separately
+      
+      default: return 0;
+    }
+  }
+
+  // Map key with Alt modifier - same as Sym for this keyboard
+  char getAltChar(uint8_t keyCode) {
+    return getSymChar(keyCode);  // Alt does same as Sym
+  }
+
+  // Map key with Sym modifier - based on actual T-Deck Pro keyboard silk-screen
+  char getSymChar(uint8_t keyCode) {
+    switch (keyCode) {
+      // Row 1: Q W E R T Y U I O P
+      case 10: return '#';  // Q -> #
+      case 9:  return '1';  // W -> 1
+      case 8:  return '2';  // E -> 2
+      case 7:  return '3';  // R -> 3
+      case 6:  return '(';  // T -> (
+      case 5:  return ')';  // Y -> )
+      case 4:  return '_';  // U -> _
+      case 3:  return '-';  // I -> -
+      case 2:  return '+';  // O -> +
+      case 1:  return '@';  // P -> @
+      
+      // Row 2: A S D F G H J K L
+      case 20: return '*';  // A -> *
+      case 19: return '4';  // S -> 4
+      case 18: return '5';  // D -> 5
+      case 17: return '6';  // F -> 6
+      case 16: return '/';  // G -> /
+      case 15: return ':';  // H -> :
+      case 14: return ';';  // J -> ;
+      case 13: return '\''; // K -> '
+      case 12: return '"';  // L -> "
+      
+      // Row 3: Z X C V B N M
+      case 29: return '7';  // Z -> 7
+      case 28: return '8';  // X -> 8
+      case 27: return '9';  // C -> 9
+      case 26: return '?';  // V -> ?
+      case 25: return '!';  // B -> !
+      case 24: return ',';  // N -> ,
+      case 23: return '.';  // M -> .
+      
+      // Row 4: Mic key -> 0
+      case 34: return '0';  // Mic -> 0
+      
+      default: return 0;
+    }
+  }
+
+public:
+  TCA8418Keyboard(uint8_t addr = 0x34, TwoWire* wire = &Wire) 
+    : _addr(addr), _wire(wire), _initialized(false), 
+      _shiftActive(false), _shiftConsumed(false), _shiftHeld(false), _shiftUsedWhileHeld(false), _altActive(false), _symActive(false), _lastShiftTime(0) {}
+
+  bool begin() {
+    // Check if device responds
+    _wire->beginTransmission(_addr);
+    if (_wire->endTransmission() != 0) {
+      Serial.println("TCA8418: Device not found");
+      return false;
+    }
+
+    // --- Warm-reboot safe init sequence ---
+    // The TCA8418 stays powered across ESP32 resets (no dedicated RST pin),
+    // so the scanner may still be active from the previous session.
+    // We must disable it before reconfiguring the matrix.
+
+    // 1. Disable scanner — stop all scanning before touching config
+    writeReg(TCA8418_REG_CFG, 0x00);
+
+    // 2. Drain any stale events from the previous session
+    for (int i = 0; i < 16; i++) {
+      if ((readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F) == 0) break;
+      readReg(TCA8418_REG_KEY_EVENT_A);
+    }
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);  // Clear all interrupt flags
+
+    // 3. Explicitly clear GPI event masks (prevent phantom GPI events)
+    writeReg(TCA8418_REG_GPI_EM1, 0x00);
+    writeReg(TCA8418_REG_GPI_EM2, 0x00);
+    writeReg(TCA8418_REG_GPI_EM3, 0x00);
+
+    // 4. Configure keyboard matrix (8 rows x 10 cols)
+    writeReg(TCA8418_REG_KP_GPIO1, 0xFF);  // Rows 0-7 as keypad
+    writeReg(TCA8418_REG_KP_GPIO2, 0xFF);  // Cols 0-7 as keypad
+    writeReg(TCA8418_REG_KP_GPIO3, 0x03);  // Cols 8-9 as keypad
+
+    // 5. Set debounce
+    writeReg(TCA8418_REG_DEBOUNCE, 0x03);
+
+    // 6. Final pre-enable cleanup
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);
+
+    // 7. Enable scanner — matrix config is stable, safe to start scanning
+    writeReg(TCA8418_REG_CFG, 0x11);  // KE_IEN + INT_CFG
+
+    // 8. Let scanner stabilise, then flush any spurious first-scan events
+    delay(5);
+    for (int i = 0; i < 16; i++) {
+      if ((readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F) == 0) break;
+      readReg(TCA8418_REG_KEY_EVENT_A);
+    }
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);
+
+    _initialized = true;
+    Serial.println("TCA8418: Keyboard initialized OK");
+    return true;
+  }
+
+  // Read a key press - returns character or 0 if no key
+  char readKey() {
+    if (!_initialized) return 0;
+
+    // Check for key events in FIFO
+    uint8_t keyCount = readReg(TCA8418_REG_KEY_LCK_EC) & 0x0F;
+    if (keyCount == 0) return 0;
+
+    // Read key event from FIFO
+    uint8_t keyEvent = readReg(TCA8418_REG_KEY_EVENT_A);
+
+    // Bit 7: 1 = press, 0 = release
+    bool pressed = (keyEvent & 0x80) != 0;
+    uint8_t keyCode = keyEvent & 0x7F;
+
+    // Clear interrupt
+    writeReg(TCA8418_REG_INT_STAT, 0x1F);
+
+    Serial.printf("KB raw: event=0x%02X code=%d pressed=%d count=%d\n", 
+                  keyEvent, keyCode, pressed, keyCount);
+
+    // Track shift release (before the general release-ignore)
+    if (!pressed && (keyCode == 35 || keyCode == 31)) {
+      _shiftHeld = false;
+      // If shift was used while held (e.g. cursor nav), clear it completely
+      // so the next bare keypress isn't treated as shifted.
+      // If shift was NOT used (tap-then-release), keep _shiftActive for one-shot.
+      if (_shiftUsedWhileHeld) {
+        _shiftActive = false;
+      }
+      _shiftUsedWhileHeld = false;
+      return 0;
+    }
+
+    // Only act on key press, not release
+    if (!pressed || keyCode == 0) {
+      return 0;
+    }
+
+    // Handle modifier keys - set sticky state and return 0
+    if (keyCode == 35 || keyCode == 31) {  // Shift keys
+      _shiftActive = true;
+      _shiftHeld = true;
+      _shiftUsedWhileHeld = false;
+      _lastShiftTime = millis();
+      Serial.println("KB: Shift activated");
+      return 0;
+    }
+    if (keyCode == 30) {  // Alt key
+      _altActive = true;
+      Serial.println("KB: Alt activated");
+      return 0;
+    }
+    if (keyCode == 32) {  // Sym key (bottom row)
+      _symActive = true;
+      Serial.println("KB: Sym activated");
+      return 0;
+    }
+    
+    // Handle dedicated $ key (key code 22, next to M)
+    // Bare press = emoji picker, Sym+$ = literal '$'
+    if (keyCode == 22) {
+      if (_symActive) {
+        _symActive = false;
+        Serial.println("KB: Sym+$ -> '$'");
+        return '$';
+      }
+      Serial.println("KB: $ key -> emoji");
+      return KB_KEY_EMOJI;
+    }
+    
+    // Handle Mic key - always produces '0' (silk-screened on key)
+    // Sym+Mic also produces '0' (consumes sym so it doesn't leak)
+    if (keyCode == 34) {
+      _symActive = false;
+      Serial.println("KB: Mic -> '0'");
+      return '0';
+    }
+
+    // Get the character
+    char c = 0;
+    
+    // Alt+B -> backlight toggle (T-Deck Pro MAX only — working front-light on IO41)
+    if (_altActive && keyCode == 25) {  // keyCode 25 = B
+      _altActive = false;
+      Serial.println("KB: Alt+B -> backlight toggle");
+      return KB_KEY_BACKLIGHT;
+    }
+
+    if (_altActive) {
+      c = getAltChar(keyCode);
+      _altActive = false;  // Reset sticky alt
+      if (c != 0) {
+        Serial.printf("KB: Alt+key -> '%c'\n", c);
+        return c;
+      }
+    }
+    
+    if (_symActive) {
+      c = getSymChar(keyCode);
+      _symActive = false;  // Reset sticky sym
+      if (c != 0) {
+        Serial.printf("KB: Sym+key -> '%c'\n", c);
+        return c;
+      }
+    }
+    
+    c = getKeyChar(keyCode);
+    
+    if (c != 0 && _shiftActive) {
+      // Apply shift - uppercase letters
+      if (c >= 'a' && c <= 'z') {
+        c = c - 'a' + 'A';
+      }
+      // Track that shift was used while physically held
+      if (_shiftHeld) {
+        _shiftUsedWhileHeld = true;
+      }
+      // Only clear shift if it's one-shot (tap), not held down
+      if (!_shiftHeld) {
+        _shiftActive = false;
+      }
+      _shiftConsumed = true; // Record that shift was active for this key
+    } else {
+      _shiftConsumed = false;
+    }
+    
+    if (c != 0) {
+      Serial.printf("KB: code %d -> '%c' (0x%02X)\n", keyCode, c >= 32 ? c : '?', c);
+    } else {
+      Serial.printf("KB: code %d -> UNMAPPED\n", keyCode);
+    }
+    
+    return c;
+  }
+
+  bool isReady() const { return _initialized; }
+  
+  // Check if shift was pressed within the last N milliseconds
+  bool wasShiftRecentlyPressed(unsigned long withinMs = 500) const {
+    return (millis() - _lastShiftTime) < withinMs;
+  }
+  
+  // Check if shift was active when the most recent key was produced
+  // (immune to e-ink refresh timing unlike wasShiftRecentlyPressed)
+  bool wasShiftConsumed() const {
+    return _shiftConsumed;
+  }
+};
--- a/variants/lilygo_tdeck_pro_max/platformio.ini
+++ b/variants/lilygo_tdeck_pro_max/platformio.ini
@@ -0,0 +1,232 @@
+; =============================================================================
+; T-Deck Pro MAX V0.1 — Meck Build Environments
+;
+; Hardware: ESP32-S3 + XL9555 I/O expander + combined 4G (A7682E) + Audio (ES8311)
+;
+; Key differences from LilyGo_TDeck_Pro (V1.1):
+;   - Peripheral power controlled via XL9555 (not direct GPIO)
+;   - 4G modem and ES8311 audio coexist (no longer mutually exclusive)
+;   - ES8311 I2C codec replaces PCM5102A (different I2S pins, needs I2C config)
+;   - Several GPIO reassignments (see variant.h for full map)
+;   - 1500 mAh battery (was 1400)
+;   - Working e-ink front-light on IO41
+;
+; WHAT WORKS OUT OF THE BOX:
+;   LoRa mesh, keyboard, e-ink display, GPS, touchscreen, battery management,
+;   SD card, text reader, notes, contacts, channels, settings, discovery,
+;   last heard, repeater admin, web reader (WiFi builds), OTA update.
+;
+; NEEDS ADAPTATION (future work):
+;   - HAS_4G_MODEM: ModemManager uses direct GPIO for MODEM_POWER_EN/PWRKEY
+;     which are XL9555-routed on MAX. Needs board.modemPowerOn() etc.
+;   - MECK_AUDIO_VARIANT: ES8311 needs I2C codec init (PCM5102A didn't).
+;     I2S pins are different. AudiobookPlayerScreen needs ES8311 driver.
+;   - Combined 4G+audio: existing #ifdef guards treat them as mutually
+;     exclusive. Needs restructuring for coexistence.
+; =============================================================================
+
+; ---------------------------------------------------------------------------
+; Base environment for T-Deck Pro MAX
+; ---------------------------------------------------------------------------
+[LilyGo_TDeck_Pro_Max]
+extends = esp32_base
+extra_scripts = post:merge_firmware.py
+board = t-deck_pro_max
+board_build.flash_mode = qio
+board_build.f_flash = 80000000L
+board_build.arduino.memory_type = qio_qspi
+board_upload.flash_size = 16MB
+build_flags =
+  ${esp32_base.build_flags}
+  ${sensor_base.build_flags}
+  ; Include MAX variant first (for variant.h, target.h, TDeckProMaxBoard.h)
+  ; then V1.1 variant (for TDeckBoard.h, which TDeckProMaxBoard inherits from)
+  -I variants/LilyGo_TDeck_Pro_Max
+  -I variants/LilyGo_TDeck_Pro
+  ; Both defines needed: LilyGo_TDeck_Pro for existing UI code guards,
+  ; LilyGo_TDeck_Pro_Max for MAX-specific code paths
+  -D LilyGo_TDeck_Pro
+  -D LilyGo_TDeck_Pro_Max
+  -D HAS_XL9555=1
+  -D HAS_GPS=1
+  -D BOARD_HAS_PSRAM=1
+  -D CORE_DEBUG_LEVEL=1
+  -D FORMAT_SPIFFS_IF_FAILED=1
+  -D FORMAT_LITTLEFS_IF_FAILED=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+  -D SX126X_DIO2_AS_RF_SWITCH
+  -D SX126X_CURRENT_LIMIT=140
+  -D SX126X_RX_BOOSTED_GAIN=1
+  -D SX126X_DIO3_TCXO_VOLTAGE=2.4f
+  ; LoRa SPI pins (direct GPIO — unchanged from V1.1)
+  -D P_LORA_DIO_1=5
+  -D P_LORA_NSS=3
+  -D P_LORA_RESET=4
+  -D P_LORA_BUSY=6
+  -D P_LORA_SCLK=36
+  -D P_LORA_MISO=47
+  -D P_LORA_MOSI=33
+  ; P_LORA_EN deliberately NOT defined — LoRa power via XL9555 in board.begin()
+  ; GPS pins (direct GPIO — changed from V1.1!)
+  -D ENV_INCLUDE_GPS=1
+  -D ENV_SKIP_GPS_DETECT=1
+  -D PIN_GPS_RX=2
+  -D PIN_GPS_TX=16
+  -D GPS_BAUD_RATE=38400
+  ; Sensor exclusions (same as V1.1)
+  -D ENV_INCLUDE_AHTX0=0
+  -D ENV_INCLUDE_BME280=0
+  -D ENV_INCLUDE_BMP280=0
+  -D ENV_INCLUDE_SHTC3=0
+  -D ENV_INCLUDE_SHT4X=0
+  -D ENV_INCLUDE_LPS22HB=0
+  -D ENV_INCLUDE_INA3221=0
+  -D ENV_INCLUDE_INA219=0
+  -D ENV_INCLUDE_INA226=0
+  -D ENV_INCLUDE_INA260=0
+  -D ENV_INCLUDE_MLX90614=0
+  -D ENV_INCLUDE_VL53L0X=0
+  -D ENV_INCLUDE_BME680=0
+  -D ENV_INCLUDE_BMP085=0
+  ; E-ink display (pin changes from V1.1: RST=9, BL=41)
+  -D USE_EINK
+  -D DISPLAY_CLASS=GxEPDDisplay
+  -D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10
+  -D EINK_WIDTH=240
+  -D EINK_HEIGHT=320
+  -D EINK_CS=34
+  -D EINK_DC=35
+  -D EINK_RST=9
+  -D EINK_BUSY=37
+  -D EINK_SCLK=36
+  -D EINK_MOSI=33
+  -D EINK_BL=41
+  -D EINK_NOT_HIBERNATE=1
+  ; Battery (1500 mAh on MAX, was 1400 on V1.1)
+  -D HAS_BQ27220=1
+  -D AUTO_SHUTDOWN_MILLIVOLTS=2800
+  ; Display rendering parameters
+  -D EINK_LIMIT_FASTREFRESH=10
+  -D EINK_LIMIT_GHOSTING_PX=2000
+  -D DISPLAY_ROTATION=0
+  -D EINK_ROTATION=0
+  -D EINK_SCALE_X=1.875f
+  -D EINK_SCALE_Y=2.5f
+  -D EINK_X_OFFSET=0
+  -D EINK_Y_OFFSET=5
+  ; Legacy display pin aliases (for GxEPDDisplay.cpp)
+  -D PIN_DISPLAY_CS=34
+  -D PIN_DISPLAY_DC=35
+  -D PIN_DISPLAY_RST=9
+  -D PIN_DISPLAY_BUSY=37
+  -D PIN_DISPLAY_SCLK=36
+  -D PIN_DISPLAY_MISO=-1
+  -D PIN_DISPLAY_MOSI=33
+  -D PIN_DISPLAY_BL=41
+  -D PIN_USER_BTN=0
+  ; Touch (INT is direct GPIO; RST is XL9555, handled by board class)
+  -D HAS_TOUCHSCREEN=1
+  -D CST328_PIN_INT=12
+  -D CST328_PIN_RST=-1
+  -D ARDUINO_LOOP_STACK_SIZE=32768
+build_src_filter = ${esp32_base.build_src_filter}
+  ; Include TDeckBoard.cpp from V1.1 (parent class with BQ27220 code)
+  +<../variants/LilyGo_TDeck_Pro/TDeckBoard.cpp>
+  ; Include MAX variant (target.cpp + TDeckProMaxBoard.cpp)
+  +<../variants/LilyGo_TDeck_Pro_Max>
+  +<helpers/sensors/*.cpp>
+lib_deps =
+  ${esp32_base.lib_deps}
+  ${sensor_base.lib_deps}
+  zinggjm/GxEPD2@^1.5.9
+  adafruit/Adafruit GFX Library@^1.11.0
+  bitbank2/PNGdec@^1.0.1
+  WebServer
+  Update
+
+
+; ===========================================================================
+; Meck MAX builds — LoRa mesh works out of the box on all variants.
+; 4G modem and ES8311 audio need adaptation before they can be enabled.
+; ===========================================================================
+
+; MAX + BLE companion (standard BLE phone bridging)
+; Both 4G + audio hardware present but not yet enabled in firmware.
+; BLE_PIN_CODE limit: MAX_CONTACTS=500 (BLE protocol ceiling).
+[env:meck_max_ble]
+extends = LilyGo_TDeck_Pro_Max
+build_flags =
+  ${LilyGo_TDeck_Pro_Max.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=500
+  -D MAX_GROUP_CHANNELS=20
+  -D BLE_PIN_CODE=123456
+  -D OFFLINE_QUEUE_SIZE=256
+  -D MECK_WEB_READER=1
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.MAX"'
+build_src_filter = ${LilyGo_TDeck_Pro_Max.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/GxEPDDisplay.cpp>
+lib_deps =
+  ${LilyGo_TDeck_Pro_Max.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
+  bitbank2/JPEGDEC
+
+; MAX + WiFi companion (WiFi app bridging — no BLE, higher contact limit)
+; WiFi credentials loaded from SD card (/web/wifi.cfg).
+; Connect via MeshCore web app, meshcore.js, or Python CLI.
+[env:meck_max_wifi]
+extends = LilyGo_TDeck_Pro_Max
+build_flags =
+  ${LilyGo_TDeck_Pro_Max.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=1500
+  -D MAX_GROUP_CHANNELS=20
+  -D MECK_WIFI_COMPANION=1
+  -D TCP_PORT=5000
+  -D WIFI_DEBUG_LOGGING=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D MECK_WEB_READER=1
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.MAX.WiFi"'
+build_src_filter = ${LilyGo_TDeck_Pro_Max.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/GxEPDDisplay.cpp>
+lib_deps =
+  ${LilyGo_TDeck_Pro_Max.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  https://github.com/schreibfaul1/ESP32-audioI2S.git#2.0.6
+  bitbank2/JPEGDEC
+
+; MAX standalone (no BLE/WiFi — maximum battery life, LoRa mesh only)
+; Contacts in PSRAM (1500 capacity). OTA enabled (WiFi AP on demand).
+[env:meck_max_standalone]
+extends = LilyGo_TDeck_Pro_Max
+build_flags =
+  ${LilyGo_TDeck_Pro_Max.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=1500
+  -D MAX_GROUP_CHANNELS=20
+  -D OFFLINE_QUEUE_SIZE=1
+  -D MECK_OTA_UPDATE=1
+  -D FIRMWARE_VERSION='"Meck v1.3.MAX.SA"'
+build_src_filter = ${LilyGo_TDeck_Pro_Max.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+  +<helpers/ui/GxEPDDisplay.cpp>
+lib_deps =
+  ${LilyGo_TDeck_Pro_Max.lib_deps}
+  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tdeck_pro_max/target.cpp
+++ b/variants/lilygo_tdeck_pro_max/target.cpp
@@ -0,0 +1,91 @@
+#include <Arduino.h>
+#include "variant.h"
+#include "target.h"
+
+TDeckProMaxBoard board;
+
+#if defined(P_LORA_SCLK)
+  static SPIClass loraSpi(HSPI);
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, loraSpi);
+#else
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
+#endif
+
+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
+#if HAS_GPS
+  // Wrap Serial2 with a sentence counter so the UI can show NMEA throughput.
+  // MicroNMEALocationProvider reads through this wrapper transparently.
+  GPSStreamCounter gpsStream(Serial2);
+  MicroNMEALocationProvider gps(gpsStream, &rtc_clock);
+  EnvironmentSensorManager sensors(gps);
+#else
+  SensorManager sensors;
+#endif
+
+#ifdef DISPLAY_CLASS
+  DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
+#endif
+
+bool radio_init() {
+  MESH_DEBUG_PRINTLN("radio_init() - starting");
+  
+  // NOTE: board.begin() is called by main.cpp setup() before radio_init()
+  // I2C is already initialized there with correct pins
+  
+  fallback_clock.begin();
+  MESH_DEBUG_PRINTLN("radio_init() - fallback_clock started");
+  
+  // Wire already initialized in board.begin() - just use it for RTC
+  rtc_clock.begin(Wire);
+  MESH_DEBUG_PRINTLN("radio_init() - rtc_clock started");
+
+#if defined(P_LORA_SCLK)
+  MESH_DEBUG_PRINTLN("radio_init() - initializing LoRa SPI...");
+  loraSpi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI, P_LORA_NSS);
+  MESH_DEBUG_PRINTLN("radio_init() - SPI initialized, calling radio.std_init()...");
+  bool result = radio.std_init(&loraSpi);
+  MESH_DEBUG_PRINTLN("radio_init() - radio.std_init() returned: %s", result ? "SUCCESS" : "FAILED");
+  return result;
+#else
+  MESH_DEBUG_PRINTLN("radio_init() - calling radio.std_init() without custom SPI...");
+  bool result = radio.std_init();
+  return result;
+#endif
+}
+
+uint32_t radio_get_rng_seed() {
+  return radio.random(0x7FFFFFFF);
+}
+
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
+  radio.setFrequency(freq);
+  radio.setSpreadingFactor(sf);
+  radio.setBandwidth(bw);
+  radio.setCodingRate(cr);
+
+  // Longer preamble for low SF improves reliability — each symbol is shorter
+  // at low SF, so more symbols are needed for reliable detection.
+  // SF <= 8 gets 32 symbols (~65ms at SF7/62.5kHz); SF >= 9 keeps 16 (already ~131ms+).
+  // See: https://github.com/meshcore-dev/MeshCore/pull/1954
+  uint16_t preamble = (sf <= 8) ? 32 : 16;
+  radio.setPreambleLength(preamble);
+  MESH_DEBUG_PRINTLN("radio_set_params() - bw=%.1f sf=%u preamble=%u", bw, sf, preamble);
+}
+
+void radio_set_tx_power(uint8_t dbm) {
+  radio.setOutputPower(dbm);
+}
+
+mesh::LocalIdentity radio_new_identity() {
+  RadioNoiseListener rng(radio);
+  return mesh::LocalIdentity(&rng);
+}
+
+void radio_reset_agc() {
+  radio.setRxBoostedGainMode(true);
+}
--- a/variants/lilygo_tdeck_pro_max/target.h
+++ b/variants/lilygo_tdeck_pro_max/target.h
@@ -0,0 +1,47 @@
+#pragma once
+
+// Include variant.h first to ensure all board-specific defines are available
+#include "variant.h"
+
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/radiolib/RadioLibWrappers.h>
+#include <helpers/radiolib/CustomSX1262Wrapper.h>
+#include <TDeckProMaxBoard.h>
+#include <helpers/AutoDiscoverRTCClock.h>
+
+#ifdef DISPLAY_CLASS
+  #include <helpers/ui/GxEPDDisplay.h>
+  #include <helpers/ui/MomentaryButton.h>
+#endif
+
+#if HAS_GPS
+  #include "helpers/sensors/EnvironmentSensorManager.h"
+  #include "helpers/sensors/MicroNMEALocationProvider.h"
+  #include "GPSStreamCounter.h"
+#else
+  #include <helpers/SensorManager.h>
+#endif
+
+extern TDeckProMaxBoard board;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;
+
+#if HAS_GPS
+  extern GPSStreamCounter gpsStream;
+  extern EnvironmentSensorManager sensors;
+#else
+  extern SensorManager sensors;
+#endif
+
+#ifdef DISPLAY_CLASS
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+#endif
+
+bool radio_init();
+uint32_t radio_get_rng_seed();
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
+void radio_set_tx_power(uint8_t dbm);
+mesh::LocalIdentity radio_new_identity();
+void radio_reset_agc();
--- a/variants/lilygo_tdeck_pro_max/variant.h
+++ b/variants/lilygo_tdeck_pro_max/variant.h
@@ -0,0 +1,301 @@
+#pragma once
+
+// =============================================================================
+// LilyGo T-Deck Pro MAX V0.1 - Pin Definitions
+// Hardware revision: HD-V3-250911
+//
+// KEY DIFFERENCES FROM T-Deck Pro V1.1:
+//   - XL9555 I/O expander (0x20) controls peripheral power, resets, and switches
+//     (LoRa EN, GPS EN, modem power, touch RST, keyboard RST, antenna sel, etc.)
+//   - 4G (A7682E) and audio (ES8311) coexist on ONE board — no longer mutually exclusive
+//   - ES8311 I2C codec replaces PCM5102A (needs I2C config, different I2S pins)
+//   - E-ink RST moved: IO9 (was IO16)
+//   - E-ink BL moved: IO41 (was IO45, now has working front-light hardware!)
+//   - GPS UART moved: RX=IO2, TX=IO16 (was RX=IO44, TX=IO43)
+//   - GPS/LoRa power via XL9555 (was direct GPIO 39/46)
+//   - Touch RST via XL9555 IO07 (was GPIO 38)
+//   - Modem power/PWRKEY via XL9555 (was direct GPIO 41/40)
+//   - No PIN_PERF_POWERON (IO10 is now modem UART RX)
+//   - Battery: 1500 mAh (was 1400 mAh)
+//   - LoRa antenna switch (SKY13453) controlled by XL9555 IO04
+//   - Audio output mux (A7682E vs ES8311) controlled by XL9555 IO12
+//   - Speaker amplifier (NS4150B) enable via XL9555 IO06
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// E-Ink Display (GDEQ031T10 - 240x320)
+// E-ink SHARES the SPI bus with LoRa and SD card (SCK=36, MOSI=33, MISO=47)
+// They use different chip selects: E-ink CS=34, LoRa CS=3, SD CS=48
+// -----------------------------------------------------------------------------
+#define PIN_EINK_CS    34
+#define PIN_EINK_DC    35
+#define PIN_EINK_RES    9    // MAX: IO9 (was IO16 on V1.1)
+#define PIN_EINK_BUSY  37
+#define PIN_EINK_SCLK  36    // Shared with LoRa + SD
+#define PIN_EINK_MOSI  33    // Shared with LoRa + SD
+#define PIN_EINK_BL    41    // MAX: IO41 — working front-light! (was IO45 non-functional on V1.1)
+
+// Legacy aliases for MeshCore compatibility
+#define PIN_DISPLAY_CS    PIN_EINK_CS
+#define PIN_DISPLAY_DC    PIN_EINK_DC
+#define PIN_DISPLAY_RST   PIN_EINK_RES
+#define PIN_DISPLAY_BUSY  PIN_EINK_BUSY
+#define PIN_DISPLAY_SCLK  PIN_EINK_SCLK
+#define PIN_DISPLAY_MOSI  PIN_EINK_MOSI
+
+// Display dimensions - native resolution of GDEQ031T10
+#define LCD_HOR_SIZE 240
+#define LCD_VER_SIZE 320
+
+// E-ink model for GxEPD2
+#define EINK_DISPLAY_MODEL GxEPD2_310_GDEQ031T10
+
+// -----------------------------------------------------------------------------
+// SPI Bus - Shared by LoRa, SD Card, AND E-ink display
+// -----------------------------------------------------------------------------
+#define BOARD_SPI_SCLK 36
+#define BOARD_SPI_MISO 47
+#define BOARD_SPI_MOSI 33
+
+// -----------------------------------------------------------------------------
+// I2C Bus
+// -----------------------------------------------------------------------------
+#define I2C_SDA 13
+#define I2C_SCL 14
+
+// Aliases for ESP32Board base class compatibility
+#define PIN_BOARD_SDA I2C_SDA
+#define PIN_BOARD_SCL I2C_SCL
+
+// I2C Device Addresses
+#define I2C_ADDR_ES8311     0x18  // ES8311 audio codec (NEW on MAX)
+#define I2C_ADDR_TOUCH      0x1A  // CST328
+#define I2C_ADDR_XL9555     0x20  // XL9555 I/O expander (NEW on MAX)
+#define I2C_ADDR_GYROSCOPE  0x28  // BHI260AP
+#define I2C_ADDR_KEYBOARD   0x34  // TCA8418
+#define I2C_ADDR_BQ27220    0x55  // Fuel gauge
+#define I2C_ADDR_DRV2605    0x5A  // Motor driver (haptic)
+#define I2C_ADDR_BQ25896    0x6B  // Charger
+
+// -----------------------------------------------------------------------------
+// XL9555 I/O Expander — Pin Assignments
+//
+// The XL9555 replaces direct GPIO control of peripheral power enables,
+// resets, and switches. It must be initialised over I2C before LoRa, GPS,
+// modem, or touch can be used.
+//
+// Port 0: pins 0-7, registers 0x02 (output) / 0x06 (direction)
+// Port 1: pins 8-15, registers 0x03 (output) / 0x07 (direction)
+// Direction: 0 = output, 1 = input
+// -----------------------------------------------------------------------------
+#define HAS_XL9555 1
+
+// XL9555 I2C registers
+#define XL9555_REG_INPUT_0   0x00
+#define XL9555_REG_INPUT_1   0x01
+#define XL9555_REG_OUTPUT_0  0x02
+#define XL9555_REG_OUTPUT_1  0x03
+#define XL9555_REG_INVERT_0  0x04
+#define XL9555_REG_INVERT_1  0x05
+#define XL9555_REG_CONFIG_0  0x06   // 0=output, 1=input
+#define XL9555_REG_CONFIG_1  0x07
+
+// XL9555 pin assignments (0-7 = Port 0, 8-15 = Port 1)
+#define XL_PIN_6609_EN       0    // HIGH: Enable A7682E power supply (SGM6609 boost)
+#define XL_PIN_LORA_EN       1    // HIGH: Enable SX1262 power supply
+#define XL_PIN_GPS_EN        2    // HIGH: Enable GPS power supply
+#define XL_PIN_1V8_EN        3    // HIGH: Enable BHI260AP 1.8V power supply
+#define XL_PIN_LORA_SEL      4    // HIGH: internal antenna, LOW: external antenna (SKY13453)
+#define XL_PIN_MOTOR_EN      5    // HIGH: Enable DRV2605 power supply
+#define XL_PIN_AMPLIFIER     6    // HIGH: Enable NS4150B speaker power amplifier
+#define XL_PIN_TOUCH_RST     7    // LOW: Reset touch controller (active-low)
+#define XL_PIN_PWRKEY_EN     8    // HIGH: A7682E POWERKEY toggle
+#define XL_PIN_KEY_RST       9    // LOW: Reset keyboard (active-low)
+#define XL_PIN_AUDIO_SEL    10    // HIGH: A7682E audio out, LOW: ES8311 audio out
+// Pins 11-15 are reserved
+
+// Default XL9555 output state at boot (all power enables ON, resets de-asserted)
+// Bit layout: [P07..P00] = TOUCH_RST=1, AMP=0, MOTOR_EN=0, LORA_SEL=1, 1V8=1, GPS=1, LORA=1, 6609=0
+//             [P17..P10] = reserved=0, AUDIO_SEL=0, KEY_RST=1, PWRKEY=0
+//
+// Conservative boot defaults for Meck:
+//   - LoRa ON, GPS ON, 1.8V ON, internal antenna
+//   - Modem OFF (6609_EN LOW), PWRKEY LOW (toggled later if needed)
+//   - Motor OFF, Amplifier OFF (saves power, enabled on demand)
+//   - Touch RST HIGH (not resetting), Keyboard RST HIGH (not resetting)
+//   - Audio select LOW (ES8311 by default — Meck controls this when needed)
+#define XL9555_BOOT_PORT0  0b10011110  // 0x9E: T_RST=1, AMP=0, MOT=0, LSEL=1, 1V8=1, GPS=1, LORA=1, 6609=0
+#define XL9555_BOOT_PORT1  0b00000010  // 0x02: ..., ASEL=0, KRST=1, PKEY=0
+
+// -----------------------------------------------------------------------------
+// Touch Controller (CST328)
+// NOTE: Touch RST is via XL9555 pin 7, NOT a direct GPIO!
+// CST328_PIN_RST is defined as -1 to signal "not a direct GPIO".
+// The board class handles touch reset via XL9555 in begin().
+// -----------------------------------------------------------------------------
+#define HAS_TOUCHSCREEN 1
+#define CST328_PIN_INT 12
+#define CST328_PIN_RST -1     // MAX: Routed through XL9555 IO07 — handled by board class
+
+// -----------------------------------------------------------------------------
+// GPS
+// NOTE: GPS power enable is via XL9555 pin 2, NOT a direct GPIO!
+// PIN_GPS_EN is intentionally NOT defined — the board class handles it via XL9555.
+// -----------------------------------------------------------------------------
+#define HAS_GPS 1
+#define GPS_BAUDRATE 38400
+// #define PIN_GPS_EN — NOT a direct GPIO on MAX (XL9555 IO02)
+#define GPS_RX_PIN  2         // MAX: IO2 (was IO44 on V1.1) — ESP32 receives from GPS
+#define GPS_TX_PIN 16         // MAX: IO16 (was IO43 on V1.1) — ESP32 sends to GPS
+#define PIN_GPS_PPS  1
+
+// -----------------------------------------------------------------------------
+// Buttons & Controls
+// -----------------------------------------------------------------------------
+#define BUTTON_PIN 0
+#define PIN_USER_BTN 0
+
+// Vibration Motor — DRV2605 driver (same as V1.1)
+// Motor power enable is via XL9555 pin 5, not a direct GPIO.
+#define HAS_DRV2605 1
+
+// -----------------------------------------------------------------------------
+// SD Card
+// -----------------------------------------------------------------------------
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+#define SPI_MOSI 33
+#define SPI_SCK  36
+#define SPI_MISO 47
+#define SPI_CS   48
+#define SDCARD_CS SPI_CS
+
+// -----------------------------------------------------------------------------
+// Keyboard (TCA8418)
+// NOTE: Keyboard RST is via XL9555 pin 9 (active-low).
+// The board class handles keyboard reset via XL9555 in begin().
+// -----------------------------------------------------------------------------
+#define KB_BL_PIN 42
+#define BOARD_KEYBOARD_INT 15
+#define HAS_PHYSICAL_KEYBOARD 1
+
+// -----------------------------------------------------------------------------
+// Audio — ES8311 I2C Codec (NEW on MAX — replaces PCM5102A)
+//
+// ES8311 is an I2C-controlled audio codec (unlike PCM5102A which needed no config).
+// It requires I2C register setup for input source, gain, volume, etc.
+// Speaker/headphone output is shared with A7682E modem audio, selected via
+// XL9555 pin AUDIO_SEL: LOW = ES8311, HIGH = A7682E.
+// Power amplifier (NS4150B) for speaker enabled via XL9555 pin AMPLIFIER.
+//
+// I2S pin mapping for ES8311 (completely different from V1.1 PCM5102A!):
+//   MCLK  = IO38  (master clock — ES8311 needs this, PCM5102A didn't)
+//   SCLK  = IO39  (bit clock, aka BCLK)
+//   LRCK  = IO18  (word select, aka LRC/WS)
+//   DSDIN = IO17  (DAC serial data in — ESP32 sends audio TO codec)
+//   ASDOUT= IO40  (ADC serial data out — codec sends mic audio TO ESP32)
+// -----------------------------------------------------------------------------
+#define HAS_ES8311_AUDIO 1
+
+#define BOARD_ES8311_MCLK   38
+#define BOARD_ES8311_SCLK   39
+#define BOARD_ES8311_LRCK   18
+#define BOARD_ES8311_DSDIN  17    // ESP32 → ES8311 (speaker/headphone output)
+#define BOARD_ES8311_ASDOUT 40    // ES8311 → ESP32 (microphone input)
+
+// Compatibility aliases for ESP32-audioI2S library (setPinout expects BCLK, LRC, DOUT)
+#define BOARD_I2S_BCLK  BOARD_ES8311_SCLK    // IO39
+#define BOARD_I2S_LRC   BOARD_ES8311_LRCK    // IO18
+#define BOARD_I2S_DOUT  BOARD_ES8311_DSDIN   // IO17
+#define BOARD_I2S_MCLK  BOARD_ES8311_MCLK    // IO38 (ESP32-audioI2S may need setMCLK)
+
+// Microphone — ES8311 built-in ADC (replaces separate PDM mic on V1.1)
+// Mic data comes through I2S ASDOUT pin, not a separate PDM interface.
+#define BOARD_MIC_I2S_DIN BOARD_ES8311_ASDOUT // IO40
+
+// -----------------------------------------------------------------------------
+// Sensors
+// -----------------------------------------------------------------------------
+#define HAS_BHI260AP        // Gyroscope/IMU (1.8V power via XL9555 IO03)
+#define BOARD_GYRO_INT 21
+
+// -----------------------------------------------------------------------------
+// Power Management
+// -----------------------------------------------------------------------------
+#define HAS_BQ27220 1
+#define BQ27220_I2C_ADDR 0x55
+#define BQ27220_I2C_SDA I2C_SDA
+#define BQ27220_I2C_SCL I2C_SCL
+#define BQ27220_DESIGN_CAPACITY 1500    // MAX: 1500 mAh (was 1400 on V1.1)
+#define BQ27220_DESIGN_CAPACITY_MAH 1500 // Alias used by TDeckBoard.h
+
+#define HAS_PPM 1
+#define XPOWERS_CHIP_BQ25896
+
+// -----------------------------------------------------------------------------
+// LoRa Radio (SX1262)
+// NOTE: LoRa power enable is via XL9555 pin 1, NOT GPIO 46!
+// The board class enables LoRa power via XL9555 in begin().
+// P_LORA_EN is intentionally NOT defined here — handled by board class.
+// Antenna selection: XL9555 pin 4 (HIGH=internal, LOW=external via SKY13453).
+// -----------------------------------------------------------------------------
+#define USE_SX1262
+#define USE_SX1268
+
+// LORA_EN is NOT a direct GPIO on MAX — omit the define entirely.
+// If any code references P_LORA_EN, it must be guarded with #ifndef HAS_XL9555.
+// #define LORA_EN  — NOT DEFINED (was GPIO 46 on V1.1)
+
+#define LORA_SCK   36
+#define LORA_MISO  47
+#define LORA_MOSI  33   // Shared with e-ink and SD card
+#define LORA_CS    3
+#define LORA_RESET 4
+#define LORA_DIO0  -1   // Not connected on SX1262
+#define LORA_DIO1  5    // SX1262 IRQ
+#define LORA_DIO2  6    // SX1262 BUSY
+
+// SX126X driver aliases (Meshtastic compatibility)
+#define SX126X_CS    LORA_CS
+#define SX126X_DIO1  LORA_DIO1
+#define SX126X_BUSY  LORA_DIO2
+#define SX126X_RESET LORA_RESET
+
+// RadioLib/MeshCore compatibility aliases
+#define P_LORA_NSS    LORA_CS
+#define P_LORA_DIO_1  LORA_DIO1
+#define P_LORA_RESET  LORA_RESET
+#define P_LORA_BUSY   LORA_DIO2
+#define P_LORA_SCLK   LORA_SCK
+#define P_LORA_MISO   LORA_MISO
+#define P_LORA_MOSI   LORA_MOSI
+// P_LORA_EN is NOT defined — LoRa power is via XL9555, handled in board begin()
+
+// -----------------------------------------------------------------------------
+// 4G Modem — A7682E (ALWAYS PRESENT on MAX — no longer optional!)
+//
+// On V1.1, 4G and audio were mutually exclusive hardware configurations.
+// On MAX, both coexist. The XL9555 controls:
+//   - 6609_EN (XL pin 0): modem power supply (SGM6609 boost converter)
+//   - PWRKEY (XL pin 8): modem power key toggle
+// Audio output from modem vs ES8311 is selected by AUDIO_SEL (XL pin 10).
+//
+// MODEM_POWER_EN and MODEM_PWRKEY are NOT direct GPIOs — ModemManager
+// needs MAX-aware paths (see integration guide).
+// MODEM_RST does not exist on MAX (IO9 is now LCD_RST).
+// -----------------------------------------------------------------------------
+// Direct GPIO modem pins (still accessible as regular GPIO):
+#define MODEM_RI   7     // Ring indicator (interrupt input)
+#define MODEM_DTR  8     // Data terminal ready (output)
+#define MODEM_RX  10     // UART RX (ESP32 receives from modem)
+#define MODEM_TX  11     // UART TX (ESP32 sends to modem)
+
+// XL9555-routed modem pins — these are NOT direct GPIO!
+// MODEM_POWER_EN and MODEM_PWRKEY are intentionally NOT defined.
+// Existing code guarded by #ifdef MODEM_POWER_EN / #ifdef HAS_4G_MODEM will
+// be skipped. Use board.modemPowerOn()/modemPwrkeyPulse() instead.
+// MODEM_RST does not exist on MAX (IO9 is LCD_RST).
+
+// Compatibility: PIN_PERF_POWERON does not exist on MAX (IO10 is modem UART RX).
+// Defined as -1 so TDeckBoard.cpp compiles (parent class), but never used at runtime.
+#define PIN_PERF_POWERON -1
Author	SHA1	Message	Date
pelgraine	85fff12052	update	2026-03-26 17:05:58 +11:00
pelgraine	adbceea176	update	2026-03-26 17:03:05 +11:00
pelgraine	92e7bee86d	fix	2026-03-26 16:52:19 +11:00
pelgraine	f58abfe1c6	first test add	2026-03-26 16:41:00 +11:00
pelgraine	7ed5b122c4	Merge branch 'dev'	2026-03-26 15:35:55 +11:00
pelgraine	342cf4e745	tdpro large font pref option; various large font ui fixes; fix fcc recognition in t5s3 to match 1500	2026-03-26 15:34:09 +11:00
pelgraine	c52a190ace	update build date	2026-03-26 00:56:20 +11:00
pelgraine	a7bc7a4733	t5s3 only lightsleep mode	2026-03-25 20:17:42 +11:00
pelgraine	47a0d2cc95	Update README.md Made it really stupidly clear that this is vibecoded	2026-03-25 19:57:47 +11:00
pelgraine	5dda0b686e	Incorporate PR 2044 and 2141; tdpro alarm screen - needs 44khz mp3 for sounds	2026-03-25 19:57:35 +11:00
pelgraine	829dd3f3a6	Update README.md Made it really stupidly clear that this is vibecoded	2026-03-25 17:24:33 +11:00
pelgraine	60dcd6a89e	tdpro - remove hint after boot for non-first time flash	2026-03-25 07:25:48 +11:00
pelgraine	19efb52521	udpate readme	2026-03-23 15:16:57 +11:00
pelgraine	81ef3ea3c5	update hint text for nav hint for first-time flashers; fix spiffs failure for first-time flash boot	2026-03-23 14:59:31 +11:00
pelgraine	6f07b7a372	update readme to do	2026-03-23 13:36:54 +11:00
pelgraine	b0f74b101a	tdpro - update firmware build date; improve keyboard responsiveness after boot	2026-03-23 13:33:23 +11:00
pelgraine	06a064538e	fix lock screen bug cpupowermanager issue	2026-03-22 22:56:28 +11:00
pelgraine	166a433353	td pro - fix missing F discover prompt on home screen for standalone variants	2026-03-22 19:58:12 +11:00
pelgraine	735fefd203	update readme	2026-03-22 18:50:59 +11:00
pelgraine	ed5cda4f44	readme update for v1.3	2026-03-22 18:49:38 +11:00
pelgraine	b208af83f6	t5s3 ota	2026-03-22 16:11:37 +11:00
pelgraine	bad821ac4b	tdpro ota update firmware functionality implemented; roomserver ui sender name display fix and speed up delivery time	2026-03-22 13:16:25 +11:00
pelgraine	8839012153	firmware build date	2026-03-22 11:49:47 +11:00
pelgraine	0958ef079e	Fix T5S3 word wrap regression ereader; persist dark mode, portrait mode, baudrate, and auto lock timer in data store	2026-03-22 11:48:57 +11:00
pelgraine	0bf2826110	roomserver additions stage 2 and dm ui functionality updates	2026-03-22 10:51:59 +11:00
pelgraine	c2840a43aa	roomserver additions stage 1; dms ui functionality improvements; removed t-deck plus device variant	2026-03-21 21:27:20 +11:00
pelgraine	e8a8be521a	update firmware version and build date	2026-03-21 18:39:06 +11:00
pelgraine	a627fbe0e9	t5s3 - fix for del channel ui and touch function	2026-03-20 23:20:20 +11:00
pelgraine	17f8233402	fix readme typo in last heard	2026-03-20 21:36:08 +11:00
pelgraine	1c9e9079f0	Merge branch 'dev'	2026-03-20 21:31:03 +11:00
pelgraine	69dc62fa78	update readme and txt reader guides for Meck v1.2	2026-03-20 21:17:18 +11:00
pelgraine	f118a0949f	fix td pro platformio version whioops; tdpro reader screen ui fix - press enter to go to page	2026-03-20 20:52:39 +11:00
pelgraine	f78824cdc4	tdpro & t5s3 pro - lock screen power saving improvements; fix stupid stupid merged firmware - bug	2026-03-20 20:22:07 +11:00
pelgraine	f81de07830	t5s3 - improved cardkb notes rendering; fix notes generic filename save type	2026-03-20 08:05:23 +11:00
pelgraine	3ae988c0bb	t5s3 cardkb support; update firmware build date	2026-03-20 06:23:05 +11:00
pelgraine	5bed26cb72	mostly t5s3 and some tdpro fixes - chunked save infrastructure, chunked save implementation, non-blocking lazy save, favourite contacts edit double confirmation added, hibernate 4g modem properly	2026-03-20 05:27:20 +11:00
pelgraine	c28d22e6cc	Update README.md Add discord link	2026-03-20 03:41:43 +11:00
pelgraine	8e1f2a3a87	t5s3 - last heard touch fix; lock screen 15 min refresh fix; update firmware build date	2026-03-19 17:05:40 +11:00
pelgraine	6d1447a45c	fix accidental battery size commit from tdeckboard.h	2026-03-18 22:29:26 +11:00
pelgraine	77c92b3567	td pro: footer consistency text updates; improve key polling responsiveness; Add Last Heard screen, access by pressing h key; update mymesh firmware version and date	2026-03-18 22:22:11 +11:00
pelgraine	6db7b672ca	t5s3 - improvements for page navigation to text reader	2026-03-17 19:17:51 +11:00
pelgraine	046cce6f43	tdpro - bugfix for slow responsiveness occurring if key is pressed during toaster popup message	2026-03-17 18:55:10 +11:00
pelgraine	c2c2d8cf21	tdpro - reduce occurrences of slow key responsiveness on boot	2026-03-17 18:42:12 +11:00
pelgraine	148f8cea4f	tdpro lock screen stage 2 - auto lock settings preferences implemented	2026-03-17 17:42:10 +11:00
pelgraine	cd69ea546f	tdpro lock screen stage 1 - double click user/boot to lock/unlock screen	2026-03-17 16:56:55 +11:00
pelgraine	7780a0d76e	tdpro intial touch file selector implementation stage 1	2026-03-17 16:35:44 +11:00
pelgraine	33a3352692	tdpro - improved cpu usage for maps and increased key responsiveness after boot; updated firmware date and build	2026-03-17 15:46:42 +11:00
pelgraine	4004acf15d	tdpro darkmode regression bugfixes; update readme	2026-03-15 15:36:18 +11:00
pelgraine	0b9402b530	updated readme for v.1.1 changes	2026-03-15 14:50:24 +11:00
pelgraine	e55799f8a5	tdpro settings screen updates and ui changes; gps baudrate selector kept to settings screen only; firmware version and build date updated	2026-03-15 14:41:03 +11:00
pelgraine	0549efa627	tdpro v1.0 gps debug fix	2026-03-15 14:17:05 +11:00
pelgraine	a52cf166cb	update firmware build date	2026-03-14 20:14:38 +11:00
pelgraine	facffe9f07	t5s3 settings screen fix for add channels; t5s3 home screen new message screen refresh fix	2026-03-14 20:14:13 +11:00
pelgraine	148fb7f001	t5s3 minor ui settings screen channel delete fixes	2026-03-14 15:36:40 +11:00