Dayton Hamvention 2025 userPrefs

2025-12-15 23:32:34 +00:00 · 2025-05-11 13:13:10 -04:00
148 changed files with 1362 additions and 6026 deletions
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -143,7 +143,7 @@ jobs:
          merge-multiple: true

      - name: Test Report
-        uses: dorny/test-reporter@v2.1.0
+        uses: dorny/test-reporter@v2.0.0
        with:
          name: PlatformIO Tests
          path: testreport.xml
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,10 +5,7 @@ on:
    - cron: 0 0 * * * # Run every day at midnight
  workflow_dispatch: {}

-permissions:
-  contents: read
-  actions: read
-  checks: write
+permissions: read-all

 jobs:
  native-tests:
@@ -47,7 +44,7 @@ jobs:
      - name: Setup Node
        uses: actions/setup-node@v4
        with:
-          node-version: 22
+          node-version: 18

      - name: Setup pnpm
        uses: pnpm/action-setup@v4
--- a/.trunk/configs/.prettierignore
+++ b/.trunk/configs/.prettierignore
@@ -1 +0,0 @@
-renovate.json
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,24 +1,24 @@
 version: 0.1
 cli:
-  version: 1.24.0
+  version: 1.22.15
 plugins:
  sources:
    - id: trunk
-      ref: v1.7.0
+      ref: v1.6.8
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.435
-    - renovate@40.36.2
+    - renovate@40.0.6
    - prettier@3.5.3
-    - trufflehog@3.88.35
+    - trufflehog@3.88.28
    - yamllint@1.37.1
    - bandit@1.8.3
-    - trivy@0.63.0
+    - terrascan@1.19.9
+    - trivy@0.62.1
    - taplo@0.9.3
-    - ruff@0.11.12
+    - ruff@0.11.8
    - isort@6.0.1
-    - markdownlint@0.45.0
+    - markdownlint@0.44.0
    - oxipng@9.1.5
    - svgo@3.3.2
    - actionlint@1.7.7
@@ -28,7 +28,7 @@ lint:
    - shellcheck@0.10.0
    - black@25.1.0
    - git-diff-check
-    - gitleaks@8.26.0
+    - gitleaks@8.25.1
    - clang-format@16.0.3
  ignore:
    - linters: [ALL]
@@ -38,7 +38,7 @@ runtimes:
  enabled:
    - python@3.10.8
    - go@1.21.0
-    - node@22.16.0
+    - node@18.20.5
 actions:
  disabled:
    - trunk-announce
--- a/14
+++ b/14
@@ -1,3 +1,4 @@
+# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
 # trunk-ignore-all(trivy/DS002): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
@@ -37,13 +38,6 @@ RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/fir
 ##### PRODUCTION BUILD #############

 FROM debian:bookworm-slim
-LABEL org.opencontainers.image.title="Meshtastic" \
-      org.opencontainers.image.description="Debian Meshtastic daemon and web interface" \
-      org.opencontainers.image.url="https://meshtastic.org" \
-      org.opencontainers.image.documentation="https://meshtastic.org/docs/" \
-      org.opencontainers.image.authors="Meshtastic" \
-      org.opencontainers.image.licenses="GPL-3.0-or-later" \
-      org.opencontainers.image.source="https://github.com/meshtastic/firmware/"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC

@@ -60,7 +54,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
    && mkdir -p /etc/meshtasticd/ssl

 # Fetch compiled binary from the builder
-COPY --from=builder /tmp/firmware/release/meshtasticd /usr/bin/
+COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
 COPY --from=builder /tmp/web /usr/share/meshtasticd/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d
@@ -71,8 +65,8 @@ VOLUME /var/lib/meshtasticd
 # Expose Meshtastic TCP API port from the host
 EXPOSE 4403
 # Expose Meshtastic Web UI port from the host
-EXPOSE 9443
+EXPOSE 443

-CMD [ "sh", "-cx", "meshtasticd --fsdir=/var/lib/meshtasticd" ]
+CMD [ "sh", "-cx", "meshtasticd -d /var/lib/meshtasticd" ]

 HEALTHCHECK NONE
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -28,19 +28,12 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \
 # ##### PRODUCTION BUILD #############

 FROM alpine:3.21
-LABEL org.opencontainers.image.title="Meshtastic" \
-      org.opencontainers.image.description="Alpine Meshtastic daemon" \
-      org.opencontainers.image.url="https://meshtastic.org" \
-      org.opencontainers.image.documentation="https://meshtastic.org/docs/" \
-      org.opencontainers.image.authors="Meshtastic" \
-      org.opencontainers.image.licenses="GPL-3.0-or-later" \
-      org.opencontainers.image.source="https://github.com/meshtastic/firmware/"

 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root

 RUN apk --no-cache add \
-        shadow libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
+        libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
        libx11 libinput libxkbcommon \
    && rm -rf /var/cache/apk/* \
    && mkdir -p /var/lib/meshtasticd \
@@ -48,7 +41,7 @@ RUN apk --no-cache add \
    && mkdir -p /etc/meshtasticd/ssl

 # Fetch compiled binary from the builder
-COPY --from=builder /tmp/firmware/release/meshtasticd /usr/bin/
+COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d

--- a/bin/99-meshtasticd-udev.rules
+++ b/bin/99-meshtasticd-udev.rules
@@ -1,7 +0,0 @@
-# Set spidev ownership to 'spi' group
-SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="spi", MODE="0660"
-# Allow access to USB CH341 devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE="0666"
-# Set gpio ownership to 'gpio' group
-SUBSYSTEM=="*gpiomem*", GROUP="gpio", MODE="0660"
-SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -188,18 +188,11 @@ Logging:
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout

 Webserver:
-#  Port: 9443 # Port for Webserver & Webservices
+#  Port: 443 # Port for Webserver & Webservices
 #  RootPath: /usr/share/meshtasticd/web # Root Dir of WebServer
 #  SSLKey: /etc/meshtasticd/ssl/private_key.pem # Path to SSL Key, generated if not present
 #  SSLCert: /etc/meshtasticd/ssl/certificate.pem # Path to SSL Certificate, generated if not present

-
-HostMetrics:
-#  ReportInterval: 30 # Interval in minutes between HostMetrics report packets, or 0 for disabled
-#  Channel: 0 # channel to send Host Metrics over. Defaults to the primary channel.
-#  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
-
-
 General:
  MaxNodes: 200
  MaxMessageQueue: 100
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -43,16 +43,6 @@ S3_VARIANTS=(
 	"wireless-tracker"
 	"station-g2"
 	"unphone"
-	"t-eth-elite"
- 	"mesh-tab"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"seeed-sensecap-indicator"
-	"heltec_capsule_sensor_v3"
-	"vision-master"
-	"icarus"
-	"tracksenger"
-	"elecrow-adv"
 )

 # Determine the correct esptool command to use
--- a/bin/meshtasticd.service
+++ b/bin/meshtasticd.service
@@ -5,11 +5,10 @@ StartLimitInterval=200
 StartLimitBurst=5

 [Service]
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-User=meshtasticd
-Group=meshtasticd
+User=root
+Group=root
 Type=simple
-ExecStart=/usr/bin/meshtasticd
+ExecStart=/usr/sbin/meshtasticd
 Restart=always
 RestartSec=3

--- a/bin/native-install.sh
+++ b/bin/native-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-cp "release/meshtasticd_linux_$(uname -m)" /usr/bin/meshtasticd
+cp "release/meshtasticd_linux_$(uname -m)" /usr/sbin/meshtasticd
 mkdir -p /etc/meshtasticd
 if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
 	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -87,12 +87,6 @@
  </screenshots>

  <releases>
-    <release version="2.6.10" date="2025-05-25">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.10</url>
-    </release>
-    <release version="2.6.9" date="2025-05-15">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.9</url>
-    </release>
    <release version="2.6.8" date="2025-05-05">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.8</url>
    </release>
--- a/boards/Seeed_Solar_Node.json
+++ b/boards/Seeed_Solar_Node.json
@@ -10,7 +10,7 @@
    "hwids": [["0x2886", "0x0059"]],
    "usb_product": "XIAO-BOOT",
    "mcu": "nrf52840",
-    "variant": "seeed_solar_node",
+    "variant": "Seeed_Solar_Node",
    "bsp": {
      "name": "adafruit"
    },
@@ -31,7 +31,7 @@
    "openocd_target": "nrf52840-mdk-rs"
  },
  "frameworks": ["arduino"],
-  "name": "seeed_solar_node",
+  "name": "Seeed_Solar_Node",
  "upload": {
    "maximum_ram_size": 248832,
    "maximum_size": 815104,
--- a/boards/crowpanel.json
+++ b/boards/crowpanel.json
@@ -8,8 +8,8 @@
    "core": "esp32",
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=0",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=0"
    ],
--- a/boards/seeed_wio_tracker_L1.json
+++ b/boards/seeed_wio_tracker_L1.json
@@ -1,54 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v7.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [["0x2886", "0x1668"]],
-    "usb_product": "TRACKER L1",
-    "mcu": "nrf52840",
-    "variant": "seeed_wio_tracker_L1",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "7.3.0",
-      "sd_fwid": "0x0123"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "seeed_wio_tracker_L1",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink",
-      "cmsis-dap",
-      "blackmagic"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.seeedstudio.com/Wio-Tracker-L1-p-6477.html",
-  "vendor": "Seeed Studio"
-}
--- a/data/boot/logo.png
+++ b/data/boot/logo.png
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
+meshtasticd (2.6.8.0) UNRELEASED; urgency=medium

  [ Austin Lane ]
  * Initial packaging
@@ -10,10 +10,4 @@ meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
  [  ]
  * GitHub Actions Automatic version bump

-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
- --  <github-actions[bot]@users.noreply.github.com>  Sun, 25 May 2025 20:46:49 +0000
+ --  <github-actions[bot]@users.noreply.github.com>  Tue, 06 May 2025 01:32:49 +0000
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,7 @@ Rules-Requires-Root: no

 Package: meshtasticd
 Architecture: any
-Depends: adduser,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Meshtastic daemon for communicating with Meshtastic devices
 Meshtastic is an off-grid text communication platform that uses inexpensive 
- LoRa radios.
+ LoRa radios.
--- a/debian/meshtasticd.dirs
+++ b/debian/meshtasticd.dirs
@@ -1,6 +1,5 @@
-var/lib/meshtasticd
 etc/meshtasticd
 etc/meshtasticd/config.d
 etc/meshtasticd/available.d
 usr/share/meshtasticd/web
-etc/meshtasticd/ssl
+etc/meshtasticd/ssl
--- a/debian/meshtasticd.install
+++ b/debian/meshtasticd.install
@@ -1,8 +1,8 @@
-.pio/build/native-tft/meshtasticd  usr/bin
+.pio/build/native-tft/meshtasticd  usr/sbin

 bin/config.yaml                    etc/meshtasticd
 bin/config.d/*                     etc/meshtasticd/available.d

 bin/meshtasticd.service            lib/systemd/system

-web/*                              usr/share/meshtasticd/web
+web/*                              usr/share/meshtasticd/web
--- a/debian/meshtasticd.postinst
+++ b/debian/meshtasticd.postinst
@@ -1,80 +0,0 @@
-#!/bin/sh
-# postinst script for meshtasticd
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure|reconfigure)
-    # create spi, gpio groups (for udev rules)
-    # these groups already exist on Raspberry Pi OS
-        getent group spi >/dev/null 2>/dev/null || addgroup --system spi
-        getent group gpio >/dev/null 2>/dev/null || addgroup --system gpio
-    # create a meshtasticd group and user
-        getent passwd meshtasticd >/dev/null 2>/dev/null || adduser --system --home /var/lib/meshtasticd --no-create-home meshtasticd
-        getent group meshtasticd >/dev/null 2>/dev/null || addgroup --system meshtasticd
-        adduser meshtasticd meshtasticd >/dev/null 2>/dev/null
-        adduser meshtasticd spi >/dev/null 2>/dev/null
-        adduser meshtasticd gpio >/dev/null 2>/dev/null
-    # add meshtasticd user to appropriate groups (if they exist)
-        getent group plugdev >/dev/null 2>/dev/null && adduser meshtasticd plugdev >/dev/null 2>/dev/null
-        getent group dialout >/dev/null 2>/dev/null && adduser meshtasticd dialout >/dev/null 2>/dev/null
-        getent group i2c >/dev/null 2>/dev/null && adduser meshtasticd i2c >/dev/null 2>/dev/null
-        getent group video >/dev/null 2>/dev/null && adduser meshtasticd video >/dev/null 2>/dev/null
-        getent group audio >/dev/null 2>/dev/null && adduser meshtasticd audio >/dev/null 2>/dev/null
-        getent group input >/dev/null 2>/dev/null && adduser meshtasticd input >/dev/null 2>/dev/null
-
-
-    # migrate /root/.portduino to /var/lib/meshtasticd/.portduino
-    # should only run once, upon upgrade from < 2.6.9
-    if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.6.9; then
-        if [ -d /root/.portduino ] && [ ! -e /var/lib/meshtasticd/.portduino ]; then
-            cp -r /root/.portduino /var/lib/meshtasticd/.portduino
-            echo "Migrated meshtasticd VFS from /root/.portduino to /var/lib/meshtasticd/.portduino"
-            echo "meshtasticd now runs as the 'meshtasticd' user, not 'root'."
-            echo "See https://github.com/meshtastic/firmware/pull/6718 for details"
-        fi
-    fi
-
-    if [ -d /var/lib/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /var/lib/meshtasticd
-    fi
-
-    if [ -d /etc/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /etc/meshtasticd
-    fi
-
-    if [ -d /usr/share/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /usr/share/meshtasticd
-    fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- a/debian/meshtasticd.postrm
+++ b/debian/meshtasticd.postrm
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for meshtasticd
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-      # Only remove /var/lib/meshtasticd on purge
-      if [ "${1}" = "purge" ] ; then
-          rm -rf /var/lib/meshtasticd
-      fi
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- a/debian/meshtasticd.udev
+++ b/debian/meshtasticd.udev
@@ -1,7 +0,0 @@
-# Set spidev ownership to 'spi' group
-SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="spi", MODE="0660"
-# Allow access to USB CH341 devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE="0666"
-# Set gpio ownership to 'gpio' group
-SUBSYSTEM=="*gpiomem*", GROUP="gpio", MODE="0660"
-SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -10,8 +10,6 @@
 # - https://docs.pagure.org/rpkg-util/v3/index.html
 # - https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/

-%global  meshtasticd_user          meshtasticd   
-
 Name:           meshtasticd
 # Version Ex:   2.5.19
 Version:        {{{ meshtastic_version }}}
@@ -49,8 +47,6 @@ BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(xkbcommon-x11)

-Requires:      systemd-udev
-
 %description
 Meshtastic daemon for controlling Meshtastic devices. Meshtastic is an off-grid
 text communication platform that uses inexpensive LoRa radios.
@@ -67,25 +63,15 @@ gzip -dr web
 platformio run -e native-tft

 %install
-# Install meshtasticd binary
-mkdir -p %{buildroot}%{_bindir}
-install -m 0755 .pio/build/native-tft/program %{buildroot}%{_bindir}/meshtasticd
+mkdir -p %{buildroot}%{_sbindir}
+install -m 0755 .pio/build/native-tft/program %{buildroot}%{_sbindir}/meshtasticd

-# Install portduino VFS dir
-install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd
-
-# Install udev rules
-mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 0644 bin/99-meshtasticd-udev.rules %{buildroot}%{_udevrulesdir}/99-meshtasticd-udev.rules
-
-# Install config dirs
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd
 install -m 0644 bin/config-dist.yaml %{buildroot}%{_sysconfdir}/meshtasticd/config.yaml
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/config.d
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/available.d
 cp -r bin/config.d/* %{buildroot}%{_sysconfdir}/meshtasticd/available.d

-# Install systemd service
 install -D -m 0644 bin/meshtasticd.service %{buildroot}%{_unitdir}/meshtasticd.service

 # Install the web files under /usr/share/meshtasticd/web
@@ -94,54 +80,10 @@ cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web
 # Install default SSL storage directory (for web)
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl

-%pre
-# create spi group (for udev rules)
-getent group spi > /dev/null || groupadd -r spi
-# create a meshtasticd group and user
-getent group %{meshtasticd_user} > /dev/null || groupadd -r %{meshtasticd_user}
-getent passwd %{meshtasticd_user} > /dev/null || \
-    useradd -r -d %{_localstatedir}/lib/meshtasticd -g %{meshtasticd_user} -G spi \
-    -s /sbin/nologin -c "Meshtastic Daemon" %{meshtasticd_user}
-# add meshtasticd user to appropriate groups (if they exist)
-getent group gpio > /dev/null && usermod -a -G gpio %{meshtasticd_user} > /dev/null
-getent group plugdev > /dev/null && usermod -a -G plugdev %{meshtasticd_user} > /dev/null
-getent group dialout > /dev/null && usermod -a -G dialout %{meshtasticd_user} > /dev/null
-getent group i2c > /dev/null && usermod -a -G i2c %{meshtasticd_user} > /dev/null
-getent group video > /dev/null && usermod -a -G video %{meshtasticd_user} > /dev/null
-getent group audio > /dev/null && usermod -a -G audio %{meshtasticd_user} > /dev/null
-getent group input > /dev/null && usermod -a -G input %{meshtasticd_user} > /dev/null
-exit 0
-
-%triggerin -- meshtasticd < 2.6.9
-# migrate .portduino (if it exists and hasn’t already been copied)
-if [ -d /root/.portduino ] && [ ! -e /var/lib/meshtasticd/.portduino ]; then
-    mkdir -p /var/lib/meshtasticd
-    cp -r /root/.portduino /var/lib/meshtasticd/.portduino
-    chown -R %{meshtasticd_user}:%{meshtasticd_user} \
-        %{_localstatedir}/lib/meshtasticd || :
-    # Fix SELinux labels if present (no-op on non-SELinux systems)
-    restorecon -R /var/lib/meshtasticd/.portduino 2>/dev/null || :
-    echo "Migrated meshtasticd VFS from /root/.portduino to /var/lib/meshtasticd/.portduino"
-    echo "meshtasticd now runs as the 'meshtasticd' user, not 'root'."
-    echo "See https://github.com/meshtastic/firmware/pull/6718 for details"
-fi
-
-%post
-%systemd_post meshtasticd.service
-
-%preun
-%systemd_preun meshtasticd.service
-
-%postun
-%systemd_postun_with_restart meshtasticd.service
-
 %files
-%defattr(-,%{meshtasticd_user},%{meshtasticd_user})
 %license LICENSE
 %doc README.md
-%{_bindir}/meshtasticd
-%dir %{_localstatedir}/lib/meshtasticd
-%{_udevrulesdir}/99-meshtasticd-udev.rules
+%{_sbindir}/meshtasticd
 %dir %{_sysconfdir}/meshtasticd
 %dir %{_sysconfdir}/meshtasticd/config.d
 %dir %{_sysconfdir}/meshtasticd/available.d
@@ -154,4 +96,4 @@ fi
 %dir %{_sysconfdir}/meshtasticd/ssl

 %changelog
-%autochangelog
+%autochangelog
--- a/platformio.ini
+++ b/platformio.ini
@@ -108,7 +108,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/649e0953508ee4aabf1171519ee2eb69fb125647.zip
+	https://github.com/meshtastic/device-ui/archive/09b1780c8f944cffbc18a8ec5713cdfe03278503.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -132,7 +132,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
 	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
-	adafruit/Adafruit PM25 AQI Sensor@2.0.0
+	adafruit/Adafruit PM25 AQI Sensor@1.2.0
 	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
 	adafruit/Adafruit MPU6050@2.2.6
 	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
@@ -147,6 +147,8 @@ lib_deps =
 	emotibit/EmotiBit MLX90632@1.0.8
 	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
 	adafruit/Adafruit MLX90614 Library@2.1.5
+	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
+	boschsensortec/BME68x Sensor Library@1.2.40408
 	# renovate: datasource=github-tags depName=INA3221 packageName=KodinLanewave/INA3221
 	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
@@ -161,10 +163,6 @@ lib_deps =
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
 	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
 	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.2
-	# renovate: datasource=custom.pio depName=Adafruit LTR390 Library packageName=adafruit/library/Adafruit LTR390 Library
-	adafruit/Adafruit LTR390 Library@1.1.2
-	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
-	adafruit/Adafruit PCT2075@1.0.5
  
  ; (not included in native / portduino)
 [environmental_extra]
@@ -187,9 +185,7 @@ lib_deps =
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	ClosedCube OPT3001@1.1.2
-	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
-	boschsensortec/bsec2@1.10.2610
-	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
-	boschsensortec/BME68x Sensor Library@1.3.40408
+	# renovate: datasource=git-refs depName=Bosch BSEC2 packageName=https://github.com/meshtastic/Bosch-BSEC2-Library gitBranch=extra_script
+	https://github.com/meshtastic/Bosch-BSEC2-Library/archive/e16952dfe5addd4287e1eb8c4f6ecac0fa3dd3de.zip
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
--- a/2
+++ b/2
--- a/renovate.json
+++ b/renovate.json
@@ -9,21 +9,15 @@
    "workarounds:all"
  ],
  "forkProcessing": "enabled",
-  "ignoreDeps": [
-    "protobufs"
-  ],
+  "ignoreDeps": ["protobufs"],
  "git-submodules": {
    "enabled": true
  },
  "pip_requirements": {
-    "managerFilePatterns": [
-      "/bin/bump_metainfo/requirements.txt/"
-    ]
+    "fileMatch": ["bin/bump_metainfo/requirements.txt"]
  },
  "commitMessageTopic": "{{depName}}",
-  "labels": [
-    "dependencies"
-  ],
+  "labels": ["dependencies"],
  "customDatasources": {
    "pio": {
      "description": "PlatformIO Registry",
@@ -38,12 +32,8 @@
    {
      "customType": "regex",
      "description": "Match meshtastic/web version",
-      "managerFilePatterns": [
-        "/bin/web.version/"
-      ],
-      "matchStrings": [
-        "(?<currentValue>.+)$"
-      ],
+      "fileMatch": ["bin/web.version"],
+      "matchStrings": ["(?<currentValue>.+)$"],
      "datasourceTemplate": "github-releases",
      "depNameTemplate": "meshtastic/web",
      "versioningTemplate": "semver-coerced"
@@ -51,9 +41,7 @@
    {
      "customType": "regex",
      "description": "Match normal PIO dependencies",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
+      "fileMatch": [".*\\.ini$"],
      "matchStrings": [
        "# renovate: datasource=(?<datasource>.*?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?.+?@(?<currentValue>.+?)\\s"
      ],
@@ -62,11 +50,9 @@
    {
      "customType": "regex",
      "description": "Match PIO zipped dependencies with github tag ref",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
+      "fileMatch": [".*\\.ini$"],
      "matchStrings": [
-        "# renovate: datasource=github-tags(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?https://.+?archive/(?<currentValue>.+?).zip\\s"
+        "# renovate: datasource=github-tags(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?https:\/\/.+?archive\/(?<currentValue>.+?).zip\\s"
      ],
      "datasourceTemplate": "github-tags",
      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
@@ -74,11 +60,9 @@
    {
      "customType": "regex",
      "description": "Match PIO zipped dependencies with git commit ref",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
+      "fileMatch": [".*\\.ini$"],
      "matchStrings": [
-        "# renovate: datasource=git-refs(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\sgitBranch=(?<gitBranch>.+?)\\s+?https://.+?archive/(?<currentDigest>.+?).zip\\s"
+        "# renovate: datasource=git-refs(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\sgitBranch=(?<gitBranch>.+?)\\s+?https:\/\/.+?archive\/(?<currentDigest>.+?).zip\\s"
      ],
      "datasourceTemplate": "git-refs",
      "currentValueTemplate": "{{{gitBranch}}}",
@@ -87,12 +71,8 @@
  ],
  "packageRules": [
    {
-      "matchDepNames": [
-        "meshtastic/device-ui"
-      ],
-      "reviewers": [
-        "mverch67"
-      ],
+      "matchDepNames": ["meshtastic/device-ui"],
+      "reviewers": ["mverch67"],
      "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
    }
  ]
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -300,23 +300,14 @@ int32_t ButtonThread::runOnce()
 #ifdef BUTTON_PIN_TOUCH
        case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
            LOG_BUTTON("Touch press!");
-            // Ignore if: no screen
-            if (!screen)
-                break;
+            if (screen) {
+                // Wake if asleep
+                if (powerFSM.getState() == &stateDARK)
+                    powerFSM.trigger(EVENT_PRESS);

-#ifdef TTGO_T_ECHO
-            // Ignore if: TX in progress
-            // Uncommon T-Echo hardware bug, LoRa TX triggers touch button
-            if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending())
-                break;
-#endif
-
-            // Wake if asleep
-            if (powerFSM.getState() == &stateDARK)
-                powerFSM.trigger(EVENT_PRESS);
-
-            // Update display (legacy behaviour)
-            screen->forceDisplay();
+                // Update display (legacy behaviour)
+                screen->forceDisplay();
+            }
            break;
        }
 #endif // BUTTON_PIN_TOUCH
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -80,10 +80,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Override user saved region, for producing region-locked builds
 // #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_SG_923

-// Total system gain in dBm to subtract from Tx power to remain within regulatory and Tx PA limits
-// This value should be set in variant.h and is PA gain + antenna gain (if variant has a non-removable antenna)
-#ifndef TX_GAIN_LORA
-#define TX_GAIN_LORA 0
+// Total system gain in dBm to subtract from Tx power to remain within regulatory ERP limit for non-licensed operators
+// This value should be set in variant.h and is PA gain + antenna gain (if system ships with an antenna)
+#ifndef REGULATORY_GAIN_LORA
+#define REGULATORY_GAIN_LORA 0
 #endif

 // -----------------------------------------------------------------------------
@@ -99,12 +99,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // OLED & Input
 // -----------------------------------------------------------------------------
-#if defined(SEEED_WIO_TRACKER_L1)
-#define SSD1306_ADDRESS 0x3D
-#define USE_SH1106
-#else
+
 #define SSD1306_ADDRESS 0x3C
-#endif
 #define ST7567_ADDRESS 0x3F

 // The SH1106 controller is almost, but not quite, the same as SSD1306
@@ -157,7 +153,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
 #define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
-#define PCT2075_ADDR 0x37

 // -----------------------------------------------------------------------------
 // ACCELEROMETER
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -71,7 +71,6 @@ class ScanI2C
        DPS310,
        LTR390UV,
        TCA8418KB,
-        PCT2075,
    } DeviceType;

    // typedef uint8_t DeviceAddress;
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -434,7 +434,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048", (uint8_t)addr.address);
                SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address);
                SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
 #ifdef HAS_TPS65233
                SCAN_SIMPLE_CASE(TPS65233_ADDR, TPS65233, "TPS65233", (uint8_t)addr.address);
 #endif
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -1250,10 +1250,11 @@ GnssModel_t GPS::probe(int serialSpeed)
    // Close all NMEA sentences, valid for MTK3333 and MTK3339 platforms
    _serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
    delay(20);
-    std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B}, {"PA1010D", "1010D", GNSS_MODEL_MTK_PA1010D},
-                                 {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},  {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B},
-                                 {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B},   {"L80-R", "_3337_", GNSS_MODEL_MTK_L76B},
-                                 {"L80", "_3339_", GNSS_MODEL_MTK_L76B}};
+    std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B},
+                                 {"PA1010D", "1010D", GNSS_MODEL_MTK_PA1010D},
+                                 {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},
+                                 {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B},
+                                 {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B}};

    PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500);

--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1612,9 +1612,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #ifdef T_WATCH_S3
            PMU->enablePowerOutput(XPOWERS_ALDO2);
 #endif
-#ifdef HELTEC_TRACKER_V1_X
-            uint8_t tft_vext_enabled = digitalRead(VEXT_ENABLE);
-#endif
 #if !ARCH_PORTDUINO
            dispdev->displayOn();
 #endif
@@ -1625,12 +1622,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #endif

            dispdev->displayOn();
-#ifdef HELTEC_TRACKER_V1_X
-            // If the TFT VEXT power is not enabled, initialize the UI.
-            if (!tft_vext_enabled) {
-                ui->init();
-            }
-#endif
 #ifdef USE_ST7789
            pinMode(VTFT_CTRL, OUTPUT);
            digitalWrite(VTFT_CTRL, LOW);
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -65,8 +65,8 @@
 #endif

 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS)) &&                                  \
-    !defined(DISPLAY_FORCE_SMALL_FONTS)
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) ||                                                         \
+    defined(ILI9488_CS) && !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
 #define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 28
--- a/src/graphics/niche/Drivers/EInk/GDEY0213B74.cpp
+++ b/src/graphics/niche/Drivers/EInk/GDEY0213B74.cpp
@@ -1,61 +0,0 @@
-#include "./GDEY0213B74.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-using namespace NicheGraphics::Drivers;
-
-// Map the display controller IC's output to the connected panel
-void GDEY0213B74::configScanning()
-{
-    // "Driver output control"
-    sendCommand(0x01);
-    sendData(0xF9);
-    sendData(0x00);
-    sendData(0x00);
-
-    // To-do: delete this method?
-    // Values set here might be redundant: F9, 00, 00 seems to be default
-}
-
-// Specify which information is used to control the sequence of voltages applied to move the pixels
-// - For this display, configUpdateSequence() specifies that a suitable LUT will be loaded from
-//   the controller IC's OTP memory, when the update procedure begins.
-void GDEY0213B74::configWaveform()
-{
-    sendCommand(0x3C); // Border waveform:
-    sendData(0x05);    // Screen border should follow LUT1 waveform (actively drive pixels white)
-
-    sendCommand(0x18); // Temperature sensor:
-    sendData(0x80);    // Use internal temperature sensor to select an appropriate refresh waveform
-}
-
-void GDEY0213B74::configUpdateSequence()
-{
-    switch (updateType) {
-    case FAST:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xFF);    // Will load LUT from OTP memory, Display mode 2 "differential refresh"
-        break;
-
-    case FULL:
-    default:
-        sendCommand(0x22); // Set "update sequence"
-        sendData(0xF7);    // Will load LUT from OTP memory
-        break;
-    }
-}
-
-// Once the refresh operation has been started,
-// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
-// Only used when refresh is "async"
-void GDEY0213B74::detachFromUpdate()
-{
-    switch (updateType) {
-    case FAST:
-        return beginPolling(50, 500); // At least 500ms for fast refresh
-    case FULL:
-    default:
-        return beginPolling(100, 2000); // At least 2 seconds for full refresh
-    }
-}
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
--- a/src/graphics/niche/Drivers/EInk/GDEY0213B74.h
+++ b/src/graphics/niche/Drivers/EInk/GDEY0213B74.h
@@ -1,42 +0,0 @@
-/*
-
-E-Ink display driver
-    - GDEY0213B74
-    - Manufacturer: Goodisplay
-    - Size: 2.13 inch
-    - Resolution: 250px x 122px
-    - Flex connector marking: FPC-A002
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./SSD16XX.h"
-
-namespace NicheGraphics::Drivers
-{
-class GDEY0213B74 : public SSD16XX
-{
-    // Display properties
-  private:
-    static constexpr uint32_t width = 122;
-    static constexpr uint32_t height = 250;
-    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
-
-  public:
-    GDEY0213B74() : SSD16XX(width, height, supported) {}
-
-  protected:
-    virtual void configScanning() override;
-    virtual void configWaveform() override;
-    virtual void configUpdateSequence() override;
-    void detachFromUpdate() override;
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
--- a/src/graphics/niche/Fonts/FreeSans6pt7b.h
+++ b/src/graphics/niche/Fonts/FreeSans6pt7b.h
@@ -1,198 +1,129 @@
 #pragma once
-const uint8_t FreeSans6pt7bBitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    /* '!' 0x21 */ 0xFE, 0x80,
-    /* '"' 0x22 */ 0xB6, 0x80,
-    /* '#' 0x23 */ 0x24, 0x49, 0xF9, 0x42, 0x9F, 0x92, 0x28,
-    /* '$' 0x24 */ 0x23, 0xAB, 0x5A, 0x38, 0xB5, 0xAB, 0x88,
-    /* '%' 0x25 */ 0x71, 0x22, 0x88, 0xA2, 0x30, 0x74, 0x02, 0x60, 0xA4, 0x49, 0x11, 0x80,
-    /* '&' 0x26 */ 0x31, 0x24, 0x8C, 0x72, 0x58, 0xA3, 0x74,
-    /* ''' 0x27 */ 0xE0,
-    /* '(' 0x28 */ 0x5A, 0xAA, 0x94,
-    /* ')' 0x29 */ 0x89, 0x12, 0x49, 0x49, 0x00,
-    /* '*' 0x2A */ 0x5E, 0x80,
-    /* '+' 0x2B */ 0x21, 0x3E, 0x42, 0x00,
-    /* ',' 0x2C */ 0xE0,
-    /* '-' 0x2D */ 0xE0,
-    /* '.' 0x2E */ 0x80,
-    /* '/' 0x2F */ 0x25, 0x24, 0xA4, 0x80,
-    /* '0' 0x30 */ 0x76, 0xE3, 0x18, 0xC6, 0x3B, 0x70,
-    /* '1' 0x31 */ 0x5D, 0x55, 0x40,
-    /* '2' 0x32 */ 0x74, 0x42, 0x11, 0x11, 0x10, 0xF8,
-    /* '3' 0x33 */ 0x74, 0x42, 0x13, 0x04, 0x31, 0x70,
-    /* '4' 0x34 */ 0x11, 0x8C, 0xA9, 0x4B, 0xE2, 0x10,
-    /* '5' 0x35 */ 0x7D, 0x04, 0x1E, 0x4C, 0x10, 0x63, 0x78,
-    /* '6' 0x36 */ 0x72, 0x61, 0xE8, 0xC6, 0x39, 0x70,
-    /* '7' 0x37 */ 0xF8, 0x44, 0x22, 0x11, 0x08, 0x40,
-    /* '8' 0x38 */ 0x7A, 0x18, 0x61, 0x7A, 0x18, 0x61, 0x78,
-    /* '9' 0x39 */ 0x7B, 0x28, 0x61, 0xCD, 0xD0, 0x62, 0x70,
-    /* ':' 0x3A */ 0x82,
-    /* ';' 0x3B */ 0x87,
-    /* '<' 0x3C */ 0x3E, 0x30, 0x60, 0x80,
-    /* '=' 0x3D */ 0xF8, 0x3E,
-    /* '>' 0x3E */ 0xE0, 0xC6, 0xC8, 0x00,
-    /* '?' 0x3F */ 0x74, 0x42, 0x11, 0x10, 0x80, 0x20,
-    /* '@' 0x40 */ 0x0F, 0x06, 0x19, 0x3B, 0xC4, 0x99, 0x13, 0x22, 0x64, 0x96, 0x6E, 0x40, 0x04, 0x00, 0x7C, 0x00,
-    /* 'A' 0x41 */ 0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,
-    /* 'B' 0x42 */ 0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xF8,
-    /* 'C' 0x43 */ 0x3E, 0x41, 0x80, 0x80, 0x80, 0x80, 0x81, 0x43, 0x3E,
-    /* 'D' 0x44 */ 0xF9, 0x0A, 0x0C, 0x18, 0x30, 0x60, 0xC2, 0xF8,
-    /* 'E' 0x45 */ 0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0xFC,
-    /* 'F' 0x46 */ 0xFC, 0x21, 0x0F, 0xC2, 0x10, 0x80,
-    /* 'G' 0x47 */ 0x3E, 0x41, 0x80, 0x80, 0x87, 0x81, 0xC1, 0x43, 0x3D,
-    /* 'H' 0x48 */ 0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82,
-    /* 'I' 0x49 */ 0xFF, 0x80,
-    /* 'J' 0x4A */ 0x08, 0x42, 0x10, 0x86, 0x31, 0x70,
-    /* 'K' 0x4B */ 0x86, 0x29, 0x28, 0xD2, 0x48, 0xA1, 0x84,
-    /* 'L' 0x4C */ 0x84, 0x21, 0x08, 0x42, 0x10, 0xF8,
-    /* 'M' 0x4D */ 0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99,
-    /* 'N' 0x4E */ 0xC3, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86,
-    /* 'O' 0x4F */ 0x3E, 0x31, 0xB0, 0x70, 0x18, 0x0C, 0x07, 0x06, 0xC6, 0x3E, 0x00,
-    /* 'P' 0x50 */ 0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80,
-    /* 'Q' 0x51 */ 0x3E, 0x31, 0xB0, 0x70, 0x18, 0x0C, 0x07, 0x06, 0xC6, 0x3F, 0x00, 0x40,
-    /* 'R' 0x52 */ 0xF9, 0x0A, 0x14, 0x2F, 0x90, 0xA1, 0x42, 0x86,
-    /* 'S' 0x53 */ 0x7A, 0x18, 0x30, 0x78, 0x38, 0x71, 0x78,
-    /* 'T' 0x54 */ 0xFC, 0x41, 0x04, 0x10, 0x41, 0x04, 0x10,
-    /* 'U' 0x55 */ 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE3, 0x7C,
-    /* 'V' 0x56 */ 0xC2, 0x85, 0x0B, 0x22, 0x44, 0x8E, 0x0C, 0x18,
-    /* 'W' 0x57 */ 0x84, 0x38, 0xCD, 0x29, 0x25, 0x24, 0xA4, 0xD2, 0x8C, 0x61, 0x8C, 0x31, 0x80,
-    /* 'X' 0x58 */ 0x87, 0x34, 0x8C, 0x30, 0xC4, 0xA3, 0x84,
-    /* 'Y' 0x59 */ 0x82, 0x89, 0x11, 0x43, 0x82, 0x04, 0x08, 0x10,
-    /* 'Z' 0x5A */ 0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE,
-    /* '[' 0x5B */ 0xEA, 0xAA, 0xAB,
-    /* '\' 0x5C */ 0x92, 0x24, 0x91, 0x20,
-    /* ']' 0x5D */ 0xD5, 0x55, 0x57,
-    /* '^' 0x5E */ 0x46, 0xA9, 0x10,
-    /* '_' 0x5F */ 0xFE,
-    /* '`' 0x60 */ 0x80,
-    /* 'a' 0x61 */ 0x79, 0x08, 0x11, 0xEC, 0x51, 0x9D, 0x80,
-    /* 'b' 0x62 */ 0x84, 0x3D, 0xB8, 0xC6, 0x3B, 0xF0,
-    /* 'c' 0x63 */ 0x7B, 0x18, 0x20, 0x83, 0x17, 0x80,
-    /* 'd' 0x64 */ 0x04, 0x17, 0xF3, 0x86, 0x18, 0x73, 0x74,
-    /* 'e' 0x65 */ 0x7B, 0x38, 0x7F, 0x83, 0x17, 0x80,
-    /* 'f' 0x66 */ 0x6B, 0xA4, 0x92, 0x40,
-    /* 'g' 0x67 */ 0x77, 0x38, 0x61, 0x87, 0x37, 0x41, 0x8D, 0xE0,
-    /* 'h' 0x68 */ 0x84, 0x2D, 0x98, 0xC6, 0x31, 0x88,
-    /* 'i' 0x69 */ 0xBF, 0x80,
-    /* 'j' 0x6A */ 0x45, 0x55, 0x57,
-    /* 'k' 0x6B */ 0x84, 0x25, 0x6E, 0x72, 0x52, 0x88,
-    /* 'l' 0x6C */ 0xFF, 0x80,
-    /* 'm' 0x6D */ 0xFF, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91,
-    /* 'n' 0x6E */ 0xB6, 0x63, 0x18, 0xC6, 0x20,
-    /* 'o' 0x6F */ 0x7B, 0x38, 0x61, 0x87, 0x37, 0x80,
-    /* 'p' 0x70 */ 0xF6, 0xE3, 0x18, 0xEF, 0xD0, 0x80,
-    /* 'q' 0x71 */ 0x77, 0x38, 0x61, 0x87, 0x37, 0x41, 0x04,
-    /* 'r' 0x72 */ 0xBA, 0x49, 0x20,
-    /* 's' 0x73 */ 0x69, 0x8E, 0x19, 0x60,
-    /* 't' 0x74 */ 0x5D, 0x24, 0x93,
-    /* 'u' 0x75 */ 0x8C, 0x63, 0x18, 0xCD, 0xA0,
-    /* 'v' 0x76 */ 0x85, 0x24, 0x92, 0x30, 0xC3, 0x00,
-    /* 'w' 0x77 */ 0x89, 0x99, 0x59, 0x55, 0x56, 0x66, 0x26,
-    /* 'x' 0x78 */ 0x4A, 0x4C, 0x43, 0x27, 0x20,
-    /* 'y' 0x79 */ 0x85, 0x24, 0x92, 0x30, 0xC3, 0x08, 0x21, 0x80,
-    /* 'z' 0x7A */ 0x78, 0x44, 0x46, 0x23, 0xE0,
-    /* '{' 0x7B */ 0x69, 0x25, 0xB2, 0x49, 0x30,
-    /* '|' 0x7C */ 0xFF, 0xE0,
-    /* '}' 0x7D */ 0xC9, 0x24, 0xDA, 0x49, 0x60,
-    /* '~' 0x7E */ 0x66, 0x70,
-};

-const GFXglyph FreeSans6pt7bGlyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 3, 0, 0},
-    /* '!' 0x21 */ {0, 1, 9, 4, 2, -8},
-    /* '"' 0x22 */ {2, 3, 3, 4, 0, -8},
-    /* '#' 0x23 */ {4, 7, 8, 7, 0, -7},
-    /* '$' 0x24 */ {11, 5, 11, 7, 1, -9},
-    /* '%' 0x25 */ {18, 10, 9, 11, 0, -8},
-    /* '&' 0x26 */ {30, 6, 9, 8, 1, -8},
-    /* ''' 0x27 */ {37, 1, 3, 2, 1, -8},
-    /* '(' 0x28 */ {38, 2, 11, 4, 1, -8},
-    /* ')' 0x29 */ {41, 3, 11, 4, 0, -8},
-    /* '*' 0x2A */ {46, 3, 3, 5, 1, -8},
-    /* '+' 0x2B */ {48, 5, 5, 7, 1, -4},
-    /* ',' 0x2C */ {52, 1, 3, 3, 1, 0},
-    /* '-' 0x2D */ {53, 3, 1, 4, 1, -3},
-    /* '.' 0x2E */ {54, 1, 1, 3, 1, 0},
-    /* '/' 0x2F */ {55, 3, 9, 3, 0, -8},
-    /* '0' 0x30 */ {59, 5, 9, 7, 1, -8},
-    /* '1' 0x31 */ {65, 2, 9, 7, 2, -8},
-    /* '2' 0x32 */ {68, 5, 9, 7, 1, -8},
-    /* '3' 0x33 */ {74, 5, 9, 7, 1, -8},
-    /* '4' 0x34 */ {80, 5, 9, 7, 1, -8},
-    /* '5' 0x35 */ {86, 6, 9, 7, 0, -8},
-    /* '6' 0x36 */ {93, 5, 9, 7, 1, -8},
-    /* '7' 0x37 */ {99, 5, 9, 7, 1, -8},
-    /* '8' 0x38 */ {105, 6, 9, 7, 0, -8},
-    /* '9' 0x39 */ {112, 6, 9, 7, 0, -8},
-    /* ':' 0x3A */ {119, 1, 7, 3, 1, -6},
-    /* ';' 0x3B */ {120, 1, 8, 3, 1, -5},
-    /* '<' 0x3C */ {121, 5, 5, 7, 1, -4},
-    /* '=' 0x3D */ {125, 5, 3, 7, 1, -3},
-    /* '>' 0x3E */ {127, 5, 5, 7, 1, -4},
-    /* '?' 0x3F */ {131, 5, 9, 7, 1, -8},
-    /* '@' 0x40 */ {137, 11, 11, 12, 0, -8},
-    /* 'A' 0x41 */ {153, 8, 9, 8, 0, -8},
-    /* 'B' 0x42 */ {162, 6, 9, 8, 1, -8},
-    /* 'C' 0x43 */ {169, 8, 9, 9, 0, -8},
-    /* 'D' 0x44 */ {178, 7, 9, 8, 1, -8},
-    /* 'E' 0x45 */ {186, 6, 9, 8, 1, -8},
-    /* 'F' 0x46 */ {193, 5, 9, 7, 1, -8},
-    /* 'G' 0x47 */ {199, 8, 9, 9, 0, -8},
-    /* 'H' 0x48 */ {208, 7, 9, 9, 1, -8},
-    /* 'I' 0x49 */ {216, 1, 9, 3, 1, -8},
-    /* 'J' 0x4A */ {218, 5, 9, 6, 0, -8},
-    /* 'K' 0x4B */ {224, 6, 9, 8, 1, -8},
-    /* 'L' 0x4C */ {231, 5, 9, 7, 1, -8},
-    /* 'M' 0x4D */ {237, 8, 9, 10, 1, -8},
-    /* 'N' 0x4E */ {246, 7, 9, 9, 1, -8},
-    /* 'O' 0x4F */ {254, 9, 9, 9, 0, -8},
-    /* 'P' 0x50 */ {265, 6, 9, 8, 1, -8},
-    /* 'Q' 0x51 */ {272, 9, 10, 9, 0, -8},
-    /* 'R' 0x52 */ {284, 7, 9, 9, 1, -8},
-    /* 'S' 0x53 */ {292, 6, 9, 8, 1, -8},
-    /* 'T' 0x54 */ {299, 6, 9, 8, 0, -8},
-    /* 'U' 0x55 */ {306, 7, 9, 9, 1, -8},
-    /* 'V' 0x56 */ {314, 7, 9, 8, 0, -8},
-    /* 'W' 0x57 */ {322, 11, 9, 11, 0, -8},
-    /* 'X' 0x58 */ {335, 6, 9, 8, 1, -8},
-    /* 'Y' 0x59 */ {342, 7, 9, 8, 1, -8},
-    /* 'Z' 0x5A */ {350, 7, 9, 7, 0, -8},
-    /* '[' 0x5B */ {358, 2, 12, 3, 1, -8},
-    /* '\' 0x5C */ {361, 3, 9, 3, 0, -8},
-    /* ']' 0x5D */ {365, 2, 12, 3, 0, -8},
-    /* '^' 0x5E */ {368, 4, 5, 6, 1, -8},
-    /* '_' 0x5F */ {371, 7, 1, 7, 0, 2},
-    /* '`' 0x60 */ {372, 1, 1, 3, 1, -8},
-    /* 'a' 0x61 */ {373, 7, 7, 7, 0, -6},
-    /* 'b' 0x62 */ {380, 5, 9, 7, 1, -8},
-    /* 'c' 0x63 */ {386, 6, 7, 6, 0, -6},
-    /* 'd' 0x64 */ {392, 6, 9, 7, 0, -8},
-    /* 'e' 0x65 */ {399, 6, 7, 6, 0, -6},
-    /* 'f' 0x66 */ {405, 3, 9, 3, 0, -8},
-    /* 'g' 0x67 */ {409, 6, 10, 7, 0, -6},
-    /* 'h' 0x68 */ {417, 5, 9, 6, 1, -8},
-    /* 'i' 0x69 */ {423, 1, 9, 3, 1, -8},
-    /* 'j' 0x6A */ {425, 2, 12, 3, 0, -8},
-    /* 'k' 0x6B */ {428, 5, 9, 6, 1, -8},
-    /* 'l' 0x6C */ {434, 1, 9, 3, 1, -8},
-    /* 'm' 0x6D */ {436, 8, 7, 10, 1, -6},
-    /* 'n' 0x6E */ {443, 5, 7, 6, 1, -6},
-    /* 'o' 0x6F */ {448, 6, 7, 6, 0, -6},
-    /* 'p' 0x70 */ {454, 5, 9, 7, 1, -6},
-    /* 'q' 0x71 */ {460, 6, 9, 7, 0, -6},
-    /* 'r' 0x72 */ {467, 3, 7, 4, 1, -6},
-    /* 's' 0x73 */ {470, 4, 7, 6, 1, -6},
-    /* 't' 0x74 */ {474, 3, 8, 3, 0, -7},
-    /* 'u' 0x75 */ {477, 5, 7, 6, 1, -6},
-    /* 'v' 0x76 */ {482, 6, 7, 6, 0, -6},
-    /* 'w' 0x77 */ {488, 8, 7, 9, 0, -6},
-    /* 'x' 0x78 */ {495, 5, 7, 6, 0, -6},
-    /* 'y' 0x79 */ {500, 6, 10, 6, 0, -6},
-    /* 'z' 0x7A */ {508, 5, 7, 6, 0, -6},
-    /* '{' 0x7B */ {513, 3, 12, 4, 0, -8},
-    /* '|' 0x7C */ {518, 1, 11, 3, 1, -8},
-    /* '}' 0x7D */ {520, 3, 12, 4, 1, -8},
-    /* '~' 0x7E */ {525, 6, 2, 6, 0, -4},
-};
+const uint8_t FreeSans6pt7bBitmaps[] PROGMEM = {
+    0xAA, 0xA8, 0xC0, 0xF6, 0xA0, 0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28, 0x10, 0xE5, 0x55, 0x50, 0xE1, 0x65, 0x55, 0xE1, 0x00,
+    0x71, 0x24, 0x89, 0x22, 0x50, 0x74, 0x02, 0x70, 0xA4, 0x49, 0x11, 0xC0, 0x70, 0x91, 0x23, 0x86, 0x12, 0xA2, 0x4E, 0xF4, 0xE0,
+    0x5A, 0xAA, 0x94, 0x89, 0x12, 0x49, 0x29, 0x00, 0x27, 0x50, 0x21, 0x3E, 0x42, 0x00, 0xE0, 0xC0, 0x80, 0x24, 0xA4, 0xA4, 0x80,
+    0x74, 0xE3, 0x18, 0xC6, 0x33, 0x70, 0x27, 0x92, 0x49, 0x20, 0x79, 0x10, 0x41, 0x08, 0xC6, 0x10, 0xFC, 0x79, 0x30, 0x43, 0x18,
+    0x10, 0x71, 0x78, 0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08, 0x7D, 0x04, 0x1E, 0x44, 0x10, 0x51, 0x78, 0x74, 0x61, 0xE8, 0xC6,
+    0x31, 0x70, 0xF8, 0x44, 0x22, 0x11, 0x08, 0x40, 0x39, 0x34, 0x53, 0x39, 0x1C, 0x51, 0x38, 0x39, 0x3C, 0x71, 0x4C, 0xF0, 0x53,
+    0x78, 0x82, 0x87, 0x01, 0xF1, 0x83, 0x04, 0xF8, 0x3E, 0x07, 0x06, 0x36, 0x40, 0x74, 0x42, 0x11, 0x10, 0x80, 0x20, 0x0F, 0x86,
+    0x19, 0x9A, 0xA4, 0xD9, 0x13, 0x22, 0x56, 0xDA, 0x6E, 0x60, 0x06, 0x00, 0x3C, 0x00, 0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42,
+    0x42, 0xC3, 0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC, 0x3E, 0x63, 0x40, 0x40, 0xC0, 0x40, 0x41, 0x63, 0x3E, 0xF9, 0x0A, 0x1C,
+    0x18, 0x30, 0x61, 0xC2, 0xF8, 0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC, 0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80, 0x1E, 0x61,
+    0x40, 0x40, 0xC7, 0x41, 0x41, 0x63, 0x1D, 0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82, 0xFF, 0x80, 0x08, 0x42, 0x10, 0x87,
+    0x29, 0x70, 0x85, 0x12, 0x45, 0x0D, 0x13, 0x22, 0x42, 0x86, 0x84, 0x21, 0x08, 0x42, 0x10, 0xF8, 0xC3, 0xC3, 0xC3, 0xA5, 0xA5,
+    0xA5, 0x99, 0x99, 0x99, 0x83, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86, 0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6,
+    0x1E, 0x00, 0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80, 0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x1F, 0x00, 0x00,
+    0xFD, 0x0E, 0x1C, 0x2F, 0x90, 0xA1, 0x42, 0x86, 0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78, 0xFE, 0x20, 0x40, 0x81, 0x02, 0x04,
+    0x08, 0x10, 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE2, 0x78, 0xC2, 0x42, 0x42, 0x64, 0x24, 0x24, 0x38, 0x18, 0x18, 0xC4, 0x28,
+    0xCD, 0x29, 0x25, 0x24, 0xA4, 0x52, 0x8C, 0x61, 0x8C, 0x31, 0x80, 0x42, 0x66, 0x24, 0x18, 0x18, 0x18, 0x24, 0x46, 0x42, 0xC3,
+    0x42, 0x24, 0x34, 0x18, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE, 0xEA, 0xAA, 0xAB, 0x92, 0x24,
+    0x89, 0x20, 0xE9, 0x24, 0x92, 0x49, 0x70, 0x46, 0xA9, 0x10, 0xFE, 0x40, 0x79, 0x20, 0x4F, 0xC6, 0x37, 0x40, 0x84, 0x3D, 0x18,
+    0xC6, 0x31, 0xF0, 0x39, 0x3C, 0x20, 0xC1, 0x33, 0x80, 0x04, 0x13, 0xD3, 0xC6, 0x1C, 0x53, 0x3C, 0x39, 0x38, 0x7F, 0x81, 0x13,
+    0x80, 0x6B, 0xA4, 0x92, 0x40, 0x35, 0x3C, 0x61, 0xC5, 0x33, 0x41, 0x4D, 0xE0, 0x84, 0x3D, 0x38, 0xC6, 0x31, 0x88, 0xBF, 0x80,
+    0x45, 0x55, 0x57, 0x84, 0x25, 0x4E, 0x52, 0xD2, 0x88, 0xFF, 0x80, 0xF7, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91, 0xF4, 0x63, 0x18,
+    0xC6, 0x20, 0x39, 0x3C, 0x61, 0xC5, 0x33, 0x80, 0xF4, 0x63, 0x18, 0xC7, 0xD0, 0x80, 0x3D, 0x3C, 0x61, 0xC5, 0x37, 0x41, 0x04,
+    0xF2, 0x49, 0x20, 0x79, 0x24, 0x1C, 0x0B, 0x27, 0x80, 0x5D, 0x24, 0x93, 0x8C, 0x63, 0x18, 0xCF, 0xA0, 0x85, 0x24, 0x92, 0x30,
+    0xC3, 0x00, 0x89, 0x2C, 0x96, 0x4A, 0xA5, 0x61, 0x30, 0x98, 0x49, 0x23, 0x08, 0x31, 0x2C, 0x80, 0x89, 0x24, 0x94, 0x50, 0xC2,
+    0x08, 0x21, 0x00, 0x78, 0x44, 0x46, 0x23, 0xE0, 0x6A, 0xAA, 0xA9, 0xFF, 0xE0, 0x95, 0x55, 0x56, 0x66, 0x60};
+
+const GFXglyph FreeSans6pt7bGlyphs[] PROGMEM = {{0, 0, 0, 3, 0, 1},       // 0x20 ' '
+                                                {0, 2, 9, 4, 1, -8},      // 0x21 '!'
+                                                {3, 4, 3, 4, 0, -8},      // 0x22 '"'
+                                                {5, 7, 8, 7, 0, -7},      // 0x23 '#'
+                                                {12, 6, 11, 7, 0, -9},    // 0x24 '$'
+                                                {21, 10, 9, 11, 0, -8},   // 0x25 '%'
+                                                {33, 7, 9, 8, 1, -8},     // 0x26 '&'
+                                                {41, 1, 3, 2, 1, -8},     // 0x27 '''
+                                                {42, 2, 11, 4, 1, -8},    // 0x28 '('
+                                                {45, 3, 11, 4, 0, -8},    // 0x29 ')'
+                                                {50, 4, 3, 5, 0, -8},     // 0x2A '*'
+                                                {52, 5, 5, 7, 1, -4},     // 0x2B '+'
+                                                {56, 1, 3, 3, 1, 0},      // 0x2C ','
+                                                {57, 2, 1, 4, 1, -3},     // 0x2D '-'
+                                                {58, 1, 1, 3, 1, 0},      // 0x2E '.'
+                                                {59, 3, 9, 3, 0, -8},     // 0x2F '/'
+                                                {63, 5, 9, 7, 1, -8},     // 0x30 '0'
+                                                {69, 3, 9, 7, 1, -8},     // 0x31 '1'
+                                                {73, 6, 9, 7, 0, -8},     // 0x32 '2'
+                                                {80, 6, 9, 7, 0, -8},     // 0x33 '3'
+                                                {87, 6, 9, 7, 0, -8},     // 0x34 '4'
+                                                {94, 6, 9, 7, 0, -8},     // 0x35 '5'
+                                                {101, 5, 9, 7, 1, -8},    // 0x36 '6'
+                                                {107, 5, 9, 7, 1, -8},    // 0x37 '7'
+                                                {113, 6, 9, 7, 0, -8},    // 0x38 '8'
+                                                {120, 6, 9, 7, 0, -8},    // 0x39 '9'
+                                                {127, 1, 7, 3, 1, -6},    // 0x3A ':'
+                                                {128, 1, 8, 3, 1, -5},    // 0x3B ';'
+                                                {129, 5, 6, 7, 1, -5},    // 0x3C '<'
+                                                {133, 5, 3, 7, 1, -3},    // 0x3D '='
+                                                {135, 5, 6, 7, 1, -5},    // 0x3E '>'
+                                                {139, 5, 9, 7, 1, -8},    // 0x3F '?'
+                                                {145, 11, 11, 12, 0, -8}, // 0x40 '@'
+                                                {161, 8, 9, 8, 0, -8},    // 0x41 'A'
+                                                {170, 6, 9, 8, 1, -8},    // 0x42 'B'
+                                                {177, 8, 9, 9, 0, -8},    // 0x43 'C'
+                                                {186, 7, 9, 8, 1, -8},    // 0x44 'D'
+                                                {194, 6, 9, 8, 1, -8},    // 0x45 'E'
+                                                {201, 6, 9, 7, 1, -8},    // 0x46 'F'
+                                                {208, 8, 9, 9, 0, -8},    // 0x47 'G'
+                                                {217, 7, 9, 9, 1, -8},    // 0x48 'H'
+                                                {225, 1, 9, 3, 1, -8},    // 0x49 'I'
+                                                {227, 5, 9, 6, 0, -8},    // 0x4A 'J'
+                                                {233, 7, 9, 8, 1, -8},    // 0x4B 'K'
+                                                {241, 5, 9, 7, 1, -8},    // 0x4C 'L'
+                                                {247, 8, 9, 10, 1, -8},   // 0x4D 'M'
+                                                {256, 7, 9, 9, 1, -8},    // 0x4E 'N'
+                                                {264, 9, 9, 9, 0, -8},    // 0x4F 'O'
+                                                {275, 6, 9, 8, 1, -8},    // 0x50 'P'
+                                                {282, 9, 10, 9, 0, -8},   // 0x51 'Q'
+                                                {294, 7, 9, 9, 1, -8},    // 0x52 'R'
+                                                {302, 6, 9, 8, 1, -8},    // 0x53 'S'
+                                                {309, 7, 9, 8, 0, -8},    // 0x54 'T'
+                                                {317, 7, 9, 9, 1, -8},    // 0x55 'U'
+                                                {325, 8, 9, 8, 0, -8},    // 0x56 'V'
+                                                {334, 11, 9, 11, 0, -8},  // 0x57 'W'
+                                                {347, 8, 9, 8, 0, -8},    // 0x58 'X'
+                                                {356, 8, 9, 8, 0, -8},    // 0x59 'Y'
+                                                {365, 7, 9, 7, 0, -8},    // 0x5A 'Z'
+                                                {373, 2, 12, 3, 1, -8},   // 0x5B '['
+                                                {376, 3, 9, 3, 0, -8},    // 0x5C '\'
+                                                {380, 3, 12, 3, 0, -8},   // 0x5D ']'
+                                                {385, 4, 5, 6, 1, -8},    // 0x5E '^'
+                                                {388, 7, 1, 7, 0, 2},     // 0x5F '_'
+                                                {389, 3, 1, 3, 0, -8},    // 0x60 '`'
+                                                {390, 6, 7, 7, 0, -6},    // 0x61 'a'
+                                                {396, 5, 9, 7, 1, -8},    // 0x62 'b'
+                                                {402, 6, 7, 6, 0, -6},    // 0x63 'c'
+                                                {408, 6, 9, 7, 0, -8},    // 0x64 'd'
+                                                {415, 6, 7, 6, 0, -6},    // 0x65 'e'
+                                                {421, 3, 9, 3, 0, -8},    // 0x66 'f'
+                                                {425, 6, 10, 7, 0, -6},   // 0x67 'g'
+                                                {433, 5, 9, 6, 1, -8},    // 0x68 'h'
+                                                {439, 1, 9, 3, 1, -8},    // 0x69 'i'
+                                                {441, 2, 12, 3, 0, -8},   // 0x6A 'j'
+                                                {444, 5, 9, 6, 1, -8},    // 0x6B 'k'
+                                                {450, 1, 9, 3, 1, -8},    // 0x6C 'l'
+                                                {452, 8, 7, 10, 1, -6},   // 0x6D 'm'
+                                                {459, 5, 7, 6, 1, -6},    // 0x6E 'n'
+                                                {464, 6, 7, 6, 0, -6},    // 0x6F 'o'
+                                                {470, 5, 9, 7, 1, -6},    // 0x70 'p'
+                                                {476, 6, 9, 7, 0, -6},    // 0x71 'q'
+                                                {483, 3, 7, 4, 1, -6},    // 0x72 'r'
+                                                {486, 6, 7, 6, 0, -6},    // 0x73 's'
+                                                {492, 3, 8, 3, 0, -7},    // 0x74 't'
+                                                {495, 5, 7, 6, 1, -6},    // 0x75 'u'
+                                                {500, 6, 7, 6, 0, -6},    // 0x76 'v'
+                                                {506, 9, 7, 9, 0, -6},    // 0x77 'w'
+                                                {514, 6, 7, 6, 0, -6},    // 0x78 'x'
+                                                {520, 6, 10, 6, 0, -6},   // 0x79 'y'
+                                                {528, 5, 7, 6, 0, -6},    // 0x7A 'z'
+                                                {533, 2, 12, 4, 1, -8},   // 0x7B '{'
+                                                {536, 1, 11, 3, 1, -8},   // 0x7C '|'
+                                                {538, 2, 12, 4, 1, -8},   // 0x7D '}'
+                                                {541, 6, 2, 6, 0, -4}};   // 0x7E '~'

 const GFXfont FreeSans6pt7b PROGMEM = {(uint8_t *)FreeSans6pt7bBitmaps, (GFXglyph *)FreeSans6pt7bGlyphs, 0x20, 0x7E, 14};
+
+// Approx. 1215 bytes
--- a/src/graphics/niche/Fonts/FreeSans6pt8bCyrillic.h
+++ b/src/graphics/niche/Fonts/FreeSans6pt8bCyrillic.h
@@ -0,0 +1,302 @@
+/*
+
+Uses Windows-1251 encoding to map translingual Cyrillic characters to range between (uint8_t)127 and (uint8_t)255
+https://en.wikipedia.org/wiki/Windows-1251
+
+Cyrillic characters present to the firmware as UTF8.
+A NicheGraphics implementation needs to identify these, and substitute the appropriate Windows-1251 char value.
+
+*/
+
+#pragma once
+
+const uint8_t FreeSans6pt8bCyrillicBitmaps[] PROGMEM = {
+    0xFF, 0xA0, 0xC0, 0xFF, 0xA0, 0xC0, 0xB6, 0x80, 0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28, 0x31, 0x75, 0x54, 0x78, 0x79, 0x75,
+    0x7C, 0x41, 0x00, 0x01, 0x1C, 0x49, 0x22, 0x50, 0x74, 0x02, 0x60, 0xA4, 0x49, 0x11, 0xC0, 0x21, 0x44, 0x94, 0x62, 0x59, 0xE2,
+    0xF4, 0xE0, 0x6A, 0xAA, 0x90, 0x48, 0x92, 0x49, 0x4A, 0x00, 0x5D, 0x40, 0x21, 0x09, 0xF2, 0x10, 0xE0, 0xC0, 0x80, 0x25, 0x25,
+    0x24, 0x26, 0xA3, 0x18, 0xC6, 0x31, 0xF0, 0x27, 0x92, 0x49, 0x20, 0x11, 0xB4, 0x41, 0x0C, 0xC6, 0x10, 0xFC, 0x26, 0xA2, 0x13,
+    0x04, 0x31, 0xF0, 0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08, 0xFF, 0xE1, 0x4D, 0x84, 0x31, 0xF0, 0x26, 0xE3, 0x0F, 0x46, 0x31,
+    0xF0, 0xFF, 0xC4, 0x22, 0x11, 0x08, 0x40, 0x11, 0xA4, 0x51, 0x39, 0x1C, 0x51, 0x78, 0x11, 0xA4, 0x71, 0x45, 0xF0, 0x51, 0x78,
+    0xC0, 0x30, 0xC0, 0x36, 0x1F, 0x20, 0xE0, 0x80, 0xF8, 0x3E, 0xC1, 0xC2, 0xE8, 0x00, 0x74, 0x62, 0x11, 0x10, 0x80, 0x20, 0x0F,
+    0x06, 0x18, 0x81, 0xA7, 0xD4, 0x93, 0x22, 0x64, 0x4A, 0x7E, 0x60, 0x06, 0x00, 0x3C, 0x00, 0x18, 0x18, 0x1C, 0x24, 0x24, 0x7E,
+    0x42, 0x42, 0xC3, 0xFA, 0x38, 0x61, 0xFA, 0x18, 0x61, 0xFC, 0x38, 0x8A, 0x0C, 0x08, 0x10, 0x20, 0xE3, 0x7C, 0xF9, 0x1A, 0x1C,
+    0x18, 0x30, 0x60, 0xC2, 0xF8, 0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC, 0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80, 0x3C, 0x46,
+    0x82, 0x80, 0x8F, 0x81, 0x83, 0xC3, 0x7D, 0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82, 0xFF, 0x80, 0x08, 0x42, 0x10, 0x86,
+    0x31, 0x78, 0x87, 0x1A, 0x65, 0x8F, 0x1A, 0x22, 0x42, 0x86, 0x84, 0x21, 0x08, 0x42, 0x10, 0xF8, 0xC3, 0xC3, 0xC3, 0xA5, 0xA5,
+    0xA5, 0x99, 0x99, 0x99, 0x83, 0x87, 0x8D, 0x19, 0x32, 0x62, 0xC3, 0x86, 0x1E, 0x11, 0x90, 0x48, 0x1C, 0x0A, 0x05, 0x06, 0xC2,
+    0x3E, 0x00, 0xFA, 0x18, 0x61, 0xFE, 0x08, 0x20, 0x80, 0x1E, 0x11, 0x90, 0x48, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x3F, 0x00, 0xFD,
+    0x0E, 0x0C, 0x1F, 0xD0, 0xA0, 0xC1, 0x82, 0x7A, 0x18, 0x70, 0x78, 0x38, 0x61, 0x7C, 0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08,
+    0x10, 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC3, 0x7C, 0xC3, 0x42, 0x42, 0x26, 0x24, 0x24, 0x14, 0x18, 0x18, 0xC4, 0x28, 0xC5,
+    0x39, 0xA5, 0x24, 0xA4, 0x52, 0x8C, 0x71, 0x8C, 0x30, 0x80, 0x87, 0x34, 0x8C, 0x30, 0xC4, 0xB3, 0x84, 0xC3, 0x42, 0x26, 0x24,
+    0x18, 0x18, 0x08, 0x08, 0x08, 0x7E, 0x0C, 0x10, 0x41, 0x06, 0x08, 0x20, 0xFE, 0xEA, 0xAA, 0xAB, 0x92, 0x24, 0x89, 0x20, 0xED,
+    0xB6, 0xDB, 0x6D, 0xF0, 0x46, 0xAA, 0x90, 0xFC, 0x90, 0xFC, 0x4F, 0x98, 0xFC, 0x84, 0x21, 0xF8, 0xC6, 0x31, 0xF0, 0x79, 0x18,
+    0x20, 0x45, 0xE0, 0x04, 0x10, 0x5F, 0xC6, 0x18, 0x51, 0x7C, 0xFC, 0x7F, 0x08, 0xF8, 0x29, 0x74, 0x92, 0x40, 0x7D, 0x18, 0x61,
+    0x45, 0xF0, 0x52, 0x30, 0x84, 0x21, 0xF8, 0xC6, 0x31, 0x88, 0xDF, 0x80, 0x51, 0x55, 0x56, 0x84, 0x21, 0x2A, 0x72, 0x92, 0x98,
+    0xFF, 0x80, 0xFF, 0x99, 0x99, 0x99, 0x99, 0x99, 0xFC, 0x63, 0x18, 0xC4, 0x79, 0x18, 0x71, 0x45, 0xE0, 0xFC, 0x63, 0x18, 0xFA,
+    0x10, 0x80, 0x7D, 0x18, 0x61, 0x45, 0xF0, 0x41, 0x04, 0xF2, 0x49, 0x00, 0x79, 0x07, 0x02, 0xCD, 0xE0, 0x4B, 0xA4, 0x93, 0x8C,
+    0x63, 0x18, 0xFC, 0xCD, 0x24, 0x94, 0x30, 0xC0, 0x99, 0x59, 0x55, 0x56, 0x66, 0x26, 0x96, 0x66, 0x99, 0xCA, 0x52, 0x63, 0x18,
+    0x84, 0x40, 0x78, 0xC4, 0x44, 0x7C, 0x6A, 0xAA, 0xA9, 0xFF, 0xF0, 0xC9, 0x24, 0x4A, 0x49, 0x40, 0xE8, 0xC0, 0xFE, 0x18, 0x61,
+    0x86, 0x18, 0x61, 0xFC, 0xFC, 0x08, 0x04, 0x02, 0x01, 0xF0, 0x8C, 0x46, 0x23, 0x11, 0x80, 0xC0, 0xC0, 0x10, 0x8F, 0xE0, 0x82,
+    0x08, 0x20, 0x82, 0x08, 0x00, 0x64, 0x0F, 0x88, 0x88, 0x80, 0x3D, 0x0C, 0x2E, 0xF9, 0x04, 0x0F, 0x7C, 0x08, 0x81, 0x10, 0x22,
+    0x04, 0x7C, 0x88, 0x51, 0x0A, 0x21, 0x87, 0xC0, 0x84, 0x10, 0x82, 0x10, 0x42, 0x0F, 0xFD, 0x08, 0xA1, 0x0C, 0x23, 0x87, 0xC0,
+    0x10, 0x88, 0xE6, 0xB3, 0x8C, 0x28, 0x92, 0x28, 0xC0, 0xFC, 0x08, 0x04, 0x02, 0x01, 0xF0, 0x8C, 0x46, 0x23, 0x11, 0x80, 0x83,
+    0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xFE, 0x20, 0x40, 0x43, 0xC4, 0x1F, 0x45, 0x14, 0x51, 0x44, 0x11, 0x80, 0x78, 0x24, 0x13,
+    0xC9, 0x14, 0x8E, 0x7C, 0x88, 0x44, 0x3F, 0xD1, 0x38, 0x8C, 0x78, 0x60, 0x9A, 0xCC, 0xA9, 0x43, 0xC4, 0x1F, 0x45, 0x14, 0x51,
+    0x44, 0x8C, 0x63, 0x18, 0xFC, 0x80, 0x24, 0x33, 0x0A, 0x36, 0x45, 0x8E, 0x0C, 0x10, 0x60, 0x80, 0x70, 0x22, 0x95, 0xA8, 0xC4,
+    0x23, 0x10, 0x08, 0x42, 0x10, 0x86, 0x31, 0x78, 0x07, 0xF8, 0x20, 0x82, 0x08, 0x20, 0x82, 0x00, 0x28, 0x0F, 0xE0, 0x82, 0x0F,
+    0xE0, 0x82, 0x0F, 0xC0, 0x38, 0x8A, 0x0C, 0x0F, 0x90, 0x20, 0xE3, 0x7C, 0x51, 0x55, 0x56, 0xA1, 0x24, 0x92, 0x49, 0x00, 0xFF,
+    0x80, 0xDF, 0x80, 0x27, 0xC9, 0x24, 0x8A, 0x28, 0xA2, 0x8B, 0xF8, 0x20, 0x80, 0x28, 0xA0, 0x1E, 0x47, 0xFC, 0x11, 0x78, 0x88,
+    0x44, 0x32, 0x59, 0xDA, 0xCD, 0x66, 0x6B, 0x32, 0x89, 0x80, 0x79, 0x1F, 0x30, 0x45, 0xE0, 0x7A, 0x18, 0x70, 0x78, 0x38, 0x61,
+    0x7C, 0x79, 0x07, 0x02, 0xCD, 0xE0, 0xB4, 0x24, 0x92, 0x40, 0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3, 0xFE, 0x08,
+    0x20, 0xFE, 0x18, 0x61, 0xFC, 0xFA, 0x38, 0x61, 0xFA, 0x18, 0x61, 0xFC, 0xFE, 0x08, 0x20, 0x82, 0x08, 0x20, 0x80, 0x1F, 0x08,
+    0x84, 0x42, 0x21, 0x10, 0x88, 0x44, 0x42, 0xFF, 0xC0, 0x60, 0x20, 0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC, 0x88, 0xA4, 0x9A,
+    0x87, 0xC1, 0xC1, 0xF1, 0xAD, 0x92, 0x88, 0x80, 0x7A, 0x18, 0x41, 0x38, 0x18, 0x61, 0x7C, 0x87, 0x0E, 0x2C, 0x59, 0x34, 0x68,
+    0xE1, 0xC2, 0x28, 0x22, 0x1C, 0x38, 0xB1, 0x64, 0xD1, 0xA3, 0x87, 0x08, 0x8E, 0x6B, 0x38, 0xC2, 0x89, 0x22, 0x8C, 0x3E, 0x44,
+    0x89, 0x12, 0x24, 0x58, 0xA1, 0xC2, 0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99, 0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60,
+    0xC1, 0x82, 0x3C, 0x46, 0x83, 0x81, 0x81, 0x81, 0x81, 0xC2, 0x7C, 0xFF, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x82, 0xFA, 0x18,
+    0x61, 0xFE, 0x08, 0x20, 0x80, 0x38, 0x8A, 0x0C, 0x08, 0x10, 0x20, 0xE3, 0x7C, 0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10,
+    0xC2, 0x8D, 0x91, 0x63, 0x83, 0x04, 0x18, 0x20, 0x08, 0x1E, 0x32, 0xD1, 0x38, 0x8C, 0x4F, 0x2C, 0xFC, 0x08, 0x00, 0x87, 0x34,
+    0x8C, 0x30, 0xC4, 0xB3, 0x84, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFF, 0x01, 0x01, 0x8E, 0x38, 0xE3, 0x8D, 0xF0,
+    0xC3, 0x0C, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xFF, 0x99, 0x4C, 0xA6, 0x53, 0x29, 0x94, 0xCA, 0x65, 0x32, 0xFF,
+    0x80, 0x40, 0x20, 0xF0, 0x04, 0x01, 0x00, 0x40, 0x1F, 0x84, 0x21, 0x0C, 0x42, 0x1F, 0x00, 0x81, 0xC0, 0xE0, 0x70, 0x3F, 0xDC,
+    0x2E, 0x17, 0x0B, 0xF9, 0x80, 0x82, 0x08, 0x20, 0xFE, 0x18, 0x61, 0xF8, 0x79, 0x8A, 0x18, 0x13, 0xE0, 0x60, 0xC2, 0x7C, 0x87,
+    0x26, 0x39, 0x06, 0x41, 0xF0, 0x64, 0x19, 0x06, 0x63, 0x8F, 0x80, 0x7E, 0x18, 0x61, 0x7C, 0xD6, 0x71, 0x84, 0x79, 0x11, 0xD9,
+    0xCD, 0xD0, 0x0D, 0xC4, 0x1E, 0x47, 0x1C, 0x51, 0x78, 0xF4, 0xBD, 0x29, 0xF8, 0xF8, 0x88, 0x88, 0x3C, 0x48, 0x91, 0x22, 0x5F,
+    0xE0, 0x80, 0x79, 0x1F, 0xF0, 0x45, 0xE0, 0x92, 0x54, 0x38, 0x3C, 0x56, 0x93, 0x78, 0x23, 0x82, 0xCD, 0xE0, 0x9C, 0xEB, 0x5C,
+    0xC4, 0x70, 0x27, 0x3A, 0xD7, 0x31, 0x9A, 0xCC, 0xA9, 0x7A, 0x52, 0x94, 0xE4, 0x8F, 0x3D, 0x6D, 0xA6, 0x90, 0x8C, 0x7F, 0x18,
+    0xC4, 0x79, 0x1C, 0x71, 0x45, 0xE0, 0xFC, 0x63, 0x18, 0xC4, 0xFC, 0x63, 0x18, 0xFA, 0x10, 0x80, 0x79, 0x1C, 0x30, 0x45, 0xE0,
+    0xF9, 0x08, 0x42, 0x10, 0x8A, 0x56, 0xA3, 0x10, 0x8C, 0x40, 0x04, 0x01, 0x07, 0xF9, 0x31, 0xC4, 0x71, 0x14, 0xC5, 0xFE, 0x04,
+    0x01, 0x00, 0x40, 0x4B, 0x8C, 0x65, 0xE4, 0x8A, 0x28, 0xA2, 0x8B, 0xF0, 0x40, 0x99, 0x97, 0x11, 0x96, 0x59, 0x65, 0x97, 0xF0,
+    0x95, 0x2A, 0x54, 0xA9, 0x5F, 0xC0, 0x80, 0xF0, 0x20, 0x78, 0x91, 0x23, 0xC0, 0x86, 0x1F, 0x63, 0x8F, 0xD0, 0x84, 0x3D, 0x18,
+    0xF8, 0xF4, 0xDE, 0x19, 0xF8, 0x9E, 0xA2, 0xE1, 0xA1, 0xA2, 0x9E, 0xFC, 0x7E, 0xD4, 0xC4,
+};
+
+const GFXglyph FreeSans6pt8bCyrillicGlyphs[] PROGMEM = {
+    {0, 0, 0, 3, 0, 0},        // 0x20 ' '
+    {3, 2, 9, 3, 1, -8},       // 0x21 '!'
+    {6, 3, 3, 4, 1, -8},       // 0x22 '"'
+    {8, 7, 8, 7, 0, -7},       // 0x23 '#'
+    {15, 6, 11, 7, 0, -8},     // 0x24 '$'
+    {24, 10, 9, 11, 0, -8},    // 0x25 '%'
+    {36, 6, 9, 8, 1, -8},      // 0x26 '&'
+    {43, 1, 3, 2, 1, -8},      // 0x27 '''
+    {44, 2, 10, 4, 1, -7},     // 0x28 '('
+    {47, 3, 11, 4, 0, -7},     // 0x29 ')'
+    {52, 3, 4, 5, 1, -8},      // 0x2A '*'
+    {54, 5, 6, 7, 1, -5},      // 0x2B '+'
+    {58, 1, 3, 3, 1, 0},       // 0x2C ','
+    {59, 2, 1, 4, 1, -3},      // 0x2D '-'
+    {60, 1, 1, 3, 1, 0},       // 0x2E '.'
+    {61, 3, 8, 3, 0, -7},      // 0x2F '/'
+    {64, 5, 9, 7, 1, -8},      // 0x30 '0'
+    {70, 3, 9, 7, 1, -8},      // 0x31 '1'
+    {74, 6, 9, 7, 0, -8},      // 0x32 '2'
+    {81, 5, 9, 7, 1, -8},      // 0x33 '3'
+    {87, 6, 9, 7, 0, -8},      // 0x34 '4'
+    {94, 5, 9, 7, 1, -8},      // 0x35 '5'
+    {100, 5, 9, 7, 1, -8},     // 0x36 '6'
+    {106, 5, 9, 7, 1, -8},     // 0x37 '7'
+    {112, 6, 9, 7, 0, -8},     // 0x38 '8'
+    {119, 6, 9, 7, 0, -8},     // 0x39 '9'
+    {126, 2, 6, 3, 1, -5},     // 0x3A ':'
+    {128, 2, 8, 3, 1, -5},     // 0x3B ';'
+    {130, 5, 5, 7, 1, -4},     // 0x3C '<'
+    {134, 5, 3, 7, 1, -3},     // 0x3D '='
+    {136, 5, 5, 7, 1, -4},     // 0x3E '>'
+    {140, 5, 9, 7, 1, -8},     // 0x3F '?'
+    {146, 11, 11, 12, 0, -8},  // 0x40 '@'
+    {162, 8, 9, 8, 0, -8},     // 0x41 'A'
+    {171, 6, 9, 8, 1, -8},     // 0x42 'B'
+    {178, 7, 9, 9, 1, -8},     // 0x43 'C'
+    {186, 7, 9, 9, 1, -8},     // 0x44 'D'
+    {194, 6, 9, 8, 1, -8},     // 0x45 'E'
+    {201, 6, 9, 7, 1, -8},     // 0x46 'F'
+    {208, 8, 9, 9, 1, -8},     // 0x47 'G'
+    {217, 7, 9, 9, 1, -8},     // 0x48 'H'
+    {225, 1, 9, 3, 1, -8},     // 0x49 'I'
+    {227, 5, 9, 6, 0, -8},     // 0x4A 'J'
+    {233, 7, 9, 8, 1, -8},     // 0x4B 'K'
+    {241, 5, 9, 7, 1, -8},     // 0x4C 'L'
+    {247, 8, 9, 10, 1, -8},    // 0x4D 'M'
+    {256, 7, 9, 9, 1, -8},     // 0x4E 'N'
+    {264, 9, 9, 9, 0, -8},     // 0x4F 'O'
+    {275, 6, 9, 8, 1, -8},     // 0x50 'P'
+    {282, 9, 9, 9, 0, -8},     // 0x51 'Q'
+    {293, 7, 9, 9, 1, -8},     // 0x52 'R'
+    {301, 6, 9, 8, 1, -8},     // 0x53 'S'
+    {308, 7, 9, 7, 0, -8},     // 0x54 'T'
+    {316, 7, 9, 9, 1, -8},     // 0x55 'U'
+    {324, 8, 9, 8, 0, -8},     // 0x56 'V'
+    {333, 11, 9, 11, 0, -8},   // 0x57 'W'
+    {346, 6, 9, 8, 1, -8},     // 0x58 'X'
+    {353, 8, 9, 8, 0, -8},     // 0x59 'Y'
+    {362, 7, 9, 7, 0, -8},     // 0x5A 'Z'
+    {370, 2, 12, 3, 1, -8},    // 0x5B '['
+    {373, 3, 9, 3, 0, -8},     // 0x5C '\'
+    {377, 3, 12, 3, 0, -8},    // 0x5D ']'
+    {382, 4, 5, 6, 1, -8},     // 0x5E '^'
+    {385, 6, 1, 7, 0, 2},      // 0x5F '_'
+    {386, 2, 2, 4, 1, -8},     // 0x60 '`'
+    {387, 5, 6, 7, 1, -5},     // 0x61 'a'
+    {391, 5, 9, 7, 1, -8},     // 0x62 'b'
+    {397, 6, 6, 6, 0, -5},     // 0x63 'c'
+    {402, 6, 9, 7, 0, -8},     // 0x64 'd'
+    {409, 5, 6, 7, 1, -5},     // 0x65 'e'
+    {413, 3, 9, 3, 0, -8},     // 0x66 'f'
+    {417, 6, 9, 7, 0, -5},     // 0x67 'g'
+    {424, 5, 9, 7, 1, -8},     // 0x68 'h'
+    {430, 1, 9, 3, 1, -8},     // 0x69 'i'
+    {432, 2, 12, 3, 0, -8},    // 0x6A 'j'
+    {435, 5, 9, 6, 1, -8},     // 0x6B 'k'
+    {441, 1, 9, 3, 1, -8},     // 0x6C 'l'
+    {443, 8, 6, 10, 1, -5},    // 0x6D 'm'
+    {449, 5, 6, 7, 1, -5},     // 0x6E 'n'
+    {453, 6, 6, 7, 0, -5},     // 0x6F 'o'
+    {458, 5, 9, 7, 1, -5},     // 0x70 'p'
+    {464, 6, 9, 7, 0, -5},     // 0x71 'q'
+    {471, 3, 6, 4, 1, -5},     // 0x72 'r'
+    {474, 6, 6, 6, 0, -5},     // 0x73 's'
+    {479, 3, 8, 3, 0, -7},     // 0x74 't'
+    {482, 5, 6, 7, 1, -5},     // 0x75 'u'
+    {486, 6, 6, 6, 0, -5},     // 0x76 'v'
+    {491, 8, 6, 9, 0, -5},     // 0x77 'w'
+    {497, 4, 6, 6, 1, -5},     // 0x78 'x'
+    {500, 5, 9, 6, 0, -5},     // 0x79 'y'
+    {506, 5, 6, 6, 0, -5},     // 0x7A 'z'
+    {510, 2, 12, 4, 1, -8},    // 0x7B '{'
+    {513, 1, 12, 3, 1, -8},    // 0x7C '|'
+    {515, 3, 12, 4, 0, -8},    // 0x7D '}'
+    {520, 5, 2, 7, 1, -4},     // 0x7E '~'
+    {522, 6, 9, 8, 1, -8},     //
+    {529, 9, 11, 9, 0, -8},    //
+    {542, 6, 11, 7, 1, -10},   //
+    {551, 0, 0, 8, 0, 0},      //
+    {551, 4, 9, 5, 1, -8},     //
+    {556, 0, 0, 8, 0, 0},      //
+    {556, 0, 0, 8, 0, 0},      //
+    {556, 0, 0, 8, 0, 0},      //
+    {556, 0, 0, 8, 0, 0},      //
+    {556, 6, 8, 8, 1, -7},     //
+    {562, 0, 0, 8, 0, 0},      //
+    {562, 11, 9, 13, 1, -8},   //
+    {575, 0, 0, 8, 0, 0},      //
+    {575, 11, 9, 12, 1, -8},   //
+    {588, 6, 11, 8, 1, -10},   //
+    {597, 9, 9, 9, 0, -8},     //
+    {608, 7, 11, 9, 1, -8},    //
+    {618, 6, 11, 7, 0, -8},    //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 0, 0, 8, 0, 0},      //
+    {627, 9, 6, 10, 0, -5},    //
+    {634, 0, 0, 8, 0, 0},      //
+    {634, 9, 6, 10, 1, -5},    //
+    {641, 4, 8, 6, 1, -7},     //
+    {645, 6, 9, 7, 0, -8},     //
+    {652, 5, 7, 7, 1, -5},     //
+    {657, 0, 0, 8, 0, 0},      //
+    {657, 7, 11, 7, 0, -10},   //
+    {667, 5, 11, 6, 0, -7},    //
+    {674, 5, 9, 6, 0, -8},     //
+    {680, 0, 0, 8, 0, 0},      //
+    {680, 6, 10, 7, 1, -9},    //
+    {688, 0, 0, 8, 0, 0},      //
+    {688, 0, 0, 8, 0, 0},      //
+    {688, 6, 11, 8, 1, -10},   //
+    {697, 7, 9, 9, 1, -8},     //
+    {705, 0, 0, 8, 0, 0},      //
+    {705, 0, 0, 8, 0, 0},      //
+    {705, 2, 12, 3, 0, -8},    //
+    {708, 0, 0, 8, 0, 0},      //
+    {708, 0, 0, 8, 0, 0},      //
+    {708, 3, 11, 3, 0, -10},   //
+    {713, 0, 0, 8, 0, 0},      //
+    {713, 0, 0, 8, 0, 0},      //
+    {713, 1, 9, 3, 1, -8},     //
+    {715, 1, 9, 3, 1, -8},     //
+    {717, 3, 8, 5, 1, -7},     //
+    {720, 6, 9, 7, 1, -5},     //
+    {727, 0, 0, 8, 0, 0},      //
+    {727, 0, 0, 8, 0, 0},      //
+    {727, 6, 9, 7, 0, -8},     //
+    {734, 9, 9, 11, 1, -8},    //
+    {745, 6, 6, 6, 0, -5},     //
+    {750, 0, 0, 8, 0, 0},      //
+    {750, 0, 0, 8, 0, 0},      //
+    {750, 6, 9, 8, 1, -8},     //
+    {757, 6, 6, 6, 0, -5},     //
+    {762, 3, 9, 3, 0, -8},     //
+    {766, 8, 9, 8, 0, -8},     //
+    {775, 6, 9, 8, 1, -8},     //
+    {782, 6, 9, 8, 1, -8},     //
+    {789, 6, 9, 7, 1, -8},     //
+    {796, 9, 11, 10, 0, -8},   //
+    {809, 6, 9, 8, 1, -8},     //
+    {816, 9, 9, 11, 1, -8},    //
+    {827, 6, 9, 8, 1, -8},     //
+    {834, 7, 9, 9, 1, -8},     //
+    {842, 7, 11, 9, 1, -10},   //
+    {852, 6, 9, 8, 1, -8},     //
+    {859, 7, 9, 8, 0, -8},     //
+    {867, 8, 9, 10, 1, -8},    //
+    {876, 7, 9, 9, 1, -8},     //
+    {884, 8, 9, 10, 1, -8},    //
+    {893, 7, 9, 9, 1, -8},     //
+    {901, 6, 9, 8, 1, -8},     //
+    {908, 7, 9, 9, 1, -8},     //
+    {916, 7, 9, 7, 0, -8},     //
+    {924, 7, 9, 7, 0, -8},     //
+    {932, 9, 9, 10, 1, -8},    //
+    {943, 6, 9, 8, 1, -8},     //
+    {950, 8, 11, 9, 1, -8},    //
+    {961, 6, 9, 8, 1, -8},     //
+    {968, 8, 9, 10, 1, -8},    //
+    {977, 9, 11, 10, 1, -8},   //
+    {990, 10, 9, 10, 0, -8},   //
+    {1002, 9, 9, 10, 1, -8},   //
+    {1013, 6, 9, 8, 1, -8},    //
+    {1020, 7, 9, 9, 1, -8},    //
+    {1028, 10, 9, 12, 1, -8},  //
+    {1040, 6, 9, 8, 1, -8},    //
+    {1047, 6, 6, 7, 0, -5},    //
+    {1052, 6, 9, 7, 0, -8},    //
+    {1059, 5, 6, 6, 1, -5},    //
+    {1063, 4, 6, 5, 1, -5},    //
+    {1066, 7, 7, 7, 0, -5},    //
+    {1073, 6, 6, 7, 0, -5},    //
+    {1078, 8, 6, 9, 1, -5},    //
+    {1084, 6, 6, 6, 0, -5},    //
+    {1089, 5, 6, 7, 1, -5},    //
+    {1093, 5, 8, 7, 1, -7},    //
+    {1098, 4, 6, 6, 1, -5},    //
+    {1101, 5, 6, 6, 0, -5},    //
+    {1105, 6, 6, 7, 1, -5},    //
+    {1110, 5, 6, 7, 1, -5},    //
+    {1114, 6, 6, 7, 0, -5},    //
+    {1119, 5, 6, 7, 1, -5},    //
+    {1123, 5, 9, 7, 1, -5},    //
+    {1129, 6, 6, 6, 0, -5},    //
+    {1134, 5, 6, 5, 0, -5},    //
+    {1138, 5, 9, 6, 0, -5},    //
+    {1144, 10, 11, 10, 0, -7}, //
+    {1158, 5, 6, 6, 0, -5},    //
+    {1162, 6, 7, 7, 1, -5},    //
+    {1168, 4, 6, 6, 1, -5},    //
+    {1171, 6, 6, 8, 1, -5},    //
+    {1176, 7, 7, 9, 1, -5},    //
+    {1183, 7, 6, 8, 0, -5},    //
+    {1189, 6, 6, 8, 1, -5},    //
+    {1194, 5, 6, 6, 1, -5},    //
+    {1198, 5, 6, 6, 1, -5},    //
+    {1202, 8, 6, 9, 1, -5},    //
+    {1208, 5, 6, 7, 1, -5}     //
+};
+
+const GFXfont FreeSans6pt8bCyrillic PROGMEM = {(uint8_t *)FreeSans6pt8bCyrillicBitmaps, (GFXglyph *)FreeSans6pt8bCyrillicGlyphs,
+                                               0x20, 0xFF, 16};
--- a/src/graphics/niche/Fonts/FreeSans6pt_Win1250.h
+++ b/src/graphics/niche/Fonts/FreeSans6pt_Win1250.h
@@ -1,457 +0,0 @@
-#pragma once
-const uint8_t FreeSans6pt_Win1250Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFC, 0x80,                                                                                     /* '!' 0x21 */
-    0xB6, 0x80,                                                                                     /* '"' 0x22 */
-    0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28,                                                       /* '#' 0x23 */
-    0x10, 0xE5, 0x55, 0x50, 0xE1, 0x65, 0x55, 0xE1, 0x00,                                           /* '$' 0x24 */
-    0x71, 0x24, 0x89, 0x22, 0x50, 0x74, 0x02, 0x70, 0xA4, 0x49, 0x11, 0xC0,                         /* '%' 0x25 */
-    0x71, 0x24, 0x9C, 0x62, 0x58, 0xA7, 0xF4,                                                       /* '&' 0x26 */
-    0xE0,                                                                                           /* ''' 0x27 */
-    0x5A, 0xAA, 0x94,                                                                               /* '(' 0x28 */
-    0x89, 0x12, 0x49, 0x29, 0x00,                                                                   /* ')' 0x29 */
-    0x5E, 0x80,                                                                                     /* '*' 0x2A */
-    0x21, 0x3E, 0x42, 0x00,                                                                         /* '+' 0x2B */
-    0xE0,                                                                                           /* ',' 0x2C */
-    0xC0,                                                                                           /* '-' 0x2D */
-    0x80,                                                                                           /* '.' 0x2E */
-    0x24, 0xA4, 0xA4, 0x80,                                                                         /* '/' 0x2F */
-    0x76, 0xE3, 0x18, 0xC6, 0x3B, 0x70,                                                             /* '0' 0x30 */
-    0x27, 0x92, 0x49, 0x20,                                                                         /* '1' 0x31 */
-    0x79, 0x10, 0x41, 0x08, 0xC6, 0x10, 0xFC,                                                       /* '2' 0x32 */
-    0x79, 0x30, 0x43, 0x18, 0x10, 0x71, 0x78,                                                       /* '3' 0x33 */
-    0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08,                                                       /* '4' 0x34 */
-    0xFC, 0x21, 0xE8, 0x84, 0x31, 0xF0,                                                             /* '5' 0x35 */
-    0x74, 0x61, 0xE8, 0xC6, 0x31, 0x70,                                                             /* '6' 0x36 */
-    0xF8, 0x44, 0x22, 0x11, 0x08, 0x40,                                                             /* '7' 0x37 */
-    0x39, 0x34, 0x53, 0x39, 0x1C, 0x51, 0x38,                                                       /* '8' 0x38 */
-    0x39, 0x3C, 0x71, 0x4C, 0xF0, 0x53, 0x78,                                                       /* '9' 0x39 */
-    0x82,                                                                                           /* ':' 0x3A */
-    0x87,                                                                                           /* ';' 0x3B */
-    0x3E, 0x30, 0x60, 0x80,                                                                         /* '<' 0x3C */
-    0xF8, 0x3E,                                                                                     /* '=' 0x3D */
-    0xE0, 0xC6, 0xC8, 0x00,                                                                         /* '>' 0x3E */
-    0x74, 0x42, 0x11, 0x10, 0x80, 0x20,                                                             /* '?' 0x3F */
-    0x0F, 0x86, 0x19, 0x9A, 0xA4, 0xD9, 0x13, 0x22, 0x56, 0xDA, 0x6E, 0x60, 0x06, 0x00, 0x3C, 0x00, /* '@' 0x40 */
-    0x18, 0x18, 0x24, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                                           /* 'A' 0x41 */
-    0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC,                                                       /* 'B' 0x42 */
-    0x3E, 0x63, 0x40, 0x40, 0xC0, 0x40, 0x41, 0x63, 0x3E,                                           /* 'C' 0x43 */
-    0xF9, 0x0A, 0x1C, 0x18, 0x30, 0x61, 0xC2, 0xF8,                                                 /* 'D' 0x44 */
-    0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC,                                                       /* 'E' 0x45 */
-    0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'F' 0x46 */
-    0x1E, 0x61, 0x40, 0x40, 0xC7, 0x41, 0x41, 0x63, 0x1D,                                           /* 'G' 0x47 */
-    0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82,                                                 /* 'H' 0x48 */
-    0xFF, 0x80,                                                                                     /* 'I' 0x49 */
-    0x08, 0x42, 0x10, 0x87, 0x29, 0x70,                                                             /* 'J' 0x4A */
-    0x85, 0x12, 0x45, 0x0D, 0x13, 0x22, 0x42, 0x86,                                                 /* 'K' 0x4B */
-    0x84, 0x21, 0x08, 0x42, 0x10, 0xF8,                                                             /* 'L' 0x4C */
-    0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99,                                           /* 'M' 0x4D */
-    0x83, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86,                                                 /* 'N' 0x4E */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x1E, 0x00,                               /* 'O' 0x4F */
-    0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'P' 0x50 */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x16, 0xC6, 0x1F, 0x00, 0x40,                         /* 'Q' 0x51 */
-    0xFD, 0x0E, 0x1C, 0x2F, 0x90, 0xA1, 0x42, 0x86,                                                 /* 'R' 0x52 */
-    0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78,                                                       /* 'S' 0x53 */
-    0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10,                                                 /* 'T' 0x54 */
-    0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE2, 0x78,                                                 /* 'U' 0x55 */
-    0xC2, 0x85, 0x0B, 0x22, 0x44, 0x8E, 0x0C, 0x18,                                                 /* 'V' 0x56 */
-    0xC4, 0x28, 0xCD, 0x29, 0x25, 0x24, 0xA4, 0x52, 0x8C, 0x61, 0x8C, 0x31, 0x80,                   /* 'W' 0x57 */
-    0x87, 0x34, 0x8C, 0x30, 0xC4, 0xA3, 0x84,                                                       /* 'X' 0x58 */
-    0xC3, 0x42, 0x24, 0x34, 0x18, 0x08, 0x08, 0x08, 0x08,                                           /* 'Y' 0x59 */
-    0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE,                                                 /* 'Z' 0x5A */
-    0xEA, 0xAA, 0xAB,                                                                               /* '[' 0x5B */
-    0x92, 0x24, 0x89, 0x20,                                                                         /* '\' 0x5C */
-    0xD5, 0x55, 0x57,                                                                               /* ']' 0x5D */
-    0x46, 0xA9,                                                                                     /* '^' 0x5E */
-    0xFE,                                                                                           /* '_' 0x5F */
-    0x80,                                                                                           /* '`' 0x60 */
-    0x79, 0x20, 0x4F, 0xC6, 0x37, 0x40,                                                             /* 'a' 0x61 */
-    0x84, 0x3D, 0x18, 0xC6, 0x31, 0xF0,                                                             /* 'b' 0x62 */
-    0x39, 0x3C, 0x20, 0xC1, 0x33, 0x80,                                                             /* 'c' 0x63 */
-    0x04, 0x13, 0xD3, 0xC6, 0x1C, 0x53, 0x3C,                                                       /* 'd' 0x64 */
-    0x39, 0x38, 0x7F, 0x81, 0x13, 0x80,                                                             /* 'e' 0x65 */
-    0x6B, 0xA4, 0x92, 0x40,                                                                         /* 'f' 0x66 */
-    0x35, 0x3C, 0x61, 0xC5, 0x33, 0x41, 0x4D, 0xE0,                                                 /* 'g' 0x67 */
-    0x84, 0x3D, 0x38, 0xC6, 0x31, 0x88,                                                             /* 'h' 0x68 */
-    0xBF, 0x80,                                                                                     /* 'i' 0x69 */
-    0x45, 0x55, 0x57,                                                                               /* 'j' 0x6A */
-    0x84, 0x25, 0x4E, 0x52, 0xD2, 0x88,                                                             /* 'k' 0x6B */
-    0xFF, 0x80,                                                                                     /* 'l' 0x6C */
-    0xF7, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91,                                                       /* 'm' 0x6D */
-    0xF4, 0x63, 0x18, 0xC6, 0x20,                                                                   /* 'n' 0x6E */
-    0x39, 0x3C, 0x61, 0xC5, 0x33, 0x80,                                                             /* 'o' 0x6F */
-    0xF4, 0x63, 0x18, 0xC7, 0xD0, 0x80,                                                             /* 'p' 0x70 */
-    0x3D, 0x3C, 0x61, 0xC5, 0x37, 0x41, 0x04,                                                       /* 'q' 0x71 */
-    0xF2, 0x49, 0x20,                                                                               /* 'r' 0x72 */
-    0x7A, 0x50, 0xE0, 0xE5, 0xE0,                                                                   /* 's' 0x73 */
-    0x5D, 0x24, 0x93,                                                                               /* 't' 0x74 */
-    0x8C, 0x63, 0x18, 0xCF, 0xA0,                                                                   /* 'u' 0x75 */
-    0x85, 0x24, 0x92, 0x30, 0xC3, 0x00,                                                             /* 'v' 0x76 */
-    0x89, 0x59, 0x59, 0x55, 0x56, 0x26, 0x26,                                                       /* 'w' 0x77 */
-    0x4A, 0x4C, 0x43, 0x27, 0x20,                                                                   /* 'x' 0x78 */
-    0x8A, 0x52, 0xA5, 0x18, 0x84, 0x22, 0x00,                                                       /* 'y' 0x79 */
-    0x78, 0x44, 0x46, 0x23, 0xE0,                                                                   /* 'z' 0x7A */
-    0x6A, 0xAA, 0xA9,                                                                               /* '{' 0x7B */
-    0xFF, 0xE0,                                                                                     /* '|' 0x7C */
-    0x95, 0x55, 0x56,                                                                               /* '}' 0x7D */
-    0x66, 0x60,                                                                                     /* '~' 0x7E */
-    0xFF, 0xC0, 0x67, 0x34, 0x58, 0x4C, 0x46, 0x03, 0x11, 0x80, 0xFF, 0xC0,                         /* 0x7F */
-    0x1C, 0x45, 0x07, 0xE4, 0x1F, 0x10, 0x10, 0x1E,                                                 /* 0x80 */
-    /* 0x81 */
-    0xE0, /* 0x82 */
-    /* 0x83 */
-    0xB6, 0x80,                               /* 0x84 */
-    0xA8,                                     /* 0x85 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0x21, 0x08, /* 0x86 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0xF9, 0x08, /* 0x87 */
-    /* 0x88 */
-    0x62, 0x09, 0x40, 0x98, 0x06, 0x80, 0x10, 0x01, 0x66, 0x29, 0x92, 0x99, 0x06, 0x60, /* 0x89 */
-    0x28, 0x47, 0xA1, 0x83, 0x07, 0x83, 0x87, 0x17, 0x80,                               /* 0x8A */
-    0x64,                                                                               /* 0x8B */
-    0x10, 0x87, 0xA1, 0x83, 0x07, 0x83, 0x87, 0x17, 0x80,                               /* 0x8C */
-    0x28, 0x4F, 0xC4, 0x10, 0x41, 0x04, 0x10, 0x40,                                     /* 0x8D */
-    0x14, 0x11, 0xF8, 0x30, 0xC1, 0x04, 0x18, 0x61, 0xFC,                               /* 0x8E */
-    0x08, 0x21, 0xF8, 0x30, 0xC1, 0x04, 0x18, 0x61, 0xFC,                               /* 0x8F */
-    /* 0x90 */
-    0xE0,       /* 0x91 */
-    0xE0,       /* 0x92 */
-    0xB6, 0x80, /* 0x93 */
-    0xB6, 0x80, /* 0x94 */
-    0xFF, 0x80, /* 0x95 */
-    0xFC,       /* 0x96 */
-    0xFF, 0xF0, /* 0x97 */
-    /* 0x98 */
-    0xE6, 0x28, 0xCD, 0x19, 0xA3, 0x34, 0x6A, 0x8B, 0x51, 0x68, /* 0x99 */
-    0x52, 0x69, 0x8E, 0x19, 0x60,                               /* 0x9A */
-    0x98,                                                       /* 0x9B */
-    0x24, 0x06, 0x98, 0xE1, 0x96,                               /* 0x9C */
-    0x15, 0xE4, 0x44, 0x44, 0x60,                               /* 0x9D */
-    0x51, 0x00, 0xF0, 0x88, 0x8C, 0x47, 0xC0,                   /* 0x9E */
-    0x11, 0x00, 0xF0, 0x88, 0x8C, 0x47, 0xC0,                   /* 0x9F */
-    /* 0xA0 */
-    0xA8,                                                             /* 0xA1 */
-    0x96,                                                             /* 0xA2 */
-    0x41, 0x05, 0x18, 0x43, 0x04, 0x10, 0x7C,                         /* 0xA3 */
-    0xFC, 0x63, 0xF0,                                                 /* 0xA4 */
-    0x30, 0x38, 0x28, 0x48, 0x4C, 0x7C, 0x84, 0x86, 0x82, 0x04, 0x07, /* 0xA5 */
-    0xF9, 0xF0,                                                       /* 0xA6 */
-    0x32, 0x91, 0xC9, 0x47, 0x26, 0x14, 0xA4, 0xC0,                   /* 0xA7 */
-    0xA0,                                                             /* 0xA8 */
-    0x3E, 0x3F, 0xB8, 0xF4, 0x1A, 0x0D, 0x17, 0x76, 0xC6, 0x3E, 0x00, /* 0xA9 */
-    0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78, 0xC1, 0x0C,             /* 0xAA */
-    0x5A, 0xA5,                                                       /* 0xAB */
-    0xFC, 0x10, 0x40,                                                 /* 0xAC */
-    /* 0xAD */
-    0x3E, 0x31, 0xB7, 0x72, 0x99, 0xCC, 0xC7, 0x56, 0xC6, 0x3E, 0x00,             /* 0xAE */
-    0x18, 0x31, 0xF8, 0x30, 0xC1, 0x04, 0x18, 0x61, 0xFC,                         /* 0xAF */
-    0x69, 0x96,                                                                   /* 0xB0 */
-    0x21, 0x3E, 0x42, 0x03, 0xE0,                                                 /* 0xB1 */
-    0x9C,                                                                         /* 0xB2 */
-    0x49, 0x35, 0x92, 0x40,                                                       /* 0xB3 */
-    0x80,                                                                         /* 0xB4 */
-    0x8A, 0x28, 0xA2, 0x8A, 0x6E, 0xE0, 0x80,                                     /* 0xB5 */
-    0x7F, 0xAE, 0xBA, 0x68, 0xA2, 0x8A, 0x28, 0xA0,                               /* 0xB6 */
-    0x80,                                                                         /* 0xB7 */
-    0x67, 0x80,                                                                   /* 0xB8 */
-    0x78, 0x84, 0x04, 0x3C, 0xC4, 0x8C, 0x76, 0x04, 0x07,                         /* 0xB9 */
-    0x69, 0x8E, 0x19, 0x66, 0x26,                                                 /* 0xBA */
-    0xA5, 0x5A,                                                                   /* 0xBB */
-    0xA5, 0x21, 0x08, 0x42, 0x10, 0xF8,                                           /* 0xBC */
-    0xA0,                                                                         /* 0xBD */
-    0xBA, 0x49, 0x24, 0x90,                                                       /* 0xBE */
-    0x31, 0x9E, 0x11, 0x11, 0x88, 0xF8,                                           /* 0xBF */
-    0x10, 0x43, 0xE4, 0x28, 0x50, 0xBE, 0x42, 0x85, 0x0C,                         /* 0xC0 */
-    0x08, 0x10, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC1 */
-    0x18, 0x24, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC2 */
-    0x24, 0x18, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC3 */
-    0x24, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                   /* 0xC4 */
-    0x11, 0x21, 0x08, 0x42, 0x10, 0x87, 0xC0,                                     /* 0xC5 */
-    0x08, 0x20, 0x01, 0xE4, 0x30, 0x20, 0x40, 0x82, 0x8C, 0xF0,                   /* 0xC6 */
-    0x3E, 0x61, 0xC0, 0x80, 0x80, 0x80, 0xC1, 0x63, 0x3E, 0x0C, 0x04, 0x1C,       /* 0xC7 */
-    0x28, 0x20, 0x01, 0xE4, 0x30, 0x20, 0x40, 0x82, 0x8C, 0xF0,                   /* 0xC8 */
-    0x08, 0x40, 0x3F, 0x82, 0x0F, 0xA0, 0x83, 0xF0,                               /* 0xC9 */
-    0xFD, 0x02, 0x04, 0x0F, 0xD0, 0x20, 0x40, 0xFC, 0x10, 0x38,                   /* 0xCA */
-    0x28, 0x0F, 0xE0, 0x83, 0xE8, 0x20, 0x83, 0xF0,                               /* 0xCB */
-    0x28, 0x40, 0x3F, 0x82, 0x0F, 0xA0, 0x82, 0x0F, 0xC0,                         /* 0xCC */
-    0x62, 0xAA, 0xA0,                                                             /* 0xCD */
-    0x54, 0x24, 0x92, 0x48,                                                       /* 0xCE */
-    0x50, 0x43, 0xE4, 0x28, 0x30, 0x60, 0xC1, 0x85, 0xF0,                         /* 0xCF */
-    0x7C, 0x42, 0x41, 0x41, 0xF1, 0x41, 0x41, 0x42, 0x7C,                         /* 0xD0 */
-    0x08, 0x23, 0x0F, 0x1B, 0x32, 0x66, 0xC7, 0x87, 0x04,                         /* 0xD1 */
-    0x28, 0x23, 0x0F, 0x1B, 0x32, 0x66, 0xC7, 0x87, 0x04,                         /* 0xD2 */
-    0x04, 0x04, 0x0F, 0x8C, 0x6C, 0x1C, 0x06, 0x03, 0x83, 0x63, 0x1F, 0x00,       /* 0xD3 */
-    0x08, 0x0A, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD4 */
-    0x0A, 0x0A, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD5 */
-    0x14, 0x00, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD6 */
-    0x8A, 0x88, 0xA8, 0x80,                                                       /* 0xD7 */
-    0x50, 0x43, 0xE4, 0x28, 0x50, 0xBE, 0x42, 0x85, 0x0C,                         /* 0xD8 */
-    0x10, 0x52, 0x4C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xD9 */
-    0x08, 0x22, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDA */
-    0x14, 0x52, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDB */
-    0x29, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDC */
-    0x09, 0x25, 0x12, 0x22, 0x87, 0x04, 0x08, 0x10, 0x20,                         /* 0xDD */
-    0xFC, 0x41, 0x04, 0x10, 0x41, 0x04, 0x10, 0x60, 0x8E,                         /* 0xDE */
-    0x7A, 0x18, 0x61, 0x8A, 0x18, 0x61, 0xB8,                                     /* 0xDF */
-    0x42, 0xE9, 0x24, 0x80,                                                       /* 0xE0 */
-    0x10, 0x40, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE1 */
-    0x10, 0x50, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE2 */
-    0x48, 0x60, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE3 */
-    0x28, 0x01, 0xE4, 0x20, 0x47, 0xB1, 0x46, 0x76,                               /* 0xE4 */
-    0x62, 0xAA, 0xA0,                                                             /* 0xE5 */
-    0x10, 0x80, 0x1E, 0xC6, 0x08, 0x20, 0xC5, 0xE0,                               /* 0xE6 */
-    0x7B, 0x18, 0x20, 0x83, 0x17, 0x8C, 0x11, 0xC0,                               /* 0xE7 */
-    0x28, 0x40, 0x1E, 0xC6, 0x08, 0x20, 0xC5, 0xE0,                               /* 0xE8 */
-    0x10, 0x80, 0x1E, 0xCE, 0x1F, 0xE0, 0xC5, 0xE0,                               /* 0xE9 */
-    0x7B, 0x38, 0x7F, 0x83, 0x37, 0x84, 0x1C,                                     /* 0xEA */
-    0x28, 0x07, 0xB3, 0x87, 0xF8, 0x31, 0x78,                                     /* 0xEB */
-    0x28, 0x40, 0x1E, 0xCE, 0x1F, 0xE0, 0xC5, 0xE0,                               /* 0xEC */
-    0x62, 0xAA, 0xA0,                                                             /* 0xED */
-    0x54, 0x24, 0x92, 0x48,                                                       /* 0xEE */
-    0x02, 0x0C, 0x13, 0xEC, 0xD0, 0xA1, 0x42, 0xCC, 0xE8,                         /* 0xEF */
-    0x04, 0x1D, 0xD6, 0x68, 0x50, 0xA1, 0x66, 0x74,                               /* 0xF0 */
-    0x11, 0x01, 0x6C, 0xC6, 0x31, 0x8C, 0x40,                                     /* 0xF1 */
-    0x20, 0x81, 0x6C, 0xC6, 0x31, 0x8C, 0x40,                                     /* 0xF2 */
-    0x10, 0x80, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF3 */
-    0x10, 0xA0, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF4 */
-    0x29, 0x40, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF5 */
-    0x28, 0x07, 0xB3, 0x86, 0x18, 0x73, 0x78,                                     /* 0xF6 */
-    0x20, 0x3E, 0x02, 0x00,                                                       /* 0xF7 */
-    0xA8, 0x5D, 0x24, 0x90,                                                       /* 0xF8 */
-    0x22, 0x89, 0x18, 0xC6, 0x31, 0x9B, 0x40,                                     /* 0xF9 */
-    0x11, 0x23, 0x18, 0xC6, 0x33, 0x68,                                           /* 0xFA */
-    0x2A, 0x81, 0x18, 0xC6, 0x31, 0x9B, 0x40,                                     /* 0xFB */
-    0x50, 0x23, 0x18, 0xC6, 0x33, 0x68,                                           /* 0xFC */
-    0x10, 0x88, 0x52, 0x49, 0x23, 0x0C, 0x30, 0x82, 0x18,                         /* 0xFD */
-    0x4E, 0x44, 0x44, 0x46, 0x31, 0x70,                                           /* 0xFE */
-    0x80,                                                                         /* 0xFF */
-};
-
-const GFXglyph FreeSans6pt_Win1250Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 3, 0, 0},
-    /* '!' 0x21 */ {0, 1, 9, 4, 2, -8},
-    /* '"' 0x22 */ {2, 3, 3, 4, 0, -8},
-    /* '#' 0x23 */ {4, 7, 8, 7, 0, -7},
-    /* '$' 0x24 */ {11, 6, 11, 7, 0, -9},
-    /* '%' 0x25 */ {20, 10, 9, 11, 0, -8},
-    /* '&' 0x26 */ {32, 6, 9, 8, 1, -8},
-    /* ''' 0x27 */ {39, 1, 3, 2, 1, -8},
-    /* '(' 0x28 */ {40, 2, 11, 4, 1, -8},
-    /* ')' 0x29 */ {43, 3, 11, 4, 0, -8},
-    /* '*' 0x2A */ {48, 3, 3, 5, 1, -8},
-    /* '+' 0x2B */ {50, 5, 5, 7, 1, -4},
-    /* ',' 0x2C */ {54, 1, 3, 3, 1, 0},
-    /* '-' 0x2D */ {55, 2, 1, 4, 1, -3},
-    /* '.' 0x2E */ {56, 1, 1, 3, 1, 0},
-    /* '/' 0x2F */ {57, 3, 9, 3, 0, -8},
-    /* '0' 0x30 */ {61, 5, 9, 7, 1, -8},
-    /* '1' 0x31 */ {67, 3, 9, 7, 1, -8},
-    /* '2' 0x32 */ {71, 6, 9, 7, 0, -8},
-    /* '3' 0x33 */ {78, 6, 9, 7, 0, -8},
-    /* '4' 0x34 */ {85, 6, 9, 7, 0, -8},
-    /* '5' 0x35 */ {92, 5, 9, 7, 1, -8},
-    /* '6' 0x36 */ {98, 5, 9, 7, 1, -8},
-    /* '7' 0x37 */ {104, 5, 9, 7, 1, -8},
-    /* '8' 0x38 */ {110, 6, 9, 7, 0, -8},
-    /* '9' 0x39 */ {117, 6, 9, 7, 0, -8},
-    /* ':' 0x3A */ {124, 1, 7, 3, 1, -6},
-    /* ';' 0x3B */ {125, 1, 8, 3, 1, -5},
-    /* '<' 0x3C */ {126, 5, 5, 7, 1, -4},
-    /* '=' 0x3D */ {130, 5, 3, 7, 1, -3},
-    /* '>' 0x3E */ {132, 5, 5, 7, 1, -4},
-    /* '?' 0x3F */ {136, 5, 9, 7, 1, -8},
-    /* '@' 0x40 */ {142, 11, 11, 12, 0, -8},
-    /* 'A' 0x41 */ {158, 8, 9, 8, 0, -8},
-    /* 'B' 0x42 */ {167, 6, 9, 8, 1, -8},
-    /* 'C' 0x43 */ {174, 8, 9, 9, 0, -8},
-    /* 'D' 0x44 */ {183, 7, 9, 8, 1, -8},
-    /* 'E' 0x45 */ {191, 6, 9, 8, 1, -8},
-    /* 'F' 0x46 */ {198, 6, 9, 7, 1, -8},
-    /* 'G' 0x47 */ {205, 8, 9, 9, 0, -8},
-    /* 'H' 0x48 */ {214, 7, 9, 9, 1, -8},
-    /* 'I' 0x49 */ {222, 1, 9, 3, 1, -8},
-    /* 'J' 0x4A */ {224, 5, 9, 6, 0, -8},
-    /* 'K' 0x4B */ {230, 7, 9, 8, 1, -8},
-    /* 'L' 0x4C */ {238, 5, 9, 7, 1, -8},
-    /* 'M' 0x4D */ {244, 8, 9, 10, 1, -8},
-    /* 'N' 0x4E */ {253, 7, 9, 9, 1, -8},
-    /* 'O' 0x4F */ {261, 9, 9, 9, 0, -8},
-    /* 'P' 0x50 */ {272, 6, 9, 8, 1, -8},
-    /* 'Q' 0x51 */ {279, 9, 10, 9, 0, -8},
-    /* 'R' 0x52 */ {291, 7, 9, 9, 1, -8},
-    /* 'S' 0x53 */ {299, 6, 9, 8, 1, -8},
-    /* 'T' 0x54 */ {306, 7, 9, 8, 0, -8},
-    /* 'U' 0x55 */ {314, 7, 9, 9, 1, -8},
-    /* 'V' 0x56 */ {322, 7, 9, 8, 0, -8},
-    /* 'W' 0x57 */ {330, 11, 9, 11, 0, -8},
-    /* 'X' 0x58 */ {343, 6, 9, 8, 1, -8},
-    /* 'Y' 0x59 */ {350, 8, 9, 8, 0, -8},
-    /* 'Z' 0x5A */ {359, 7, 9, 7, 0, -8},
-    /* '[' 0x5B */ {367, 2, 12, 3, 1, -8},
-    /* '\' 0x5C */ {370, 3, 9, 3, 0, -8},
-    /* ']' 0x5D */ {374, 2, 12, 3, 0, -8},
-    /* '^' 0x5E */ {377, 4, 4, 6, 1, -8},
-    /* '_' 0x5F */ {379, 7, 1, 7, 0, 2},
-    /* '`' 0x60 */ {380, 1, 1, 3, 1, -8},
-    /* 'a' 0x61 */ {381, 6, 7, 7, 0, -6},
-    /* 'b' 0x62 */ {387, 5, 9, 7, 1, -8},
-    /* 'c' 0x63 */ {393, 6, 7, 6, 0, -6},
-    /* 'd' 0x64 */ {399, 6, 9, 7, 0, -8},
-    /* 'e' 0x65 */ {406, 6, 7, 6, 0, -6},
-    /* 'f' 0x66 */ {412, 3, 9, 3, 0, -8},
-    /* 'g' 0x67 */ {416, 6, 10, 7, 0, -6},
-    /* 'h' 0x68 */ {424, 5, 9, 6, 1, -8},
-    /* 'i' 0x69 */ {430, 1, 9, 3, 1, -8},
-    /* 'j' 0x6A */ {432, 2, 12, 3, 0, -8},
-    /* 'k' 0x6B */ {435, 5, 9, 6, 1, -8},
-    /* 'l' 0x6C */ {441, 1, 9, 3, 1, -8},
-    /* 'm' 0x6D */ {443, 8, 7, 10, 1, -6},
-    /* 'n' 0x6E */ {450, 5, 7, 6, 1, -6},
-    /* 'o' 0x6F */ {455, 6, 7, 6, 0, -6},
-    /* 'p' 0x70 */ {461, 5, 9, 7, 1, -6},
-    /* 'q' 0x71 */ {467, 6, 9, 7, 0, -6},
-    /* 'r' 0x72 */ {474, 3, 7, 4, 1, -6},
-    /* 's' 0x73 */ {477, 5, 7, 6, 0, -6},
-    /* 't' 0x74 */ {482, 3, 8, 3, 0, -7},
-    /* 'u' 0x75 */ {485, 5, 7, 6, 1, -6},
-    /* 'v' 0x76 */ {490, 6, 7, 6, 0, -6},
-    /* 'w' 0x77 */ {496, 8, 7, 9, 0, -6},
-    /* 'x' 0x78 */ {503, 5, 7, 6, 0, -6},
-    /* 'y' 0x79 */ {508, 5, 10, 6, 0, -6},
-    /* 'z' 0x7A */ {515, 5, 7, 6, 0, -6},
-    /* '{' 0x7B */ {520, 2, 12, 4, 1, -8},
-    /* '|' 0x7C */ {523, 1, 11, 3, 1, -8},
-    /* '}' 0x7D */ {525, 2, 12, 4, 1, -8},
-    /* '~' 0x7E */ {528, 6, 2, 6, 0, -4},
-    /* 0x7F */ {530, 9, 10, 11, 1, -8},
-    /* 0x80 */ {542, 7, 9, 8, 0, -8},
-    /* 0x81 */ {550, 0, 0, 8, 0, 0},
-    /* 0x82 */ {550, 1, 3, 3, 1, 0},
-    /* 0x83 */ {551, 0, 0, 8, 0, 0},
-    /* 0x84 */ {551, 3, 3, 5, 1, 0},
-    /* 0x85 */ {553, 5, 1, 7, 1, 0},
-    /* 0x86 */ {554, 5, 11, 7, 1, -8},
-    /* 0x87 */ {561, 5, 11, 7, 1, -8},
-    /* 0x88 */ {568, 0, 0, 8, 0, 0},
-    /* 0x89 */ {568, 12, 9, 12, 0, -8},
-    /* 0x8A */ {582, 6, 11, 8, 1, -9},
-    /* 0x8B */ {591, 2, 3, 4, 1, -4},
-    /* 0x8C */ {592, 6, 11, 8, 1, -10},
-    /* 0x8D */ {601, 6, 10, 8, 0, -9},
-    /* 0x8E */ {609, 7, 10, 7, 0, -9},
-    /* 0x8F */ {618, 7, 10, 7, 0, -9},
-    /* 0x90 */ {627, 0, 0, 8, 0, 0},
-    /* 0x91 */ {627, 1, 3, 3, 1, -8},
-    /* 0x92 */ {628, 1, 3, 2, 1, -8},
-    /* 0x93 */ {629, 3, 3, 5, 1, -8},
-    /* 0x94 */ {631, 3, 3, 5, 1, -8},
-    /* 0x95 */ {633, 3, 3, 5, 1, -5},
-    /* 0x96 */ {635, 6, 1, 6, 0, -3},
-    /* 0x97 */ {636, 12, 1, 12, 0, -3},
-    /* 0x98 */ {638, 0, 0, 8, 0, 0},
-    /* 0x99 */ {638, 11, 7, 12, 1, -8},
-    /* 0x9A */ {648, 4, 9, 6, 1, -8},
-    /* 0x9B */ {653, 2, 3, 3, 1, -4},
-    /* 0x9C */ {654, 4, 10, 6, 1, -9},
-    /* 0x9D */ {659, 4, 9, 5, 0, -8},
-    /* 0x9E */ {664, 5, 10, 6, 0, -9},
-    /* 0x9F */ {671, 5, 10, 6, 0, -9},
-    /* 0xA0 */ {678, 0, 0, 3, 0, 0},
-    /* 0xA1 */ {678, 3, 2, 4, 0, -8},
-    /* 0xA2 */ {679, 4, 2, 4, 0, -8},
-    /* 0xA3 */ {680, 6, 9, 7, 0, -8},
-    /* 0xA4 */ {687, 5, 4, 7, 1, -5},
-    /* 0xA5 */ {690, 8, 11, 8, 1, -8},
-    /* 0xA6 */ {701, 1, 12, 3, 1, -8},
-    /* 0xA7 */ {703, 5, 12, 7, 1, -8},
-    /* 0xA8 */ {711, 3, 1, 4, 0, -7},
-    /* 0xA9 */ {712, 9, 9, 10, 0, -8},
-    /* 0xAA */ {723, 6, 12, 8, 1, -8},
-    /* 0xAB */ {732, 4, 4, 6, 1, -4},
-    /* 0xAC */ {734, 6, 3, 7, 1, -4},
-    /* 0xAD */ {737, 0, 0, 0, 0, 0},
-    /* 0xAE */ {737, 9, 9, 10, 0, -8},
-    /* 0xAF */ {748, 7, 10, 7, 0, -9},
-    /* 0xB0 */ {757, 4, 4, 7, 2, -8},
-    /* 0xB1 */ {759, 5, 7, 7, 1, -6},
-    /* 0xB2 */ {764, 3, 2, 4, 1, 1},
-    /* 0xB3 */ {765, 3, 9, 3, 0, -8},
-    /* 0xB4 */ {769, 1, 1, 4, 1, -8},
-    /* 0xB5 */ {770, 6, 9, 7, 1, -6},
-    /* 0xB6 */ {777, 6, 10, 6, 1, -8},
-    /* 0xB7 */ {785, 1, 1, 3, 1, -2},
-    /* 0xB8 */ {786, 3, 3, 4, 1, 1},
-    /* 0xB9 */ {788, 8, 9, 7, 0, -6},
-    /* 0xBA */ {797, 4, 10, 6, 1, -6},
-    /* 0xBB */ {802, 4, 4, 6, 1, -5},
-    /* 0xBC */ {804, 5, 9, 7, 1, -8},
-    /* 0xBD */ {810, 3, 1, 4, 0, -8},
-    /* 0xBE */ {811, 3, 10, 3, 1, -9},
-    /* 0xBF */ {815, 5, 9, 6, 0, -8},
-    /* 0xC0 */ {821, 7, 10, 9, 1, -9},
-    /* 0xC1 */ {830, 8, 10, 8, 0, -9},
-    /* 0xC2 */ {840, 8, 10, 8, 0, -9},
-    /* 0xC3 */ {850, 8, 10, 8, 0, -9},
-    /* 0xC4 */ {860, 8, 10, 8, 0, -9},
-    /* 0xC5 */ {870, 5, 10, 7, 1, -9},
-    /* 0xC6 */ {877, 7, 11, 9, 0, -10},
-    /* 0xC7 */ {887, 8, 12, 9, 0, -8},
-    /* 0xC8 */ {899, 7, 11, 9, 0, -10},
-    /* 0xC9 */ {909, 6, 10, 8, 1, -9},
-    /* 0xCA */ {917, 7, 11, 8, 1, -8},
-    /* 0xCB */ {927, 6, 10, 8, 1, -9},
-    /* 0xCC */ {935, 6, 11, 8, 1, -10},
-    /* 0xCD */ {944, 2, 10, 3, 1, -9},
-    /* 0xCE */ {947, 3, 10, 4, 0, -9},
-    /* 0xCF */ {951, 7, 10, 8, 1, -9},
-    /* 0xD0 */ {960, 8, 9, 8, 0, -8},
-    /* 0xD1 */ {969, 7, 10, 9, 1, -9},
-    /* 0xD2 */ {978, 7, 10, 9, 1, -9},
-    /* 0xD3 */ {987, 9, 10, 9, 0, -9},
-    /* 0xD4 */ {999, 9, 11, 9, 0, -10},
-    /* 0xD5 */ {1012, 9, 11, 9, 0, -10},
-    /* 0xD6 */ {1025, 9, 11, 9, 0, -10},
-    /* 0xD7 */ {1038, 5, 5, 7, 1, -5},
-    /* 0xD8 */ {1042, 7, 10, 9, 1, -9},
-    /* 0xD9 */ {1051, 7, 10, 9, 1, -9},
-    /* 0xDA */ {1060, 7, 10, 9, 1, -9},
-    /* 0xDB */ {1069, 7, 10, 9, 1, -9},
-    /* 0xDC */ {1078, 7, 10, 9, 1, -9},
-    /* 0xDD */ {1087, 7, 10, 8, 1, -9},
-    /* 0xDE */ {1096, 6, 12, 7, 0, -8},
-    /* 0xDF */ {1105, 6, 9, 7, 1, -8},
-    /* 0xE0 */ {1112, 3, 9, 4, 1, -8},
-    /* 0xE1 */ {1116, 7, 10, 7, 0, -9},
-    /* 0xE2 */ {1125, 7, 10, 7, 0, -9},
-    /* 0xE3 */ {1134, 7, 10, 7, 0, -9},
-    /* 0xE4 */ {1143, 7, 9, 7, 0, -8},
-    /* 0xE5 */ {1151, 2, 10, 3, 1, -9},
-    /* 0xE6 */ {1154, 6, 10, 6, 0, -9},
-    /* 0xE7 */ {1162, 6, 10, 6, 0, -6},
-    /* 0xE8 */ {1170, 6, 10, 6, 0, -9},
-    /* 0xE9 */ {1178, 6, 10, 6, 0, -9},
-    /* 0xEA */ {1186, 6, 9, 6, 0, -6},
-    /* 0xEB */ {1193, 6, 9, 6, 0, -8},
-    /* 0xEC */ {1200, 6, 10, 6, 0, -9},
-    /* 0xED */ {1208, 2, 10, 3, 1, -9},
-    /* 0xEE */ {1211, 3, 10, 3, 0, -9},
-    /* 0xEF */ {1215, 7, 10, 7, 0, -9},
-    /* 0xF0 */ {1224, 7, 9, 7, 0, -8},
-    /* 0xF1 */ {1232, 5, 10, 6, 1, -9},
-    /* 0xF2 */ {1239, 5, 10, 6, 1, -9},
-    /* 0xF3 */ {1246, 6, 10, 6, 0, -9},
-    /* 0xF4 */ {1254, 6, 10, 6, 0, -9},
-    /* 0xF5 */ {1262, 6, 10, 6, 0, -9},
-    /* 0xF6 */ {1270, 6, 9, 6, 0, -8},
-    /* 0xF7 */ {1277, 5, 5, 7, 1, -5},
-    /* 0xF8 */ {1281, 3, 10, 4, 1, -9},
-    /* 0xF9 */ {1285, 5, 10, 6, 1, -9},
-    /* 0xFA */ {1292, 5, 9, 6, 1, -8},
-    /* 0xFB */ {1298, 5, 10, 6, 1, -9},
-    /* 0xFC */ {1305, 5, 9, 6, 1, -8},
-    /* 0xFD */ {1311, 6, 12, 6, 0, -8},
-    /* 0xFE */ {1320, 4, 11, 3, 0, -7},
-    /* 0xFF */ {1326, 1, 1, 4, 1, -7},
-};
-
-const GFXfont FreeSans6pt_Win1250 PROGMEM = {(uint8_t *)FreeSans6pt_Win1250Bitmaps, (GFXglyph *)FreeSans6pt_Win1250Glyphs, 0x20,
-                                             0xFF, 14};
--- a/src/graphics/niche/Fonts/FreeSans6pt_Win1251.h
+++ b/src/graphics/niche/Fonts/FreeSans6pt_Win1251.h
@@ -1,457 +0,0 @@
-#pragma once
-const uint8_t FreeSans6pt_Win1251Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFC, 0x80,                                                                                     /* '!' 0x21 */
-    0xB6, 0x80,                                                                                     /* '"' 0x22 */
-    0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28,                                                       /* '#' 0x23 */
-    0x10, 0xE5, 0x55, 0x50, 0xE1, 0x65, 0x55, 0xE1, 0x00,                                           /* '$' 0x24 */
-    0x71, 0x24, 0x89, 0x22, 0x50, 0x74, 0x02, 0x70, 0xA4, 0x49, 0x11, 0xC0,                         /* '%' 0x25 */
-    0x71, 0x24, 0x9C, 0x62, 0x58, 0xA7, 0xF4,                                                       /* '&' 0x26 */
-    0xE0,                                                                                           /* ''' 0x27 */
-    0x5A, 0xAA, 0x94,                                                                               /* '(' 0x28 */
-    0x89, 0x12, 0x49, 0x29, 0x00,                                                                   /* ')' 0x29 */
-    0x5E, 0x80,                                                                                     /* '*' 0x2A */
-    0x21, 0x3E, 0x42, 0x00,                                                                         /* '+' 0x2B */
-    0xE0,                                                                                           /* ',' 0x2C */
-    0xC0,                                                                                           /* '-' 0x2D */
-    0x80,                                                                                           /* '.' 0x2E */
-    0x24, 0xA4, 0xA4, 0x80,                                                                         /* '/' 0x2F */
-    0x76, 0xE3, 0x18, 0xC6, 0x3B, 0x70,                                                             /* '0' 0x30 */
-    0x27, 0x92, 0x49, 0x20,                                                                         /* '1' 0x31 */
-    0x79, 0x10, 0x41, 0x08, 0xC6, 0x10, 0xFC,                                                       /* '2' 0x32 */
-    0x79, 0x30, 0x43, 0x18, 0x10, 0x71, 0x78,                                                       /* '3' 0x33 */
-    0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08,                                                       /* '4' 0x34 */
-    0xFC, 0x21, 0xE8, 0x84, 0x31, 0xF0,                                                             /* '5' 0x35 */
-    0x74, 0x61, 0xE8, 0xC6, 0x31, 0x70,                                                             /* '6' 0x36 */
-    0xF8, 0x44, 0x22, 0x11, 0x08, 0x40,                                                             /* '7' 0x37 */
-    0x39, 0x34, 0x53, 0x39, 0x1C, 0x51, 0x38,                                                       /* '8' 0x38 */
-    0x39, 0x3C, 0x71, 0x4C, 0xF0, 0x53, 0x78,                                                       /* '9' 0x39 */
-    0x82,                                                                                           /* ':' 0x3A */
-    0x87,                                                                                           /* ';' 0x3B */
-    0x3E, 0x30, 0x60, 0x80,                                                                         /* '<' 0x3C */
-    0xF8, 0x3E,                                                                                     /* '=' 0x3D */
-    0xE0, 0xC6, 0xC8, 0x00,                                                                         /* '>' 0x3E */
-    0x74, 0x42, 0x11, 0x10, 0x80, 0x20,                                                             /* '?' 0x3F */
-    0x0F, 0x86, 0x19, 0x9A, 0xA4, 0xD9, 0x13, 0x22, 0x56, 0xDA, 0x6E, 0x60, 0x06, 0x00, 0x3C, 0x00, /* '@' 0x40 */
-    0x18, 0x18, 0x24, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                                           /* 'A' 0x41 */
-    0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC,                                                       /* 'B' 0x42 */
-    0x3E, 0x63, 0x40, 0x40, 0xC0, 0x40, 0x41, 0x63, 0x3E,                                           /* 'C' 0x43 */
-    0xF9, 0x0A, 0x1C, 0x18, 0x30, 0x61, 0xC2, 0xF8,                                                 /* 'D' 0x44 */
-    0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC,                                                       /* 'E' 0x45 */
-    0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'F' 0x46 */
-    0x1E, 0x61, 0x40, 0x40, 0xC7, 0x41, 0x41, 0x63, 0x1D,                                           /* 'G' 0x47 */
-    0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82,                                                 /* 'H' 0x48 */
-    0xFF, 0x80,                                                                                     /* 'I' 0x49 */
-    0x08, 0x42, 0x10, 0x87, 0x29, 0x70,                                                             /* 'J' 0x4A */
-    0x85, 0x12, 0x45, 0x0D, 0x13, 0x22, 0x42, 0x86,                                                 /* 'K' 0x4B */
-    0x84, 0x21, 0x08, 0x42, 0x10, 0xF8,                                                             /* 'L' 0x4C */
-    0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99,                                           /* 'M' 0x4D */
-    0x83, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86,                                                 /* 'N' 0x4E */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x1E, 0x00,                               /* 'O' 0x4F */
-    0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'P' 0x50 */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x16, 0xC6, 0x1F, 0x00, 0x40,                         /* 'Q' 0x51 */
-    0xFD, 0x0E, 0x1C, 0x2F, 0x90, 0xA1, 0x42, 0x86,                                                 /* 'R' 0x52 */
-    0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78,                                                       /* 'S' 0x53 */
-    0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10,                                                 /* 'T' 0x54 */
-    0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE2, 0x78,                                                 /* 'U' 0x55 */
-    0xC2, 0x85, 0x0B, 0x22, 0x44, 0x8E, 0x0C, 0x18,                                                 /* 'V' 0x56 */
-    0xC4, 0x28, 0xCD, 0x29, 0x25, 0x24, 0xA4, 0x52, 0x8C, 0x61, 0x8C, 0x31, 0x80,                   /* 'W' 0x57 */
-    0x87, 0x34, 0x8C, 0x30, 0xC4, 0xA3, 0x84,                                                       /* 'X' 0x58 */
-    0xC3, 0x42, 0x24, 0x34, 0x18, 0x08, 0x08, 0x08, 0x08,                                           /* 'Y' 0x59 */
-    0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE,                                                 /* 'Z' 0x5A */
-    0xEA, 0xAA, 0xAB,                                                                               /* '[' 0x5B */
-    0x92, 0x24, 0x89, 0x20,                                                                         /* '\' 0x5C */
-    0xD5, 0x55, 0x57,                                                                               /* ']' 0x5D */
-    0x46, 0xA9,                                                                                     /* '^' 0x5E */
-    0xFE,                                                                                           /* '_' 0x5F */
-    0x80,                                                                                           /* '`' 0x60 */
-    0x79, 0x20, 0x4F, 0xC6, 0x37, 0x40,                                                             /* 'a' 0x61 */
-    0x84, 0x3D, 0x18, 0xC6, 0x31, 0xF0,                                                             /* 'b' 0x62 */
-    0x39, 0x3C, 0x20, 0xC1, 0x33, 0x80,                                                             /* 'c' 0x63 */
-    0x04, 0x13, 0xD3, 0xC6, 0x1C, 0x53, 0x3C,                                                       /* 'd' 0x64 */
-    0x39, 0x38, 0x7F, 0x81, 0x13, 0x80,                                                             /* 'e' 0x65 */
-    0x6B, 0xA4, 0x92, 0x40,                                                                         /* 'f' 0x66 */
-    0x35, 0x3C, 0x61, 0xC5, 0x33, 0x41, 0x4D, 0xE0,                                                 /* 'g' 0x67 */
-    0x84, 0x3D, 0x38, 0xC6, 0x31, 0x88,                                                             /* 'h' 0x68 */
-    0xBF, 0x80,                                                                                     /* 'i' 0x69 */
-    0x45, 0x55, 0x57,                                                                               /* 'j' 0x6A */
-    0x84, 0x25, 0x4E, 0x52, 0xD2, 0x88,                                                             /* 'k' 0x6B */
-    0xFF, 0x80,                                                                                     /* 'l' 0x6C */
-    0xF7, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91,                                                       /* 'm' 0x6D */
-    0xF4, 0x63, 0x18, 0xC6, 0x20,                                                                   /* 'n' 0x6E */
-    0x39, 0x3C, 0x61, 0xC5, 0x33, 0x80,                                                             /* 'o' 0x6F */
-    0xF4, 0x63, 0x18, 0xC7, 0xD0, 0x80,                                                             /* 'p' 0x70 */
-    0x3D, 0x3C, 0x61, 0xC5, 0x37, 0x41, 0x04,                                                       /* 'q' 0x71 */
-    0xF2, 0x49, 0x20,                                                                               /* 'r' 0x72 */
-    0x7A, 0x50, 0xE0, 0xE5, 0xE0,                                                                   /* 's' 0x73 */
-    0x5D, 0x24, 0x93,                                                                               /* 't' 0x74 */
-    0x8C, 0x63, 0x18, 0xCF, 0xA0,                                                                   /* 'u' 0x75 */
-    0x85, 0x24, 0x92, 0x30, 0xC3, 0x00,                                                             /* 'v' 0x76 */
-    0x89, 0x59, 0x59, 0x55, 0x56, 0x26, 0x26,                                                       /* 'w' 0x77 */
-    0x4A, 0x4C, 0x43, 0x27, 0x20,                                                                   /* 'x' 0x78 */
-    0x8A, 0x52, 0xA5, 0x18, 0x84, 0x22, 0x00,                                                       /* 'y' 0x79 */
-    0x78, 0x44, 0x46, 0x23, 0xE0,                                                                   /* 'z' 0x7A */
-    0x6A, 0xAA, 0xA9,                                                                               /* '{' 0x7B */
-    0xFF, 0xE0,                                                                                     /* '|' 0x7C */
-    0x95, 0x55, 0x56,                                                                               /* '}' 0x7D */
-    0x66, 0x60,                                                                                     /* '~' 0x7E */
-    0xFF, 0xC0, 0x67, 0x34, 0x58, 0x4C, 0x46, 0x03, 0x11, 0x80, 0xFF, 0xC0,                         /* 0x7F */
-    0xFC, 0x08, 0x04, 0x02, 0x01, 0xF0, 0x8C, 0x46, 0x23, 0x11, 0x80, 0xC0, 0xC0,                   /* 0x80 */
-    0x10, 0x8F, 0xE0, 0x82, 0x08, 0x20, 0x82, 0x00,                                                 /* 0x81 */
-    0xE0,                                                                                           /* 0x82 */
-    0x24, 0x0F, 0x88, 0x88, 0x80,                                                                   /* 0x83 */
-    0xB6, 0x80,                                                                                     /* 0x84 */
-    0xA8,                                                                                           /* 0x85 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0x21, 0x08,                                                       /* 0x86 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0xF9, 0x08,                                                       /* 0x87 */
-    0x1C, 0x45, 0x07, 0xE4, 0x1F, 0x10, 0x10, 0x1E,                                                 /* 0x88 */
-    0x62, 0x09, 0x40, 0x98, 0x06, 0x80, 0x10, 0x01, 0x66, 0x29, 0x92, 0x99, 0x06, 0x60,             /* 0x89 */
-    0x7C, 0x08, 0x81, 0x10, 0x22, 0x04, 0x7C, 0x88, 0x51, 0x0A, 0x21, 0x87, 0xC0,                   /* 0x8A */
-    0x64,                                                                                           /* 0x8B */
-    0x84, 0x10, 0x82, 0x10, 0x42, 0x0F, 0xFD, 0x08, 0xA1, 0x0C, 0x23, 0x87, 0xC0,                   /* 0x8C */
-    0x10, 0x88, 0xE6, 0xB3, 0x8C, 0x28, 0x92, 0x28, 0xC0,                                           /* 0x8D */
-    0xFC, 0x08, 0x04, 0x02, 0x01, 0xF0, 0x8C, 0x46, 0x23, 0x11, 0x80,                               /* 0x8E */
-    0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xFE, 0x20, 0x40,                                     /* 0x8F */
-    0x43, 0xC4, 0x1F, 0x45, 0x14, 0x51, 0x44, 0x11, 0x80,                                           /* 0x90 */
-    0xE0,                                                                                           /* 0x91 */
-    0xE0,                                                                                           /* 0x92 */
-    0xB6, 0x80,                                                                                     /* 0x93 */
-    0xB6, 0x80,                                                                                     /* 0x94 */
-    0xFF, 0x80,                                                                                     /* 0x95 */
-    0xFC,                                                                                           /* 0x96 */
-    0xFF, 0xF0,                                                                                     /* 0x97 */
-    /* 0x98 */
-    0xE6, 0x28, 0xCD, 0x19, 0xA3, 0x34, 0x6A, 0x8B, 0x51, 0x68, /* 0x99 */
-    0x78, 0x24, 0x13, 0xC9, 0x14, 0x8E, 0x7C,                   /* 0x9A */
-    0x98,                                                       /* 0x9B */
-    0x88, 0x44, 0x3F, 0xD1, 0x38, 0x8C, 0x78,                   /* 0x9C */
-    0x24, 0x09, 0xAC, 0xCA, 0x90,                               /* 0x9D */
-    0x43, 0xC4, 0x1F, 0x45, 0x14, 0x51, 0x44,                   /* 0x9E */
-    0x8C, 0x63, 0x18, 0xFC, 0x80,                               /* 0x9F */
-    /* 0xA0 */
-    0x24, 0x33, 0x0A, 0x36, 0x45, 0x8E, 0x0C, 0x10, 0x60, 0x80,       /* 0xA1 */
-    0x51, 0x22, 0x95, 0xA8, 0xC4, 0x23, 0x10,                         /* 0xA2 */
-    0x08, 0x42, 0x10, 0x86, 0x31, 0x78,                               /* 0xA3 */
-    0xFC, 0x63, 0xF0,                                                 /* 0xA4 */
-    0x07, 0xF8, 0x20, 0x82, 0x08, 0x20, 0x82, 0x00,                   /* 0xA5 */
-    0xF9, 0xF0,                                                       /* 0xA6 */
-    0x32, 0x91, 0xC9, 0x47, 0x26, 0x14, 0xA4, 0xC0,                   /* 0xA7 */
-    0x28, 0x0F, 0xE0, 0x82, 0x0F, 0xE0, 0x82, 0x0F, 0xC0,             /* 0xA8 */
-    0x3E, 0x3F, 0xB8, 0xF4, 0x1A, 0x0D, 0x17, 0x76, 0xC6, 0x3E, 0x00, /* 0xA9 */
-    0x38, 0x8A, 0x0C, 0x0F, 0x90, 0x20, 0xE3, 0x7C,                   /* 0xAA */
-    0x5A, 0xA5,                                                       /* 0xAB */
-    0x51, 0x55, 0x56,                                                 /* 0xAC */
-    /* 0xAD */
-    0x3E, 0x31, 0xB7, 0x72, 0x99, 0xCC, 0xC7, 0x56, 0xC6, 0x3E, 0x00,                   /* 0xAE */
-    0xA1, 0x24, 0x92, 0x49, 0x00,                                                       /* 0xAF */
-    0x69, 0x96,                                                                         /* 0xB0 */
-    0x21, 0x3E, 0x42, 0x03, 0xE0,                                                       /* 0xB1 */
-    0xFF, 0x80,                                                                         /* 0xB2 */
-    0xDF, 0x80,                                                                         /* 0xB3 */
-    0x27, 0xC9, 0x24,                                                                   /* 0xB4 */
-    0x8A, 0x28, 0xA2, 0x8A, 0x6E, 0xE0, 0x80,                                           /* 0xB5 */
-    0x7F, 0xAE, 0xBA, 0x68, 0xA2, 0x8A, 0x28, 0xA0,                                     /* 0xB6 */
-    0x80,                                                                               /* 0xB7 */
-    0x28, 0xA0, 0x1E, 0x47, 0xFC, 0x11, 0x78,                                           /* 0xB8 */
-    0x88, 0x44, 0x32, 0x59, 0xDA, 0xCD, 0x66, 0x6B, 0x32, 0x8B, 0x80,                   /* 0xB9 */
-    0x79, 0x1F, 0x30, 0x45, 0xE0,                                                       /* 0xBA */
-    0xA5, 0x5A,                                                                         /* 0xBB */
-    0x45, 0x55, 0x57,                                                                   /* 0xBC */
-    0x7A, 0x18, 0x70, 0x78, 0x38, 0x61, 0x7C,                                           /* 0xBD */
-    0x7A, 0x1C, 0x1C, 0xBC,                                                             /* 0xBE */
-    0xB4, 0x24, 0x92, 0x40,                                                             /* 0xBF */
-    0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                               /* 0xC0 */
-    0xFE, 0x08, 0x20, 0xFA, 0x18, 0x61, 0xF8,                                           /* 0xC1 */
-    0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC,                                           /* 0xC2 */
-    0xFE, 0x08, 0x20, 0x82, 0x08, 0x20, 0x80,                                           /* 0xC3 */
-    0x1F, 0x08, 0x84, 0x42, 0x21, 0x10, 0x88, 0x44, 0x42, 0xFF, 0xC0, 0x60, 0x20,       /* 0xC4 */
-    0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC,                                           /* 0xC5 */
-    0x88, 0xA4, 0x9A, 0x87, 0xC1, 0xC1, 0xF1, 0xAD, 0x92, 0x88, 0x80,                   /* 0xC6 */
-    0x7A, 0x18, 0x41, 0x38, 0x18, 0x61, 0x7C,                                           /* 0xC7 */
-    0x87, 0x0E, 0x2C, 0x59, 0x34, 0x68, 0xE1, 0xC2,                                     /* 0xC8 */
-    0x28, 0x22, 0x1C, 0x38, 0xB1, 0x64, 0xD1, 0xA3, 0x87, 0x08,                         /* 0xC9 */
-    0x8E, 0x6B, 0x38, 0xC2, 0x89, 0x22, 0x8C,                                           /* 0xCA */
-    0x3E, 0x44, 0x89, 0x12, 0x24, 0x58, 0xA1, 0xC2,                                     /* 0xCB */
-    0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99,                               /* 0xCC */
-    0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82,                                     /* 0xCD */
-    0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0xC2, 0x7C,                               /* 0xCE */
-    0xFF, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x82,                                     /* 0xCF */
-    0xFA, 0x18, 0x61, 0xFE, 0x08, 0x20, 0x80,                                           /* 0xD0 */
-    0x38, 0x8A, 0x0C, 0x08, 0x10, 0x20, 0xE3, 0x7C,                                     /* 0xD1 */
-    0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10,                                     /* 0xD2 */
-    0xC2, 0x8D, 0x91, 0x63, 0x83, 0x04, 0x18, 0x20,                                     /* 0xD3 */
-    0x08, 0x1F, 0x32, 0x71, 0x18, 0x8C, 0x47, 0x26, 0xFE, 0x08, 0x00,                   /* 0xD4 */
-    0x87, 0x34, 0x8C, 0x30, 0xC4, 0xB3, 0x84,                                           /* 0xD5 */
-    0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFF, 0x01, 0x01,                   /* 0xD6 */
-    0x8E, 0x38, 0xE3, 0x8D, 0xF0, 0xC3, 0x0C,                                           /* 0xD7 */
-    0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xFF,                               /* 0xD8 */
-    0x99, 0x4C, 0xA6, 0x53, 0x29, 0x94, 0xCA, 0x65, 0x32, 0xFF, 0x80, 0x40, 0x20,       /* 0xD9 */
-    0xF0, 0x04, 0x01, 0x00, 0x40, 0x1F, 0x84, 0x21, 0x0C, 0x42, 0x1F, 0x00,             /* 0xDA */
-    0x81, 0xC0, 0xE0, 0x70, 0x3F, 0xDC, 0x2E, 0x17, 0x0B, 0xF9, 0x80,                   /* 0xDB */
-    0x82, 0x08, 0x20, 0xFE, 0x18, 0x61, 0xF8,                                           /* 0xDC */
-    0x79, 0x8A, 0x18, 0x13, 0xE0, 0x60, 0xC2, 0x7C,                                     /* 0xDD */
-    0x87, 0x26, 0x39, 0x06, 0x41, 0xF0, 0x64, 0x19, 0x06, 0x63, 0x8F, 0x80,             /* 0xDE */
-    0x7E, 0x18, 0x61, 0x7C, 0xD6, 0x71, 0x84,                                           /* 0xDF */
-    0x79, 0x11, 0xD9, 0xCD, 0xD0,                                                       /* 0xE0 */
-    0x0D, 0xC4, 0x1E, 0x47, 0x1C, 0x51, 0x78,                                           /* 0xE1 */
-    0xF4, 0xBD, 0x29, 0xF8,                                                             /* 0xE2 */
-    0xF8, 0x88, 0x88,                                                                   /* 0xE3 */
-    0x3C, 0x48, 0x91, 0x22, 0x5F, 0xE0, 0x80,                                           /* 0xE4 */
-    0x79, 0x1F, 0xF0, 0x45, 0xE0,                                                       /* 0xE5 */
-    0x92, 0x54, 0x38, 0x3C, 0x56, 0x93,                                                 /* 0xE6 */
-    0x78, 0x23, 0x82, 0xCD, 0xE0,                                                       /* 0xE7 */
-    0x9C, 0xEB, 0x5C, 0xC4,                                                             /* 0xE8 */
-    0x70, 0x27, 0x3A, 0xD7, 0x31,                                                       /* 0xE9 */
-    0x9A, 0xCC, 0xA9,                                                                   /* 0xEA */
-    0x7A, 0x52, 0x94, 0xE4,                                                             /* 0xEB */
-    0x8F, 0x3D, 0x6D, 0xA6, 0x90,                                                       /* 0xEC */
-    0x8C, 0x7F, 0x18, 0xC4,                                                             /* 0xED */
-    0x79, 0x1C, 0x71, 0x45, 0xE0,                                                       /* 0xEE */
-    0xFC, 0x63, 0x18, 0xC4,                                                             /* 0xEF */
-    0xFC, 0x63, 0x18, 0xFA, 0x10, 0x80,                                                 /* 0xF0 */
-    0x79, 0x1C, 0x30, 0x45, 0xE0,                                                       /* 0xF1 */
-    0xF9, 0x08, 0x42, 0x10,                                                             /* 0xF2 */
-    0x8A, 0x56, 0xA3, 0x10, 0x8C, 0x40,                                                 /* 0xF3 */
-    0x04, 0x01, 0x07, 0xF9, 0x31, 0xC4, 0x71, 0x14, 0xC5, 0xFE, 0x04, 0x01, 0x00, 0x40, /* 0xF4 */
-    0x4B, 0x8C, 0x65, 0xE4,                                                             /* 0xF5 */
-    0x8A, 0x28, 0xA2, 0x8B, 0xF0, 0x40,                                                 /* 0xF6 */
-    0x99, 0x97, 0x11,                                                                   /* 0xF7 */
-    0x96, 0x59, 0x65, 0x97, 0xF0,                                                       /* 0xF8 */
-    0x95, 0x2A, 0x54, 0xA9, 0x5F, 0xC0, 0x80,                                           /* 0xF9 */
-    0xF0, 0x20, 0x78, 0x91, 0x23, 0xC0,                                                 /* 0xFA */
-    0x86, 0x1F, 0x63, 0x8F, 0xD0,                                                       /* 0xFB */
-    0x84, 0x3D, 0x18, 0xF8,                                                             /* 0xFC */
-    0xF4, 0xDE, 0x19, 0xF8,                                                             /* 0xFD */
-    0x9E, 0xA2, 0xE1, 0xA1, 0xA2, 0x9E,                                                 /* 0xFE */
-    0xFC, 0x7E, 0xD4, 0xC4,                                                             /* 0xFF */
-};
-
-const GFXglyph FreeSans6pt_Win1251Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 3, 0, 0},
-    /* '!' 0x21 */ {0, 1, 9, 4, 2, -8},
-    /* '"' 0x22 */ {2, 3, 3, 4, 0, -8},
-    /* '#' 0x23 */ {4, 7, 8, 7, 0, -7},
-    /* '$' 0x24 */ {11, 6, 11, 7, 0, -9},
-    /* '%' 0x25 */ {20, 10, 9, 11, 0, -8},
-    /* '&' 0x26 */ {32, 6, 9, 8, 1, -8},
-    /* ''' 0x27 */ {39, 1, 3, 2, 1, -8},
-    /* '(' 0x28 */ {40, 2, 11, 4, 1, -8},
-    /* ')' 0x29 */ {43, 3, 11, 4, 0, -8},
-    /* '*' 0x2A */ {48, 3, 3, 5, 1, -8},
-    /* '+' 0x2B */ {50, 5, 5, 7, 1, -4},
-    /* ',' 0x2C */ {54, 1, 3, 3, 1, 0},
-    /* '-' 0x2D */ {55, 2, 1, 4, 1, -3},
-    /* '.' 0x2E */ {56, 1, 1, 3, 1, 0},
-    /* '/' 0x2F */ {57, 3, 9, 3, 0, -8},
-    /* '0' 0x30 */ {61, 5, 9, 7, 1, -8},
-    /* '1' 0x31 */ {67, 3, 9, 7, 1, -8},
-    /* '2' 0x32 */ {71, 6, 9, 7, 0, -8},
-    /* '3' 0x33 */ {78, 6, 9, 7, 0, -8},
-    /* '4' 0x34 */ {85, 6, 9, 7, 0, -8},
-    /* '5' 0x35 */ {92, 5, 9, 7, 1, -8},
-    /* '6' 0x36 */ {98, 5, 9, 7, 1, -8},
-    /* '7' 0x37 */ {104, 5, 9, 7, 1, -8},
-    /* '8' 0x38 */ {110, 6, 9, 7, 0, -8},
-    /* '9' 0x39 */ {117, 6, 9, 7, 0, -8},
-    /* ':' 0x3A */ {124, 1, 7, 3, 1, -6},
-    /* ';' 0x3B */ {125, 1, 8, 3, 1, -5},
-    /* '<' 0x3C */ {126, 5, 5, 7, 1, -4},
-    /* '=' 0x3D */ {130, 5, 3, 7, 1, -3},
-    /* '>' 0x3E */ {132, 5, 5, 7, 1, -4},
-    /* '?' 0x3F */ {136, 5, 9, 7, 1, -8},
-    /* '@' 0x40 */ {142, 11, 11, 12, 0, -8},
-    /* 'A' 0x41 */ {158, 8, 9, 8, 0, -8},
-    /* 'B' 0x42 */ {167, 6, 9, 8, 1, -8},
-    /* 'C' 0x43 */ {174, 8, 9, 9, 0, -8},
-    /* 'D' 0x44 */ {183, 7, 9, 8, 1, -8},
-    /* 'E' 0x45 */ {191, 6, 9, 8, 1, -8},
-    /* 'F' 0x46 */ {198, 6, 9, 7, 1, -8},
-    /* 'G' 0x47 */ {205, 8, 9, 9, 0, -8},
-    /* 'H' 0x48 */ {214, 7, 9, 9, 1, -8},
-    /* 'I' 0x49 */ {222, 1, 9, 3, 1, -8},
-    /* 'J' 0x4A */ {224, 5, 9, 6, 0, -8},
-    /* 'K' 0x4B */ {230, 7, 9, 8, 1, -8},
-    /* 'L' 0x4C */ {238, 5, 9, 7, 1, -8},
-    /* 'M' 0x4D */ {244, 8, 9, 10, 1, -8},
-    /* 'N' 0x4E */ {253, 7, 9, 9, 1, -8},
-    /* 'O' 0x4F */ {261, 9, 9, 9, 0, -8},
-    /* 'P' 0x50 */ {272, 6, 9, 8, 1, -8},
-    /* 'Q' 0x51 */ {279, 9, 10, 9, 0, -8},
-    /* 'R' 0x52 */ {291, 7, 9, 9, 1, -8},
-    /* 'S' 0x53 */ {299, 6, 9, 8, 1, -8},
-    /* 'T' 0x54 */ {306, 7, 9, 8, 0, -8},
-    /* 'U' 0x55 */ {314, 7, 9, 9, 1, -8},
-    /* 'V' 0x56 */ {322, 7, 9, 8, 0, -8},
-    /* 'W' 0x57 */ {330, 11, 9, 11, 0, -8},
-    /* 'X' 0x58 */ {343, 6, 9, 8, 1, -8},
-    /* 'Y' 0x59 */ {350, 8, 9, 8, 0, -8},
-    /* 'Z' 0x5A */ {359, 7, 9, 7, 0, -8},
-    /* '[' 0x5B */ {367, 2, 12, 3, 1, -8},
-    /* '\' 0x5C */ {370, 3, 9, 3, 0, -8},
-    /* ']' 0x5D */ {374, 2, 12, 3, 0, -8},
-    /* '^' 0x5E */ {377, 4, 4, 6, 1, -8},
-    /* '_' 0x5F */ {379, 7, 1, 7, 0, 2},
-    /* '`' 0x60 */ {380, 1, 1, 3, 1, -8},
-    /* 'a' 0x61 */ {381, 6, 7, 7, 0, -6},
-    /* 'b' 0x62 */ {387, 5, 9, 7, 1, -8},
-    /* 'c' 0x63 */ {393, 6, 7, 6, 0, -6},
-    /* 'd' 0x64 */ {399, 6, 9, 7, 0, -8},
-    /* 'e' 0x65 */ {406, 6, 7, 6, 0, -6},
-    /* 'f' 0x66 */ {412, 3, 9, 3, 0, -8},
-    /* 'g' 0x67 */ {416, 6, 10, 7, 0, -6},
-    /* 'h' 0x68 */ {424, 5, 9, 6, 1, -8},
-    /* 'i' 0x69 */ {430, 1, 9, 3, 1, -8},
-    /* 'j' 0x6A */ {432, 2, 12, 3, 0, -8},
-    /* 'k' 0x6B */ {435, 5, 9, 6, 1, -8},
-    /* 'l' 0x6C */ {441, 1, 9, 3, 1, -8},
-    /* 'm' 0x6D */ {443, 8, 7, 10, 1, -6},
-    /* 'n' 0x6E */ {450, 5, 7, 6, 1, -6},
-    /* 'o' 0x6F */ {455, 6, 7, 6, 0, -6},
-    /* 'p' 0x70 */ {461, 5, 9, 7, 1, -6},
-    /* 'q' 0x71 */ {467, 6, 9, 7, 0, -6},
-    /* 'r' 0x72 */ {474, 3, 7, 4, 1, -6},
-    /* 's' 0x73 */ {477, 5, 7, 6, 0, -6},
-    /* 't' 0x74 */ {482, 3, 8, 3, 0, -7},
-    /* 'u' 0x75 */ {485, 5, 7, 6, 1, -6},
-    /* 'v' 0x76 */ {490, 6, 7, 6, 0, -6},
-    /* 'w' 0x77 */ {496, 8, 7, 9, 0, -6},
-    /* 'x' 0x78 */ {503, 5, 7, 6, 0, -6},
-    /* 'y' 0x79 */ {508, 5, 10, 6, 0, -6},
-    /* 'z' 0x7A */ {515, 5, 7, 6, 0, -6},
-    /* '{' 0x7B */ {520, 2, 12, 4, 1, -8},
-    /* '|' 0x7C */ {523, 1, 11, 3, 1, -8},
-    /* '}' 0x7D */ {525, 2, 12, 4, 1, -8},
-    /* '~' 0x7E */ {528, 6, 2, 6, 0, -4},
-    /* 0x7F */ {530, 9, 10, 11, 1, -8},
-    /* 0x80 */ {542, 9, 11, 9, 0, -8},
-    /* 0x81 */ {555, 6, 10, 7, 1, -9},
-    /* 0x82 */ {563, 1, 3, 3, 1, 0},
-    /* 0x83 */ {564, 4, 9, 5, 1, -8},
-    /* 0x84 */ {569, 3, 3, 5, 1, 0},
-    /* 0x85 */ {571, 5, 1, 7, 1, 0},
-    /* 0x86 */ {572, 5, 11, 7, 1, -8},
-    /* 0x87 */ {579, 5, 11, 7, 1, -8},
-    /* 0x88 */ {586, 7, 9, 8, 0, -8},
-    /* 0x89 */ {594, 12, 9, 12, 0, -8},
-    /* 0x8A */ {608, 11, 9, 13, 1, -8},
-    /* 0x8B */ {621, 2, 3, 4, 1, -4},
-    /* 0x8C */ {622, 11, 9, 12, 1, -8},
-    /* 0x8D */ {635, 6, 11, 8, 1, -10},
-    /* 0x8E */ {644, 9, 9, 9, 0, -8},
-    /* 0x8F */ {655, 7, 11, 9, 1, -8},
-    /* 0x90 */ {665, 6, 11, 7, 0, -8},
-    /* 0x91 */ {674, 1, 3, 3, 1, -8},
-    /* 0x92 */ {675, 1, 3, 2, 1, -8},
-    /* 0x93 */ {676, 3, 3, 5, 1, -8},
-    /* 0x94 */ {678, 3, 3, 5, 1, -8},
-    /* 0x95 */ {680, 3, 3, 5, 1, -5},
-    /* 0x96 */ {682, 6, 1, 6, 0, -3},
-    /* 0x97 */ {683, 12, 1, 12, 0, -3},
-    /* 0x98 */ {685, 0, 0, 8, 0, 0},
-    /* 0x99 */ {685, 11, 7, 12, 1, -8},
-    /* 0x9A */ {695, 9, 6, 10, 0, -5},
-    /* 0x9B */ {702, 2, 3, 3, 1, -4},
-    /* 0x9C */ {703, 9, 6, 10, 1, -5},
-    /* 0x9D */ {710, 4, 9, 6, 1, -8},
-    /* 0x9E */ {715, 6, 9, 7, 0, -8},
-    /* 0x9F */ {722, 5, 7, 7, 1, -5},
-    /* 0xA0 */ {727, 0, 0, 3, 0, 0},
-    /* 0xA1 */ {727, 7, 11, 7, 0, -10},
-    /* 0xA2 */ {737, 5, 11, 6, 0, -7},
-    /* 0xA3 */ {744, 5, 9, 6, 0, -8},
-    /* 0xA4 */ {750, 5, 4, 7, 1, -5},
-    /* 0xA5 */ {753, 6, 10, 7, 1, -9},
-    /* 0xA6 */ {761, 1, 12, 3, 1, -8},
-    /* 0xA7 */ {763, 5, 12, 7, 1, -8},
-    /* 0xA8 */ {771, 6, 11, 8, 1, -10},
-    /* 0xA9 */ {780, 9, 9, 10, 0, -8},
-    /* 0xAA */ {791, 7, 9, 9, 1, -8},
-    /* 0xAB */ {799, 4, 4, 6, 1, -4},
-    /* 0xAC */ {801, 2, 12, 3, 0, -8},
-    /* 0xAD */ {804, 0, 0, 0, 0, 0},
-    /* 0xAE */ {804, 9, 9, 10, 0, -8},
-    /* 0xAF */ {815, 3, 11, 3, 0, -10},
-    /* 0xB0 */ {820, 4, 4, 7, 2, -8},
-    /* 0xB1 */ {822, 5, 7, 7, 1, -6},
-    /* 0xB2 */ {827, 1, 9, 3, 1, -8},
-    /* 0xB3 */ {829, 1, 9, 3, 1, -8},
-    /* 0xB4 */ {831, 3, 8, 5, 1, -7},
-    /* 0xB5 */ {834, 6, 9, 7, 1, -6},
-    /* 0xB6 */ {841, 6, 10, 6, 1, -8},
-    /* 0xB7 */ {849, 1, 1, 3, 1, -2},
-    /* 0xB8 */ {850, 6, 9, 7, 0, -8},
-    /* 0xB9 */ {857, 9, 9, 11, 1, -8},
-    /* 0xBA */ {868, 6, 6, 6, 0, -5},
-    /* 0xBB */ {873, 4, 4, 6, 1, -5},
-    /* 0xBC */ {875, 2, 12, 3, 0, -8},
-    /* 0xBD */ {878, 6, 9, 8, 1, -8},
-    /* 0xBE */ {885, 5, 6, 6, 0, -5},
-    /* 0xBF */ {889, 3, 9, 3, 0, -8},
-    /* 0xC0 */ {893, 8, 9, 8, 0, -8},
-    /* 0xC1 */ {902, 6, 9, 8, 1, -8},
-    /* 0xC2 */ {909, 6, 9, 8, 1, -8},
-    /* 0xC3 */ {916, 6, 9, 7, 1, -8},
-    /* 0xC4 */ {923, 9, 11, 10, 0, -8},
-    /* 0xC5 */ {936, 6, 9, 8, 1, -8},
-    /* 0xC6 */ {943, 9, 9, 11, 1, -8},
-    /* 0xC7 */ {954, 6, 9, 8, 1, -8},
-    /* 0xC8 */ {961, 7, 9, 9, 1, -8},
-    /* 0xC9 */ {969, 7, 11, 9, 1, -10},
-    /* 0xCA */ {979, 6, 9, 8, 1, -8},
-    /* 0xCB */ {986, 7, 9, 8, 0, -8},
-    /* 0xCC */ {994, 8, 9, 10, 1, -8},
-    /* 0xCD */ {1003, 7, 9, 9, 1, -8},
-    /* 0xCE */ {1011, 8, 9, 10, 1, -8},
-    /* 0xCF */ {1020, 7, 9, 9, 1, -8},
-    /* 0xD0 */ {1028, 6, 9, 8, 1, -8},
-    /* 0xD1 */ {1035, 7, 9, 9, 1, -8},
-    /* 0xD2 */ {1043, 7, 9, 7, 0, -8},
-    /* 0xD3 */ {1051, 7, 9, 7, 0, -8},
-    /* 0xD4 */ {1059, 9, 9, 10, 1, -8},
-    /* 0xD5 */ {1070, 6, 9, 8, 1, -8},
-    /* 0xD6 */ {1077, 8, 11, 9, 1, -8},
-    /* 0xD7 */ {1088, 6, 9, 8, 1, -8},
-    /* 0xD8 */ {1095, 8, 9, 10, 1, -8},
-    /* 0xD9 */ {1104, 9, 11, 10, 1, -8},
-    /* 0xDA */ {1117, 10, 9, 10, 0, -8},
-    /* 0xDB */ {1129, 9, 9, 10, 1, -8},
-    /* 0xDC */ {1140, 6, 9, 8, 1, -8},
-    /* 0xDD */ {1147, 7, 9, 9, 1, -8},
-    /* 0xDE */ {1155, 10, 9, 12, 1, -8},
-    /* 0xDF */ {1167, 6, 9, 8, 1, -8},
-    /* 0xE0 */ {1174, 6, 6, 7, 0, -5},
-    /* 0xE1 */ {1179, 6, 9, 7, 0, -8},
-    /* 0xE2 */ {1186, 5, 6, 6, 1, -5},
-    /* 0xE3 */ {1190, 4, 6, 5, 1, -5},
-    /* 0xE4 */ {1193, 7, 7, 7, 0, -5},
-    /* 0xE5 */ {1200, 6, 6, 7, 0, -5},
-    /* 0xE6 */ {1205, 8, 6, 9, 1, -5},
-    /* 0xE7 */ {1211, 6, 6, 6, 0, -5},
-    /* 0xE8 */ {1216, 5, 6, 7, 1, -5},
-    /* 0xE9 */ {1220, 5, 8, 7, 1, -7},
-    /* 0xEA */ {1225, 4, 6, 6, 1, -5},
-    /* 0xEB */ {1228, 5, 6, 6, 0, -5},
-    /* 0xEC */ {1232, 6, 6, 7, 1, -5},
-    /* 0xED */ {1237, 5, 6, 7, 1, -5},
-    /* 0xEE */ {1241, 6, 6, 7, 0, -5},
-    /* 0xEF */ {1246, 5, 6, 7, 1, -5},
-    /* 0xF0 */ {1250, 5, 9, 7, 1, -5},
-    /* 0xF1 */ {1256, 6, 6, 6, 0, -5},
-    /* 0xF2 */ {1261, 5, 6, 5, 0, -5},
-    /* 0xF3 */ {1265, 5, 9, 6, 0, -5},
-    /* 0xF4 */ {1271, 10, 11, 10, 0, -7},
-    /* 0xF5 */ {1285, 5, 6, 6, 0, -5},
-    /* 0xF6 */ {1289, 6, 7, 7, 1, -5},
-    /* 0xF7 */ {1295, 4, 6, 6, 1, -5},
-    /* 0xF8 */ {1298, 6, 6, 8, 1, -5},
-    /* 0xF9 */ {1303, 7, 7, 9, 1, -5},
-    /* 0xFA */ {1310, 7, 6, 8, 0, -5},
-    /* 0xFB */ {1316, 6, 6, 8, 1, -5},
-    /* 0xFC */ {1321, 5, 6, 6, 1, -5},
-    /* 0xFD */ {1325, 5, 6, 6, 1, -5},
-    /* 0xFE */ {1329, 8, 6, 9, 1, -5},
-    /* 0xFF */ {1335, 5, 6, 7, 1, -5},
-};
-
-const GFXfont FreeSans6pt_Win1251 PROGMEM = {(uint8_t *)FreeSans6pt_Win1251Bitmaps, (GFXglyph *)FreeSans6pt_Win1251Glyphs, 0x20,
-                                             0xFF, 14};
--- a/src/graphics/niche/Fonts/FreeSans6pt_Win1252.h
+++ b/src/graphics/niche/Fonts/FreeSans6pt_Win1252.h
@@ -1,457 +0,0 @@
-#pragma once
-const uint8_t FreeSans6pt_Win1252Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFC, 0x80,                                                                                     /* '!' 0x21 */
-    0xB6, 0x80,                                                                                     /* '"' 0x22 */
-    0x24, 0x51, 0xF9, 0x42, 0x9F, 0x92, 0x28,                                                       /* '#' 0x23 */
-    0x10, 0xE5, 0x55, 0x50, 0xE1, 0x65, 0x55, 0xE1, 0x00,                                           /* '$' 0x24 */
-    0x71, 0x24, 0x89, 0x22, 0x50, 0x74, 0x02, 0x70, 0xA4, 0x49, 0x11, 0xC0,                         /* '%' 0x25 */
-    0x71, 0x24, 0x9C, 0x62, 0x58, 0xA7, 0xF4,                                                       /* '&' 0x26 */
-    0xE0,                                                                                           /* ''' 0x27 */
-    0x5A, 0xAA, 0x94,                                                                               /* '(' 0x28 */
-    0x89, 0x12, 0x49, 0x29, 0x00,                                                                   /* ')' 0x29 */
-    0x5E, 0x80,                                                                                     /* '*' 0x2A */
-    0x21, 0x3E, 0x42, 0x00,                                                                         /* '+' 0x2B */
-    0xE0,                                                                                           /* ',' 0x2C */
-    0xC0,                                                                                           /* '-' 0x2D */
-    0x80,                                                                                           /* '.' 0x2E */
-    0x24, 0xA4, 0xA4, 0x80,                                                                         /* '/' 0x2F */
-    0x76, 0xE3, 0x18, 0xC6, 0x3B, 0x70,                                                             /* '0' 0x30 */
-    0x27, 0x92, 0x49, 0x20,                                                                         /* '1' 0x31 */
-    0x79, 0x10, 0x41, 0x08, 0xC6, 0x10, 0xFC,                                                       /* '2' 0x32 */
-    0x79, 0x30, 0x43, 0x18, 0x10, 0x71, 0x78,                                                       /* '3' 0x33 */
-    0x08, 0x61, 0x8A, 0x49, 0x2F, 0xC2, 0x08,                                                       /* '4' 0x34 */
-    0xFC, 0x21, 0xE8, 0x84, 0x31, 0xF0,                                                             /* '5' 0x35 */
-    0x74, 0x61, 0xE8, 0xC6, 0x31, 0x70,                                                             /* '6' 0x36 */
-    0xF8, 0x44, 0x22, 0x11, 0x08, 0x40,                                                             /* '7' 0x37 */
-    0x39, 0x34, 0x53, 0x39, 0x1C, 0x51, 0x38,                                                       /* '8' 0x38 */
-    0x39, 0x3C, 0x71, 0x4C, 0xF0, 0x53, 0x78,                                                       /* '9' 0x39 */
-    0x82,                                                                                           /* ':' 0x3A */
-    0x87,                                                                                           /* ';' 0x3B */
-    0x3E, 0x30, 0x60, 0x80,                                                                         /* '<' 0x3C */
-    0xF8, 0x3E,                                                                                     /* '=' 0x3D */
-    0xE0, 0xC6, 0xC8, 0x00,                                                                         /* '>' 0x3E */
-    0x74, 0x42, 0x11, 0x10, 0x80, 0x20,                                                             /* '?' 0x3F */
-    0x0F, 0x86, 0x19, 0x9A, 0xA4, 0xD9, 0x13, 0x22, 0x56, 0xDA, 0x6E, 0x60, 0x06, 0x00, 0x3C, 0x00, /* '@' 0x40 */
-    0x18, 0x18, 0x24, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                                           /* 'A' 0x41 */
-    0xFA, 0x18, 0x61, 0xFA, 0x18, 0x61, 0xFC,                                                       /* 'B' 0x42 */
-    0x3E, 0x63, 0x40, 0x40, 0xC0, 0x40, 0x41, 0x63, 0x3E,                                           /* 'C' 0x43 */
-    0xF9, 0x0A, 0x1C, 0x18, 0x30, 0x61, 0xC2, 0xF8,                                                 /* 'D' 0x44 */
-    0xFE, 0x08, 0x20, 0xFE, 0x08, 0x20, 0xFC,                                                       /* 'E' 0x45 */
-    0xFE, 0x08, 0x20, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'F' 0x46 */
-    0x1E, 0x61, 0x40, 0x40, 0xC7, 0x41, 0x41, 0x63, 0x1D,                                           /* 'G' 0x47 */
-    0x83, 0x06, 0x0C, 0x1F, 0xF0, 0x60, 0xC1, 0x82,                                                 /* 'H' 0x48 */
-    0xFF, 0x80,                                                                                     /* 'I' 0x49 */
-    0x08, 0x42, 0x10, 0x87, 0x29, 0x70,                                                             /* 'J' 0x4A */
-    0x85, 0x12, 0x45, 0x0D, 0x13, 0x22, 0x42, 0x86,                                                 /* 'K' 0x4B */
-    0x84, 0x21, 0x08, 0x42, 0x10, 0xF8,                                                             /* 'L' 0x4C */
-    0xC3, 0xC3, 0xC3, 0xA5, 0xA5, 0xA5, 0x99, 0x99, 0x99,                                           /* 'M' 0x4D */
-    0x83, 0x86, 0x8D, 0x19, 0x33, 0x62, 0xC3, 0x86,                                                 /* 'N' 0x4E */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x06, 0xC6, 0x1E, 0x00,                               /* 'O' 0x4F */
-    0xFA, 0x18, 0x61, 0xFA, 0x08, 0x20, 0x80,                                                       /* 'P' 0x50 */
-    0x1E, 0x31, 0x90, 0x68, 0x1C, 0x0A, 0x05, 0x16, 0xC6, 0x1F, 0x00, 0x40,                         /* 'Q' 0x51 */
-    0xFD, 0x0E, 0x1C, 0x2F, 0x90, 0xA1, 0x42, 0x86,                                                 /* 'R' 0x52 */
-    0x7A, 0x18, 0x30, 0x78, 0x38, 0x61, 0x78,                                                       /* 'S' 0x53 */
-    0xFE, 0x20, 0x40, 0x81, 0x02, 0x04, 0x08, 0x10,                                                 /* 'T' 0x54 */
-    0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xE2, 0x78,                                                 /* 'U' 0x55 */
-    0xC2, 0x85, 0x0B, 0x22, 0x44, 0x8E, 0x0C, 0x18,                                                 /* 'V' 0x56 */
-    0xC4, 0x28, 0xCD, 0x29, 0x25, 0x24, 0xA4, 0x52, 0x8C, 0x61, 0x8C, 0x31, 0x80,                   /* 'W' 0x57 */
-    0x87, 0x34, 0x8C, 0x30, 0xC4, 0xA3, 0x84,                                                       /* 'X' 0x58 */
-    0xC3, 0x42, 0x24, 0x34, 0x18, 0x08, 0x08, 0x08, 0x08,                                           /* 'Y' 0x59 */
-    0x7E, 0x0C, 0x30, 0x41, 0x06, 0x18, 0x20, 0xFE,                                                 /* 'Z' 0x5A */
-    0xEA, 0xAA, 0xAB,                                                                               /* '[' 0x5B */
-    0x92, 0x24, 0x89, 0x20,                                                                         /* '\' 0x5C */
-    0xD5, 0x55, 0x57,                                                                               /* ']' 0x5D */
-    0x46, 0xA9,                                                                                     /* '^' 0x5E */
-    0xFE,                                                                                           /* '_' 0x5F */
-    0x80,                                                                                           /* '`' 0x60 */
-    0x79, 0x20, 0x4F, 0xC6, 0x37, 0x40,                                                             /* 'a' 0x61 */
-    0x84, 0x3D, 0x18, 0xC6, 0x31, 0xF0,                                                             /* 'b' 0x62 */
-    0x39, 0x3C, 0x20, 0xC1, 0x33, 0x80,                                                             /* 'c' 0x63 */
-    0x04, 0x13, 0xD3, 0xC6, 0x1C, 0x53, 0x3C,                                                       /* 'd' 0x64 */
-    0x39, 0x38, 0x7F, 0x81, 0x13, 0x80,                                                             /* 'e' 0x65 */
-    0x6B, 0xA4, 0x92, 0x40,                                                                         /* 'f' 0x66 */
-    0x35, 0x3C, 0x61, 0xC5, 0x33, 0x41, 0x4D, 0xE0,                                                 /* 'g' 0x67 */
-    0x84, 0x3D, 0x38, 0xC6, 0x31, 0x88,                                                             /* 'h' 0x68 */
-    0xBF, 0x80,                                                                                     /* 'i' 0x69 */
-    0x45, 0x55, 0x57,                                                                               /* 'j' 0x6A */
-    0x84, 0x25, 0x4E, 0x52, 0xD2, 0x88,                                                             /* 'k' 0x6B */
-    0xFF, 0x80,                                                                                     /* 'l' 0x6C */
-    0xF7, 0x99, 0x91, 0x91, 0x91, 0x91, 0x91,                                                       /* 'm' 0x6D */
-    0xF4, 0x63, 0x18, 0xC6, 0x20,                                                                   /* 'n' 0x6E */
-    0x39, 0x3C, 0x61, 0xC5, 0x33, 0x80,                                                             /* 'o' 0x6F */
-    0xF4, 0x63, 0x18, 0xC7, 0xD0, 0x80,                                                             /* 'p' 0x70 */
-    0x3D, 0x3C, 0x61, 0xC5, 0x37, 0x41, 0x04,                                                       /* 'q' 0x71 */
-    0xF2, 0x49, 0x20,                                                                               /* 'r' 0x72 */
-    0x7A, 0x50, 0xE0, 0xE5, 0xE0,                                                                   /* 's' 0x73 */
-    0x5D, 0x24, 0x93,                                                                               /* 't' 0x74 */
-    0x8C, 0x63, 0x18, 0xCF, 0xA0,                                                                   /* 'u' 0x75 */
-    0x85, 0x24, 0x92, 0x30, 0xC3, 0x00,                                                             /* 'v' 0x76 */
-    0x89, 0x59, 0x59, 0x55, 0x56, 0x26, 0x26,                                                       /* 'w' 0x77 */
-    0x4A, 0x4C, 0x43, 0x27, 0x20,                                                                   /* 'x' 0x78 */
-    0x8A, 0x52, 0xA5, 0x18, 0x84, 0x22, 0x00,                                                       /* 'y' 0x79 */
-    0x78, 0x44, 0x46, 0x23, 0xE0,                                                                   /* 'z' 0x7A */
-    0x6A, 0xAA, 0xA9,                                                                               /* '{' 0x7B */
-    0xFF, 0xE0,                                                                                     /* '|' 0x7C */
-    0x95, 0x55, 0x56,                                                                               /* '}' 0x7D */
-    0x66, 0x60,                                                                                     /* '~' 0x7E */
-    0xFF, 0xC0, 0x67, 0x34, 0x58, 0x4C, 0x46, 0x03, 0x11, 0x80, 0xFF, 0xC0,                         /* 0x7F */
-    0x1C, 0x45, 0x07, 0xE4, 0x1F, 0x10, 0x10, 0x1E,                                                 /* 0x80 */
-    /* 0x81 */
-    0xE0,                                                                               /* 0x82 */
-    0x6B, 0xA4, 0x92, 0x49, 0x60,                                                       /* 0x83 */
-    0xB6, 0x80,                                                                         /* 0x84 */
-    0xA8,                                                                               /* 0x85 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0x21, 0x08,                                           /* 0x86 */
-    0x21, 0x09, 0xF2, 0x10, 0x84, 0xF9, 0x08,                                           /* 0x87 */
-    0x54,                                                                               /* 0x88 */
-    0x62, 0x09, 0x40, 0x98, 0x06, 0x80, 0x10, 0x01, 0x66, 0x29, 0x92, 0x99, 0x06, 0x60, /* 0x89 */
-    0x28, 0x47, 0xA1, 0x83, 0x07, 0x83, 0x87, 0x17, 0x80,                               /* 0x8A */
-    0x64,                                                                               /* 0x8B */
-    0x3B, 0xE8, 0xC2, 0x08, 0x41, 0x08, 0x3F, 0x04, 0x20, 0x82, 0x30, 0x3B, 0xE0,       /* 0x8C */
-    /* 0x8D */
-    0x14, 0x11, 0xF8, 0x30, 0xC1, 0x04, 0x18, 0x61, 0xFC, /* 0x8E */
-    /* 0x8F */
-    /* 0x90 */
-    0xE0,                                                       /* 0x91 */
-    0xE0,                                                       /* 0x92 */
-    0xB6, 0x80,                                                 /* 0x93 */
-    0xB6, 0x80,                                                 /* 0x94 */
-    0xFF, 0x80,                                                 /* 0x95 */
-    0xFC,                                                       /* 0x96 */
-    0xFF, 0xF0,                                                 /* 0x97 */
-    0xDB,                                                       /* 0x98 */
-    0xE6, 0x28, 0xCD, 0x19, 0xA3, 0x34, 0x6A, 0x8B, 0x51, 0x68, /* 0x99 */
-    0x52, 0x69, 0x8E, 0x19, 0x60,                               /* 0x9A */
-    0x98,                                                       /* 0x9B */
-    0x7B, 0xD9, 0xCE, 0x10, 0xC3, 0xF8, 0x41, 0x9C, 0x5E, 0xF0, /* 0x9C */
-    /* 0x9D */
-    0x51, 0x1E, 0x11, 0x11, 0x88, 0xF8,                   /* 0x9E */
-    0x29, 0x05, 0x12, 0x22, 0x87, 0x04, 0x08, 0x10, 0x20, /* 0x9F */
-    /* 0xA0 */
-    0xBF, 0x80,                                                       /* 0xA1 */
-    0x23, 0xAB, 0x4A, 0x52, 0xAE, 0x20,                               /* 0xA2 */
-    0x39, 0x14, 0x10, 0xF0, 0x82, 0x1C, 0x4C,                         /* 0xA3 */
-    0xFC, 0x63, 0xF0,                                                 /* 0xA4 */
-    0x8C, 0x54, 0xAF, 0x93, 0xE4, 0x20,                               /* 0xA5 */
-    0xF9, 0xF0,                                                       /* 0xA6 */
-    0x32, 0x91, 0xC9, 0x47, 0x26, 0x14, 0xA4, 0xC0,                   /* 0xA7 */
-    0xA0,                                                             /* 0xA8 */
-    0x3E, 0x3F, 0xB8, 0xF4, 0x1A, 0x0D, 0x17, 0x76, 0xC6, 0x3E, 0x00, /* 0xA9 */
-    0x61, 0x79, 0x60,                                                 /* 0xAA */
-    0x5A, 0xA5,                                                       /* 0xAB */
-    0xFC, 0x10, 0x40,                                                 /* 0xAC */
-    /* 0xAD */
-    0x3E, 0x31, 0xB7, 0x72, 0x99, 0xCC, 0xC7, 0x56, 0xC6, 0x3E, 0x00,             /* 0xAE */
-    0xE0,                                                                         /* 0xAF */
-    0x69, 0x96,                                                                   /* 0xB0 */
-    0x21, 0x3E, 0x42, 0x03, 0xE0,                                                 /* 0xB1 */
-    0x69, 0x3C, 0xF0,                                                             /* 0xB2 */
-    0x79, 0x29, 0x70,                                                             /* 0xB3 */
-    0x80,                                                                         /* 0xB4 */
-    0x8A, 0x28, 0xA2, 0x8A, 0x6E, 0xE0, 0x80,                                     /* 0xB5 */
-    0x7F, 0xAE, 0xBA, 0x68, 0xA2, 0x8A, 0x28, 0xA0,                               /* 0xB6 */
-    0x80,                                                                         /* 0xB7 */
-    0x67, 0x80,                                                                   /* 0xB8 */
-    0x75, 0x50,                                                                   /* 0xB9 */
-    0x69, 0x96, 0xF0,                                                             /* 0xBA */
-    0xA5, 0x5A,                                                                   /* 0xBB */
-    0x42, 0x30, 0x84, 0x41, 0x10, 0x48, 0x82, 0x61, 0x28, 0x8F, 0x20, 0x80,       /* 0xBC */
-    0x40, 0x63, 0x11, 0x09, 0x74, 0xA8, 0x84, 0x44, 0x44, 0x43, 0x80,             /* 0xBD */
-    0x71, 0x24, 0x82, 0x20, 0x50, 0x98, 0x9A, 0x61, 0x28, 0x4F, 0x20, 0x80,       /* 0xBE */
-    0x20, 0x08, 0x44, 0x42, 0x11, 0x70,                                           /* 0xBF */
-    0x10, 0x08, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC0 */
-    0x08, 0x10, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC1 */
-    0x18, 0x24, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC2 */
-    0x34, 0x2C, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC3 */
-    0x24, 0x00, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0x42, 0xC3,                   /* 0xC4 */
-    0x18, 0x24, 0x18, 0x18, 0x3C, 0x24, 0x24, 0x7E, 0x42, 0xC3,                   /* 0xC5 */
-    0x1F, 0xC5, 0x02, 0x40, 0x90, 0x47, 0xDF, 0x04, 0x42, 0x10, 0x87, 0xC0,       /* 0xC6 */
-    0x3E, 0x61, 0xC0, 0x80, 0x80, 0x80, 0xC1, 0x63, 0x3E, 0x0C, 0x04, 0x1C,       /* 0xC7 */
-    0x20, 0x40, 0x3F, 0x82, 0x0F, 0xA0, 0x83, 0xF0,                               /* 0xC8 */
-    0x08, 0x40, 0x3F, 0x82, 0x0F, 0xA0, 0x83, 0xF0,                               /* 0xC9 */
-    0x10, 0xA0, 0x3F, 0x82, 0x0F, 0xA0, 0x83, 0xF0,                               /* 0xCA */
-    0x28, 0x0F, 0xE0, 0x83, 0xE8, 0x20, 0x83, 0xF0,                               /* 0xCB */
-    0x91, 0x55, 0x50,                                                             /* 0xCC */
-    0x62, 0xAA, 0xA0,                                                             /* 0xCD */
-    0x54, 0x24, 0x92, 0x48,                                                       /* 0xCE */
-    0xA1, 0x24, 0x92, 0x48,                                                       /* 0xCF */
-    0x7C, 0x42, 0x41, 0x41, 0xF1, 0x41, 0x41, 0x42, 0x7C,                         /* 0xD0 */
-    0x14, 0x53, 0x0F, 0x1B, 0x32, 0x66, 0xC7, 0x87, 0x04,                         /* 0xD1 */
-    0x10, 0x04, 0x0F, 0x8C, 0x6C, 0x1C, 0x06, 0x03, 0x83, 0x63, 0x1F, 0x00,       /* 0xD2 */
-    0x04, 0x04, 0x0F, 0x8C, 0x6C, 0x1C, 0x06, 0x03, 0x83, 0x63, 0x1F, 0x00,       /* 0xD3 */
-    0x08, 0x0A, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD4 */
-    0x1A, 0x0B, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD5 */
-    0x14, 0x00, 0x00, 0x07, 0xC6, 0x36, 0x0E, 0x03, 0x01, 0xC1, 0xB1, 0x8F, 0x80, /* 0xD6 */
-    0x8A, 0x88, 0xA8, 0x80,                                                       /* 0xD7 */
-    0x3E, 0xB1, 0xB0, 0xF0, 0x98, 0x8C, 0x87, 0x86, 0xC6, 0xBE, 0x00,             /* 0xD8 */
-    0x20, 0x22, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xD9 */
-    0x08, 0x22, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDA */
-    0x10, 0x52, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDB */
-    0x29, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0xC6, 0xF8,                         /* 0xDC */
-    0x09, 0x25, 0x12, 0x22, 0x87, 0x04, 0x08, 0x10, 0x20,                         /* 0xDD */
-    0x83, 0xE8, 0x61, 0x87, 0xE8, 0x20, 0x80,                                     /* 0xDE */
-    0x7A, 0x18, 0x61, 0x8A, 0x18, 0x61, 0xB8,                                     /* 0xDF */
-    0x20, 0x20, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE0 */
-    0x10, 0x40, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE1 */
-    0x10, 0x50, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE2 */
-    0x68, 0xB0, 0x03, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE3 */
-    0x28, 0x01, 0xE4, 0x20, 0x47, 0xB1, 0x46, 0x76,                               /* 0xE4 */
-    0x10, 0x50, 0x43, 0xC8, 0x40, 0x8F, 0x62, 0x8C, 0xEC,                         /* 0xE5 */
-    0x7B, 0xA1, 0x90, 0x45, 0xFF, 0x84, 0x23, 0x17, 0x38,                         /* 0xE6 */
-    0x7B, 0x18, 0x20, 0x83, 0x17, 0x8C, 0x11, 0xC0,                               /* 0xE7 */
-    0x20, 0x40, 0x1E, 0xCE, 0x1F, 0xE0, 0xC5, 0xE0,                               /* 0xE8 */
-    0x10, 0x80, 0x1E, 0xCE, 0x1F, 0xE0, 0xC5, 0xE0,                               /* 0xE9 */
-    0x10, 0xA0, 0x1E, 0xCE, 0x1F, 0xE0, 0xC5, 0xE0,                               /* 0xEA */
-    0x28, 0x07, 0xB3, 0x87, 0xF8, 0x31, 0x78,                                     /* 0xEB */
-    0x91, 0x55, 0x50,                                                             /* 0xEC */
-    0x62, 0xAA, 0xA0,                                                             /* 0xED */
-    0x54, 0x24, 0x92, 0x48,                                                       /* 0xEE */
-    0xA1, 0x24, 0x92, 0x40,                                                       /* 0xEF */
-    0x28, 0x42, 0x8F, 0x46, 0x18, 0x52, 0x30,                                     /* 0xF0 */
-    0x6A, 0xC1, 0x6C, 0xC6, 0x31, 0x8C, 0x40,                                     /* 0xF1 */
-    0x20, 0x40, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF2 */
-    0x10, 0x80, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF3 */
-    0x10, 0xA0, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF4 */
-    0x69, 0x60, 0x1E, 0xCE, 0x18, 0x61, 0xCD, 0xE0,                               /* 0xF5 */
-    0x28, 0x07, 0xB3, 0x86, 0x18, 0x73, 0x78,                                     /* 0xF6 */
-    0x20, 0x3E, 0x02, 0x00,                                                       /* 0xF7 */
-    0x7F, 0x39, 0x69, 0xC7, 0x3F, 0x80,                                           /* 0xF8 */
-    0x41, 0x23, 0x18, 0xC6, 0x33, 0x68,                                           /* 0xF9 */
-    0x11, 0x23, 0x18, 0xC6, 0x33, 0x68,                                           /* 0xFA */
-    0x22, 0x81, 0x18, 0xC6, 0x31, 0x9B, 0x40,                                     /* 0xFB */
-    0x50, 0x23, 0x18, 0xC6, 0x33, 0x68,                                           /* 0xFC */
-    0x10, 0x88, 0x52, 0x49, 0x23, 0x0C, 0x30, 0x82, 0x18,                         /* 0xFD */
-    0x84, 0x3D, 0xB8, 0xC6, 0x3B, 0xF4, 0x20,                                     /* 0xFE */
-    0x28, 0x08, 0x52, 0x49, 0x23, 0x0C, 0x30, 0x82, 0x18,                         /* 0xFF */
-};
-
-const GFXglyph FreeSans6pt_Win1252Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 3, 0, 0},
-    /* '!' 0x21 */ {0, 1, 9, 4, 2, -8},
-    /* '"' 0x22 */ {2, 3, 3, 4, 0, -8},
-    /* '#' 0x23 */ {4, 7, 8, 7, 0, -7},
-    /* '$' 0x24 */ {11, 6, 11, 7, 0, -9},
-    /* '%' 0x25 */ {20, 10, 9, 11, 0, -8},
-    /* '&' 0x26 */ {32, 6, 9, 8, 1, -8},
-    /* ''' 0x27 */ {39, 1, 3, 2, 1, -8},
-    /* '(' 0x28 */ {40, 2, 11, 4, 1, -8},
-    /* ')' 0x29 */ {43, 3, 11, 4, 0, -8},
-    /* '*' 0x2A */ {48, 3, 3, 5, 1, -8},
-    /* '+' 0x2B */ {50, 5, 5, 7, 1, -4},
-    /* ',' 0x2C */ {54, 1, 3, 3, 1, 0},
-    /* '-' 0x2D */ {55, 2, 1, 4, 1, -3},
-    /* '.' 0x2E */ {56, 1, 1, 3, 1, 0},
-    /* '/' 0x2F */ {57, 3, 9, 3, 0, -8},
-    /* '0' 0x30 */ {61, 5, 9, 7, 1, -8},
-    /* '1' 0x31 */ {67, 3, 9, 7, 1, -8},
-    /* '2' 0x32 */ {71, 6, 9, 7, 0, -8},
-    /* '3' 0x33 */ {78, 6, 9, 7, 0, -8},
-    /* '4' 0x34 */ {85, 6, 9, 7, 0, -8},
-    /* '5' 0x35 */ {92, 5, 9, 7, 1, -8},
-    /* '6' 0x36 */ {98, 5, 9, 7, 1, -8},
-    /* '7' 0x37 */ {104, 5, 9, 7, 1, -8},
-    /* '8' 0x38 */ {110, 6, 9, 7, 0, -8},
-    /* '9' 0x39 */ {117, 6, 9, 7, 0, -8},
-    /* ':' 0x3A */ {124, 1, 7, 3, 1, -6},
-    /* ';' 0x3B */ {125, 1, 8, 3, 1, -5},
-    /* '<' 0x3C */ {126, 5, 5, 7, 1, -4},
-    /* '=' 0x3D */ {130, 5, 3, 7, 1, -3},
-    /* '>' 0x3E */ {132, 5, 5, 7, 1, -4},
-    /* '?' 0x3F */ {136, 5, 9, 7, 1, -8},
-    /* '@' 0x40 */ {142, 11, 11, 12, 0, -8},
-    /* 'A' 0x41 */ {158, 8, 9, 8, 0, -8},
-    /* 'B' 0x42 */ {167, 6, 9, 8, 1, -8},
-    /* 'C' 0x43 */ {174, 8, 9, 9, 0, -8},
-    /* 'D' 0x44 */ {183, 7, 9, 8, 1, -8},
-    /* 'E' 0x45 */ {191, 6, 9, 8, 1, -8},
-    /* 'F' 0x46 */ {198, 6, 9, 7, 1, -8},
-    /* 'G' 0x47 */ {205, 8, 9, 9, 0, -8},
-    /* 'H' 0x48 */ {214, 7, 9, 9, 1, -8},
-    /* 'I' 0x49 */ {222, 1, 9, 3, 1, -8},
-    /* 'J' 0x4A */ {224, 5, 9, 6, 0, -8},
-    /* 'K' 0x4B */ {230, 7, 9, 8, 1, -8},
-    /* 'L' 0x4C */ {238, 5, 9, 7, 1, -8},
-    /* 'M' 0x4D */ {244, 8, 9, 10, 1, -8},
-    /* 'N' 0x4E */ {253, 7, 9, 9, 1, -8},
-    /* 'O' 0x4F */ {261, 9, 9, 9, 0, -8},
-    /* 'P' 0x50 */ {272, 6, 9, 8, 1, -8},
-    /* 'Q' 0x51 */ {279, 9, 10, 9, 0, -8},
-    /* 'R' 0x52 */ {291, 7, 9, 9, 1, -8},
-    /* 'S' 0x53 */ {299, 6, 9, 8, 1, -8},
-    /* 'T' 0x54 */ {306, 7, 9, 8, 0, -8},
-    /* 'U' 0x55 */ {314, 7, 9, 9, 1, -8},
-    /* 'V' 0x56 */ {322, 7, 9, 8, 0, -8},
-    /* 'W' 0x57 */ {330, 11, 9, 11, 0, -8},
-    /* 'X' 0x58 */ {343, 6, 9, 8, 1, -8},
-    /* 'Y' 0x59 */ {350, 8, 9, 8, 0, -8},
-    /* 'Z' 0x5A */ {359, 7, 9, 7, 0, -8},
-    /* '[' 0x5B */ {367, 2, 12, 3, 1, -8},
-    /* '\' 0x5C */ {370, 3, 9, 3, 0, -8},
-    /* ']' 0x5D */ {374, 2, 12, 3, 0, -8},
-    /* '^' 0x5E */ {377, 4, 4, 6, 1, -8},
-    /* '_' 0x5F */ {379, 7, 1, 7, 0, 2},
-    /* '`' 0x60 */ {380, 1, 1, 3, 1, -8},
-    /* 'a' 0x61 */ {381, 6, 7, 7, 0, -6},
-    /* 'b' 0x62 */ {387, 5, 9, 7, 1, -8},
-    /* 'c' 0x63 */ {393, 6, 7, 6, 0, -6},
-    /* 'd' 0x64 */ {399, 6, 9, 7, 0, -8},
-    /* 'e' 0x65 */ {406, 6, 7, 6, 0, -6},
-    /* 'f' 0x66 */ {412, 3, 9, 3, 0, -8},
-    /* 'g' 0x67 */ {416, 6, 10, 7, 0, -6},
-    /* 'h' 0x68 */ {424, 5, 9, 6, 1, -8},
-    /* 'i' 0x69 */ {430, 1, 9, 3, 1, -8},
-    /* 'j' 0x6A */ {432, 2, 12, 3, 0, -8},
-    /* 'k' 0x6B */ {435, 5, 9, 6, 1, -8},
-    /* 'l' 0x6C */ {441, 1, 9, 3, 1, -8},
-    /* 'm' 0x6D */ {443, 8, 7, 10, 1, -6},
-    /* 'n' 0x6E */ {450, 5, 7, 6, 1, -6},
-    /* 'o' 0x6F */ {455, 6, 7, 6, 0, -6},
-    /* 'p' 0x70 */ {461, 5, 9, 7, 1, -6},
-    /* 'q' 0x71 */ {467, 6, 9, 7, 0, -6},
-    /* 'r' 0x72 */ {474, 3, 7, 4, 1, -6},
-    /* 's' 0x73 */ {477, 5, 7, 6, 0, -6},
-    /* 't' 0x74 */ {482, 3, 8, 3, 0, -7},
-    /* 'u' 0x75 */ {485, 5, 7, 6, 1, -6},
-    /* 'v' 0x76 */ {490, 6, 7, 6, 0, -6},
-    /* 'w' 0x77 */ {496, 8, 7, 9, 0, -6},
-    /* 'x' 0x78 */ {503, 5, 7, 6, 0, -6},
-    /* 'y' 0x79 */ {508, 5, 10, 6, 0, -6},
-    /* 'z' 0x7A */ {515, 5, 7, 6, 0, -6},
-    /* '{' 0x7B */ {520, 2, 12, 4, 1, -8},
-    /* '|' 0x7C */ {523, 1, 11, 3, 1, -8},
-    /* '}' 0x7D */ {525, 2, 12, 4, 1, -8},
-    /* '~' 0x7E */ {528, 6, 2, 6, 0, -4},
-    /* 0x7F */ {530, 9, 10, 11, 1, -8},
-    /* 0x80 */ {542, 7, 9, 8, 0, -8},
-    /* 0x81 */ {550, 0, 0, 8, 0, 0},
-    /* 0x82 */ {550, 1, 3, 3, 1, 0},
-    /* 0x83 */ {551, 3, 12, 3, 0, -8},
-    /* 0x84 */ {556, 3, 3, 5, 1, 0},
-    /* 0x85 */ {558, 5, 1, 7, 1, 0},
-    /* 0x86 */ {559, 5, 11, 7, 1, -8},
-    /* 0x87 */ {566, 5, 11, 7, 1, -8},
-    /* 0x88 */ {573, 3, 2, 4, 0, -9},
-    /* 0x89 */ {574, 12, 9, 12, 0, -8},
-    /* 0x8A */ {588, 6, 11, 8, 1, -9},
-    /* 0x8B */ {597, 2, 3, 4, 1, -4},
-    /* 0x8C */ {598, 11, 9, 12, 0, -8},
-    /* 0x8D */ {611, 0, 0, 8, 0, 0},
-    /* 0x8E */ {611, 7, 10, 7, 0, -9},
-    /* 0x8F */ {620, 0, 0, 8, 0, 0},
-    /* 0x90 */ {620, 0, 0, 8, 0, 0},
-    /* 0x91 */ {620, 1, 3, 3, 1, -8},
-    /* 0x92 */ {621, 1, 3, 2, 1, -8},
-    /* 0x93 */ {622, 3, 3, 5, 1, -8},
-    /* 0x94 */ {624, 3, 3, 5, 1, -8},
-    /* 0x95 */ {626, 3, 3, 5, 1, -5},
-    /* 0x96 */ {628, 6, 1, 6, 0, -3},
-    /* 0x97 */ {629, 12, 1, 12, 0, -3},
-    /* 0x98 */ {631, 4, 2, 4, 0, -8},
-    /* 0x99 */ {632, 11, 7, 12, 1, -8},
-    /* 0x9A */ {642, 4, 9, 6, 1, -8},
-    /* 0x9B */ {647, 2, 3, 3, 1, -4},
-    /* 0x9C */ {648, 11, 7, 11, 0, -6},
-    /* 0x9D */ {658, 0, 0, 8, 0, 0},
-    /* 0x9E */ {658, 5, 9, 6, 0, -8},
-    /* 0x9F */ {664, 7, 10, 8, 1, -9},
-    /* 0xA0 */ {673, 0, 0, 3, 0, 0},
-    /* 0xA1 */ {673, 1, 9, 4, 1, -5},
-    /* 0xA2 */ {675, 5, 9, 7, 1, -7},
-    /* 0xA3 */ {681, 6, 9, 7, 0, -8},
-    /* 0xA4 */ {688, 5, 4, 7, 1, -5},
-    /* 0xA5 */ {691, 5, 9, 7, 1, -8},
-    /* 0xA6 */ {697, 1, 12, 3, 1, -8},
-    /* 0xA7 */ {699, 5, 12, 7, 1, -8},
-    /* 0xA8 */ {707, 3, 1, 4, 0, -7},
-    /* 0xA9 */ {708, 9, 9, 10, 0, -8},
-    /* 0xAA */ {719, 4, 5, 4, 0, -8},
-    /* 0xAB */ {722, 4, 4, 6, 1, -4},
-    /* 0xAC */ {724, 6, 3, 7, 1, -4},
-    /* 0xAD */ {727, 0, 0, 0, 0, 0},
-    /* 0xAE */ {727, 9, 9, 10, 0, -8},
-    /* 0xAF */ {738, 3, 1, 4, 0, -8},
-    /* 0xB0 */ {739, 4, 4, 7, 2, -8},
-    /* 0xB1 */ {741, 5, 7, 7, 1, -6},
-    /* 0xB2 */ {746, 4, 5, 4, 0, -9},
-    /* 0xB3 */ {749, 4, 5, 4, 0, -9},
-    /* 0xB4 */ {752, 1, 1, 4, 1, -8},
-    /* 0xB5 */ {753, 6, 9, 7, 1, -6},
-    /* 0xB6 */ {760, 6, 10, 6, 1, -8},
-    /* 0xB7 */ {768, 1, 1, 3, 1, -2},
-    /* 0xB8 */ {769, 3, 3, 4, 1, 1},
-    /* 0xB9 */ {771, 2, 6, 4, 1, -9},
-    /* 0xBA */ {773, 4, 5, 4, 0, -8},
-    /* 0xBB */ {776, 4, 4, 6, 1, -5},
-    /* 0xBC */ {778, 10, 9, 10, 1, -8},
-    /* 0xBD */ {790, 9, 9, 10, 1, -8},
-    /* 0xBE */ {801, 10, 9, 11, 0, -8},
-    /* 0xBF */ {813, 5, 9, 7, 1, -5},
-    /* 0xC0 */ {819, 8, 10, 8, 0, -9},
-    /* 0xC1 */ {829, 8, 10, 8, 0, -9},
-    /* 0xC2 */ {839, 8, 10, 8, 0, -9},
-    /* 0xC3 */ {849, 8, 10, 8, 0, -9},
-    /* 0xC4 */ {859, 8, 10, 8, 0, -9},
-    /* 0xC5 */ {869, 8, 10, 8, 0, -9},
-    /* 0xC6 */ {879, 10, 9, 12, 1, -8},
-    /* 0xC7 */ {891, 8, 12, 9, 0, -8},
-    /* 0xC8 */ {903, 6, 10, 8, 1, -9},
-    /* 0xC9 */ {911, 6, 10, 8, 1, -9},
-    /* 0xCA */ {919, 6, 10, 8, 1, -9},
-    /* 0xCB */ {927, 6, 10, 8, 1, -9},
-    /* 0xCC */ {935, 2, 10, 3, 0, -9},
-    /* 0xCD */ {938, 2, 10, 3, 1, -9},
-    /* 0xCE */ {941, 3, 10, 4, 0, -9},
-    /* 0xCF */ {945, 3, 10, 4, 0, -9},
-    /* 0xD0 */ {949, 8, 9, 8, 0, -8},
-    /* 0xD1 */ {958, 7, 10, 9, 1, -9},
-    /* 0xD2 */ {967, 9, 10, 9, 0, -9},
-    /* 0xD3 */ {979, 9, 10, 9, 0, -9},
-    /* 0xD4 */ {991, 9, 11, 9, 0, -10},
-    /* 0xD5 */ {1004, 9, 11, 9, 0, -10},
-    /* 0xD6 */ {1017, 9, 11, 9, 0, -10},
-    /* 0xD7 */ {1030, 5, 5, 7, 1, -5},
-    /* 0xD8 */ {1034, 9, 9, 9, 0, -8},
-    /* 0xD9 */ {1045, 7, 10, 9, 1, -9},
-    /* 0xDA */ {1054, 7, 10, 9, 1, -9},
-    /* 0xDB */ {1063, 7, 10, 9, 1, -9},
-    /* 0xDC */ {1072, 7, 10, 9, 1, -9},
-    /* 0xDD */ {1081, 7, 10, 8, 1, -9},
-    /* 0xDE */ {1090, 6, 9, 8, 1, -8},
-    /* 0xDF */ {1097, 6, 9, 7, 1, -8},
-    /* 0xE0 */ {1104, 7, 10, 7, 0, -9},
-    /* 0xE1 */ {1113, 7, 10, 7, 0, -9},
-    /* 0xE2 */ {1122, 7, 10, 7, 0, -9},
-    /* 0xE3 */ {1131, 7, 10, 7, 0, -9},
-    /* 0xE4 */ {1140, 7, 9, 7, 0, -8},
-    /* 0xE5 */ {1148, 7, 10, 7, 0, -9},
-    /* 0xE6 */ {1157, 10, 7, 10, 0, -6},
-    /* 0xE7 */ {1166, 6, 10, 6, 0, -6},
-    /* 0xE8 */ {1174, 6, 10, 6, 0, -9},
-    /* 0xE9 */ {1182, 6, 10, 6, 0, -9},
-    /* 0xEA */ {1190, 6, 10, 6, 0, -9},
-    /* 0xEB */ {1198, 6, 9, 6, 0, -8},
-    /* 0xEC */ {1205, 2, 10, 3, 0, -9},
-    /* 0xED */ {1208, 2, 10, 3, 1, -9},
-    /* 0xEE */ {1211, 3, 10, 3, 0, -9},
-    /* 0xEF */ {1215, 3, 9, 3, 0, -8},
-    /* 0xF0 */ {1219, 6, 9, 6, 0, -8},
-    /* 0xF1 */ {1226, 5, 10, 6, 1, -9},
-    /* 0xF2 */ {1233, 6, 10, 6, 0, -9},
-    /* 0xF3 */ {1241, 6, 10, 6, 0, -9},
-    /* 0xF4 */ {1249, 6, 10, 6, 0, -9},
-    /* 0xF5 */ {1257, 6, 10, 6, 0, -9},
-    /* 0xF6 */ {1265, 6, 9, 6, 0, -8},
-    /* 0xF7 */ {1272, 5, 5, 7, 1, -5},
-    /* 0xF8 */ {1276, 6, 7, 6, 0, -6},
-    /* 0xF9 */ {1282, 5, 9, 6, 1, -8},
-    /* 0xFA */ {1288, 5, 9, 6, 1, -8},
-    /* 0xFB */ {1294, 5, 10, 6, 1, -9},
-    /* 0xFC */ {1301, 5, 9, 6, 1, -8},
-    /* 0xFD */ {1307, 6, 12, 6, 0, -8},
-    /* 0xFE */ {1316, 5, 11, 7, 1, -8},
-    /* 0xFF */ {1323, 6, 12, 6, 0, -8},
-};
-
-const GFXfont FreeSans6pt_Win1252 PROGMEM = {(uint8_t *)FreeSans6pt_Win1252Bitmaps, (GFXglyph *)FreeSans6pt_Win1252Glyphs, 0x20,
-                                             0xFF, 14};
--- a/src/graphics/niche/Fonts/FreeSans9pt_Win1250.h
+++ b/src/graphics/niche/Fonts/FreeSans9pt_Win1250.h
@@ -1,494 +0,0 @@
-#pragma once
-const uint8_t FreeSans9pt_Win1250Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFF, 0xFF, 0xF0, 0xC0,                                                                                     /* '!' 0x21 */
-    0xDE, 0xF7, 0x20,                                                                                           /* '"' 0x22 */
-    0x09, 0x86, 0x41, 0x91, 0xFF, 0x13, 0x04, 0xC3, 0x20, 0xC8, 0xFF, 0x89, 0x82, 0x61, 0x90,                   /* '#' 0x23 */
-    0x10, 0x1F, 0x14, 0xDA, 0x3D, 0x1E, 0x83, 0x40, 0x78, 0x17, 0x08, 0xF4, 0x7A, 0x35, 0x33, 0xF0, 0x40, 0x20, /* '$' 0x24 */
-    0x38, 0x10, 0xEC, 0x20, 0xC6, 0x20, 0xC6, 0x40, 0xC6, 0x40, 0x6C, 0x80, 0x39, 0x00, 0x01, 0x3C, 0x02, 0x77, 0x02, 0x63, 0x04,
-    0x63, 0x04, 0x77, 0x08, 0x3C,                                                                         /* '%' 0x25 */
-    0x0E, 0x0C, 0xC3, 0x30, 0xCC, 0x1E, 0x03, 0x03, 0xC1, 0x9B, 0xC2, 0xF0, 0xEC, 0x19, 0x8F, 0x3C, 0x40, /* '&' 0x26 */
-    0xFE,                                                                                                 /* ''' 0x27 */
-    0x13, 0x26, 0x6C, 0xCC, 0xCC, 0xC4, 0x66, 0x23, 0x10,                                                 /* '(' 0x28 */
-    0x8C, 0x46, 0x63, 0x33, 0x33, 0x32, 0x66, 0x4C, 0x80,                                                 /* ')' 0x29 */
-    0x25, 0x7E, 0xA5, 0x00,                                                                               /* '*' 0x2A */
-    0x30, 0xC3, 0x3F, 0x30, 0xC3, 0x0C,                                                                   /* '+' 0x2B */
-    0xD6,                                                                                                 /* ',' 0x2C */
-    0xF0,                                                                                                 /* '-' 0x2D */
-    0xC0,                                                                                                 /* '.' 0x2E */
-    0x08, 0x44, 0x21, 0x10, 0x84, 0x42, 0x11, 0x08, 0x00,                                                 /* '/' 0x2F */
-    0x3C, 0x66, 0x42, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x42, 0x66, 0x3C,                         /* '0' 0x30 */
-    0x11, 0x3F, 0x33, 0x33, 0x33, 0x33, 0x30,                                                             /* '1' 0x31 */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x1C, 0x1C, 0x1C, 0x18, 0x18, 0x10, 0x08, 0x07, 0xF8,             /* '2' 0x32 */
-    0x3C, 0x66, 0xC3, 0xC3, 0x03, 0x06, 0x1C, 0x07, 0x03, 0xC3, 0xC3, 0x66, 0x3C,                         /* '3' 0x33 */
-    0x0C, 0x18, 0x71, 0x62, 0xC9, 0xA3, 0x46, 0xFE, 0x18, 0x30, 0x60, 0xC0,                               /* '4' 0x34 */
-    0x7F, 0x20, 0x10, 0x08, 0x08, 0x07, 0xF3, 0x8C, 0x03, 0x01, 0x80, 0xF0, 0x6C, 0x63, 0xE0,             /* '5' 0x35 */
-    0x1E, 0x31, 0x98, 0x78, 0x0C, 0x06, 0xF3, 0x8D, 0x83, 0xC1, 0xE0, 0xD0, 0x6C, 0x63, 0xE0,             /* '6' 0x36 */
-    0xFF, 0x03, 0x02, 0x06, 0x04, 0x0C, 0x08, 0x18, 0x18, 0x18, 0x10, 0x30, 0x30,                         /* '7' 0x37 */
-    0x3E, 0x31, 0xB0, 0x78, 0x3C, 0x1B, 0x18, 0xF8, 0xC6, 0xC1, 0xE0, 0xF0, 0x6C, 0x63, 0xE0,             /* '8' 0x38 */
-    0x3C, 0x66, 0xC2, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC2, 0x66, 0x3C,                         /* '9' 0x39 */
-    0xC0, 0x00, 0x30,                                                                                     /* ':' 0x3A */
-    0xC0, 0x00, 0x00, 0x64, 0xA0,                                                                         /* ';' 0x3B */
-    0x00, 0x81, 0xC7, 0x8E, 0x0C, 0x07, 0x80, 0x70, 0x0E, 0x01, 0x80,                                     /* '<' 0x3C */
-    0xFF, 0x80, 0x00, 0x1F, 0xF0,                                                                         /* '=' 0x3D */
-    0xE0, 0x1C, 0x03, 0x80, 0x30, 0x70, 0xE3, 0x81, 0x00,                                                 /* '>' 0x3E */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x18, 0x38, 0x18, 0x18, 0x0C, 0x00, 0x00, 0x01, 0x80,             /* '?' 0x3F */
-    0x03, 0xF0, 0x06, 0x0E, 0x06, 0x01, 0x86, 0x00, 0x66, 0x1D, 0xBB, 0x31, 0xCF, 0x18, 0xC7, 0x98, 0x63, 0xCC, 0x31, 0xE6, 0x11,
-    0xB3, 0x99, 0xCC, 0xF7, 0x86, 0x00, 0x01, 0x80, 0x00, 0x70, 0x40, 0x0F, 0xE0, /* '@' 0x40 */
-    0x06, 0x00, 0xF0, 0x0F, 0x00, 0x90, 0x19, 0x81, 0x98, 0x10, 0x83, 0x0C, 0x3F, 0xC2, 0x04, 0x60, 0x66, 0x06, 0xC0,
-    0x30,                                                                                                       /* 'A' 0x41 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x3F, 0xC6, 0x06, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 'B' 0x42 */
-    0x1F, 0x86, 0x19, 0x81, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0, /* 'C' 0x43 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x03, 0x60, 0xCF, 0xF0, /* 'D' 0x44 */
-    0xFF, 0xE0, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0F, 0xF8,                   /* 'E' 0x45 */
-    0xFF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFE, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,                               /* 'F' 0x46 */
-    0x0F, 0x83, 0x0E, 0x60, 0x66, 0x03, 0xC0, 0x0C, 0x00, 0xC1, 0xFC, 0x03, 0xC0, 0x36, 0x03, 0x60, 0x73, 0x0F, 0x0F,
-    0x10,                                                                                                       /* 'G' 0x47 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xFF, 0xFE, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06, /* 'H' 0x48 */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                                     /* 'I' 0x49 */
-    0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07, 0x8F, 0x1E, 0x27, 0x80,                                     /* 'J' 0x4A */
-    0xC0, 0xF0, 0x6C, 0x33, 0x18, 0xCC, 0x37, 0x0F, 0xC3, 0x98, 0xC3, 0x30, 0xCC, 0x1B, 0x03, 0xC0, 0xC0,       /* 'K' 0x4B */
-    0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF,                               /* 'L' 0x4C */
-    0xE0, 0x3F, 0x01, 0xFC, 0x1F, 0xE0, 0xFD, 0x05, 0xEC, 0x6F, 0x63, 0x79, 0x13, 0xCD, 0x9E, 0x6C, 0xF1, 0x47, 0x8E, 0x3C, 0x71,
-    0x80,                                                                                                       /* 'M' 0x4D */
-    0xE0, 0x7C, 0x0F, 0xC1, 0xE8, 0x3D, 0x87, 0x98, 0xF1, 0x1E, 0x33, 0xC3, 0x78, 0x6F, 0x07, 0xE0, 0x7C, 0x0E, /* 'N' 0x4E */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x0C, 0x60, 0xC0, 0xF8,
-    0x00,                                                                                                 /* 'O' 0x4F */
-    0xFF, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x6F, 0xF3, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00, /* 'P' 0x50 */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x6C, 0x60, 0xC0, 0xFB,
-    0x00, 0x08, /* 'Q' 0x51 */
-    0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06, 0xC0,
-    0x70,                                                                                                       /* 'R' 0x52 */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00,       /* 'S' 0x53 */
-    0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0,                   /* 'T' 0x54 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xB0, 0x61, 0xF0, /* 'U' 0x55 */
-    0xC0, 0x6C, 0x0D, 0x81, 0x10, 0x63, 0x0C, 0x61, 0x04, 0x60, 0xCC, 0x19, 0x01, 0x60, 0x3C, 0x07, 0x00, 0x60, /* 'V' 0x56 */
-    0xC1, 0x81, 0x61, 0xC3, 0x61, 0xC3, 0x61, 0x43, 0x62, 0x62, 0x22, 0x66, 0x32, 0x26, 0x36, 0x26, 0x14, 0x34, 0x14, 0x34, 0x1C,
-    0x1C, 0x18, 0x1C, 0x08, 0x18,                                                                         /* 'W' 0x57 */
-    0xC0, 0xD8, 0x66, 0x18, 0xCC, 0x1E, 0x07, 0x00, 0xC0, 0x78, 0x32, 0x0C, 0xC6, 0x1B, 0x07, 0xC0, 0xC0, /* 'X' 0x58 */
-    0xC0, 0x36, 0x06, 0x30, 0xC3, 0x0C, 0x19, 0x81, 0xD8, 0x0F, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06,
-    0x00,                                                                                                 /* 'Y' 0x59 */
-    0xFF, 0xC0, 0x60, 0x30, 0x0C, 0x06, 0x03, 0x01, 0xC0, 0x60, 0x30, 0x18, 0x06, 0x03, 0x00, 0xFF, 0xC0, /* 'Z' 0x5A */
-    0xFB, 0x6D, 0xB6, 0xDB, 0x6D, 0xB6, 0xE0,                                                             /* '[' 0x5B */
-    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x80,                                                 /* '\' 0x5C */
-    0xED, 0xB6, 0xDB, 0x6D, 0xB6, 0xDB, 0xE0,                                                             /* ']' 0x5D */
-    0x30, 0x60, 0xA2, 0x44, 0xD8, 0xA1, 0x80,                                                             /* '^' 0x5E */
-    0xFF, 0xC0,                                                                                           /* '_' 0x5F */
-    0xC6, 0x30,                                                                                           /* '`' 0x60 */
-    0x7E, 0x71, 0xB0, 0xC0, 0x60, 0xF3, 0xDB, 0x0D, 0x86, 0xC7, 0x3D, 0xC0,                               /* 'a' 0x61 */
-    0xC0, 0x60, 0x30, 0x1B, 0xCE, 0x36, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x7C, 0x6D, 0xE0,             /* 'b' 0x62 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'c' 0x63 */
-    0x03, 0x03, 0x03, 0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B,                         /* 'd' 0x64 */
-    0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'e' 0x65 */
-    0x36, 0x6F, 0x66, 0x66, 0x66, 0x66, 0x60,                                                             /* 'f' 0x66 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC6, 0x7C,                   /* 'g' 0x67 */
-    0xC0, 0xC0, 0xC0, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                         /* 'h' 0x68 */
-    0xC3, 0xFF, 0xFF, 0xC0,                                                                               /* 'i' 0x69 */
-    0x30, 0x03, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0xE0,                                                 /* 'j' 0x6A */
-    0xC0, 0xC0, 0xC0, 0xC2, 0xC4, 0xCC, 0xD8, 0xF8, 0xEC, 0xC4, 0xC6, 0xC3, 0xC3,                         /* 'k' 0x6B */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                               /* 'l' 0x6C */
-    0xDE, 0xF7, 0x1C, 0xF0, 0xC7, 0x86, 0x3C, 0x31, 0xE1, 0x8F, 0x0C, 0x78, 0x63, 0xC3, 0x1E, 0x18, 0xC0, /* 'm' 0x6D */
-    0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                                           /* 'n' 0x6E */
-    0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                           /* 'o' 0x6F */
-    0xDE, 0x71, 0xB0, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x83, 0xE3, 0x6F, 0x30, 0x18, 0x0C, 0x00,             /* 'p' 0x70 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0x03,                         /* 'q' 0x71 */
-    0xDF, 0x31, 0x8C, 0x63, 0x18, 0xC6, 0x00,                                                             /* 'r' 0x72 */
-    0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,                                           /* 's' 0x73 */
-    0x66, 0xF6, 0x66, 0x66, 0x66, 0x67,                                                                   /* 't' 0x74 */
-    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                           /* 'u' 0x75 */
-    0xC1, 0xA0, 0x98, 0xCC, 0x42, 0x21, 0xB0, 0xD0, 0x28, 0x1C, 0x0C, 0x00,                               /* 'v' 0x76 */
-    0xC6, 0x1E, 0x38, 0x91, 0xC4, 0xCA, 0x66, 0xD3, 0x16, 0xD0, 0xA6, 0x87, 0x1C, 0x38, 0xC0, 0xC6, 0x00, /* 'w' 0x77 */
-    0x87, 0x89, 0xB1, 0xC3, 0x07, 0x1E, 0x26, 0xC5, 0x0C,                                                 /* 'x' 0x78 */
-    0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 'y' 0x79 */
-    0xFE, 0x0C, 0x30, 0xC1, 0x86, 0x18, 0x20, 0xC1, 0xFC,                                                 /* 'z' 0x7A */
-    0x36, 0x66, 0x66, 0x6E, 0xCE, 0x66, 0x66, 0x66, 0x30,                                                 /* '{' 0x7B */
-    0xFF, 0xFF, 0xFF, 0xFF, 0xC0,                                                                         /* '|' 0x7C */
-    0xC6, 0x66, 0x66, 0x67, 0x37, 0x66, 0x66, 0x66, 0xC0,                                                 /* '}' 0x7D */
-    0x61, 0x24, 0x38,                                                                                     /* '~' 0x7E */
-    0xFF, 0xFC, 0x00, 0x63, 0xE3, 0x31, 0x99, 0x04, 0xC8, 0x66, 0x06, 0x30, 0x61, 0x83, 0x0C, 0x18, 0x60, 0x03, 0x06, 0x18, 0x00,
-    0xFF, 0xFC,                                                                                           /* 0x7F */
-    0x07, 0xC6, 0x13, 0x00, 0xC0, 0x60, 0x3F, 0xE6, 0x03, 0xFC, 0x60, 0x0C, 0x03, 0x00, 0x61, 0x07, 0xC0, /* 0x80 */
-    /* 0x81 */
-    0xDC, /* 0x82 */
-    /* 0x83 */
-    0xDA, 0x76,                                                                                     /* 0x84 */
-    0xCC, 0xC0,                                                                                     /* 0x85 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, /* 0x86 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, /* 0x87 */
-    /* 0x88 */
-    0x70, 0x80, 0x22, 0x20, 0x08, 0x90, 0x02, 0x24, 0x00, 0x72, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x10, 0x00, 0x09, 0xC7, 0x84,
-    0x8B, 0x31, 0x22, 0x84, 0x88, 0xB3, 0x21, 0xC7, 0x80,                                                             /* 0x89 */
-    0x1B, 0x03, 0x83, 0xF1, 0x86, 0xC0, 0xF0, 0x3C, 0x01, 0xE0, 0x1F, 0x00, 0xE0, 0x0F, 0x03, 0xC0, 0xD8, 0x63, 0xF0, /* 0x8A */
-    0x69,                                                                                                             /* 0x8B */
-    0x06, 0x03, 0x03, 0xF1, 0x86, 0xC0, 0xF0, 0x3C, 0x01, 0xE0, 0x1F, 0x00, 0xE0, 0x0F, 0x03, 0xC0, 0xD8, 0x63, 0xF0, /* 0x8C */
-    0x33, 0x0F, 0x3F, 0xE1, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30,             /* 0x8D */
-    0x1B, 0x03, 0x8F, 0xFC, 0x06, 0x03, 0x00, 0xC0, 0x60, 0x30, 0x1C, 0x06, 0x03, 0x01, 0x80, 0x60, 0x30, 0x0F, 0xFC, /* 0x8E */
-    0x0C, 0x06, 0x0F, 0xFC, 0x06, 0x03, 0x00, 0xC0, 0x60, 0x30, 0x1C, 0x06, 0x03, 0x01, 0x80, 0x60, 0x30, 0x0F, 0xFC, /* 0x8F */
-    /* 0x90 */
-    0x6B,             /* 0x91 */
-    0xD6,             /* 0x92 */
-    0x4C, 0xA5, 0xB0, /* 0x93 */
-    0xDA, 0x53, 0x20, /* 0x94 */
-    0x6F, 0xFF, 0x60, /* 0x95 */
-    0xFE,             /* 0x96 */
-    0xFF, 0xFF,       /* 0x97 */
-    /* 0x98 */
-    0xFC, 0xE1, 0xCC, 0x38, 0x73, 0x0E, 0x1C, 0xC3, 0x8F, 0x30, 0xD2, 0xCC, 0x34, 0xB3, 0x0D, 0x6C, 0xC3, 0x53, 0x30, 0xCC, 0xCC,
-    0x33, 0x30,                                                                   /* 0x99 */
-    0x24, 0x3C, 0x18, 0x7E, 0xE3, 0xC0, 0xC0, 0x60, 0x3C, 0x07, 0xC3, 0xE3, 0x7E, /* 0x9A */
-    0x96,                                                                         /* 0x9B */
-    0x0C, 0x18, 0x10, 0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xE3, 0x7E, /* 0x9C */
-    0x0D, 0xA7, 0x3C, 0x61, 0x86, 0x18, 0x61, 0x86, 0x18, 0x70,                   /* 0x9D */
-    0x48, 0xF0, 0xC7, 0xF0, 0x61, 0x86, 0x0C, 0x30, 0xC1, 0x06, 0x0F, 0xE0,       /* 0x9E */
-    0x0C, 0x10, 0x47, 0xF0, 0x61, 0x86, 0x0C, 0x30, 0xC1, 0x06, 0x0F, 0xE0,       /* 0x9F */
-    /* 0xA0 */
-    0x8A, 0x9C,                                                                               /* 0xA1 */
-    0x85, 0xE0,                                                                               /* 0xA2 */
-    0x60, 0x30, 0x18, 0x0C, 0x86, 0xC3, 0xC1, 0xC1, 0xC0, 0xE0, 0x30, 0x18, 0x0C, 0x07, 0xF8, /* 0xA3 */
-    0xFF, 0xDF, 0x1E, 0x3E, 0xFF, 0xC0,                                                       /* 0xA4 */
-    0x06, 0x00, 0xF0, 0x0F, 0x01, 0x30, 0x13, 0x81, 0x38, 0x21, 0x82, 0x1C, 0x3F, 0xC6, 0x04, 0x60, 0x66, 0x06, 0xC0, 0x30, 0x06,
-    0x00, 0xC0, 0x0C, 0x00, 0x70, /* 0xA5 */
-    0xFF, 0xFC, 0x0F, 0xFF, 0xC0, /* 0xA6 */
-    0x0C, 0x09, 0x0C, 0xC6, 0x63, 0x81, 0xE3, 0x19, 0x87, 0xE1, 0xB8, 0xC6, 0x41, 0xC0, 0x73, 0x19, 0x8C, 0x66, 0x1E,
-    0x00, /* 0xA7 */
-    0xCC, /* 0xA8 */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9B, 0xC6, 0xD9, 0x8F, 0x60, 0x3D, 0x00, 0xF4, 0x03, 0xD8, 0x0D, 0xE6, 0x67, 0xF3, 0x86, 0x18,
-    0x0F, 0xC0, /* 0xA9 */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x02, 0x00, 0xE0, 0x18, 0x1C,
-    0x00,                               /* 0xAA */
-    0x22, 0xCF, 0x26, 0x46, 0x64, 0x40, /* 0xAB */
-    0xFF, 0x80, 0xC0, 0x60, 0x30, 0x18, /* 0xAC */
-    /* 0xAD */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9F, 0xE6, 0xD0, 0x8F, 0x42, 0x3D, 0xF0, 0xF4, 0x23, 0xD0, 0x8D, 0xC2, 0x67, 0x0B, 0x86, 0x18,
-    0x0F, 0xC0,                                                                                                       /* 0xAE */
-    0x0C, 0x00, 0x0F, 0xFC, 0x06, 0x03, 0x00, 0xC0, 0x60, 0x30, 0x1C, 0x06, 0x03, 0x01, 0x80, 0x60, 0x30, 0x0F, 0xFC, /* 0xAF */
-    0x74, 0x63, 0x17, 0x00,                                                                                           /* 0xB0 */
-    0x0C, 0x06, 0x03, 0x07, 0xE0, 0xC0, 0x60, 0x30, 0x18, 0x00, 0x00, 0x3F, 0xE0,                                     /* 0xB1 */
-    0x6C, 0xC7,                                                                                                       /* 0xB2 */
-    0x66, 0x66, 0x67, 0x6E, 0x66, 0x66, 0x60,                                                                         /* 0xB3 */
-    0x36, 0xC0,                                                                                                       /* 0xB4 */
-    0xC3, 0x61, 0xB0, 0xD8, 0x6C, 0x36, 0x1B, 0x0D, 0x86, 0xE7, 0x7D, 0xF0, 0x18, 0x0C, 0x00,                         /* 0xB5 */
-    0x3F, 0x7E, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0x72, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12,                   /* 0xB6 */
-    0xE0,                                                                                                             /* 0xB7 */
-    0x21, 0xC7, 0xE0,                                                                                                 /* 0xB8 */
-    0x7E, 0x38, 0xCC, 0x30, 0x0C, 0x0F, 0x1E, 0xCC, 0x33, 0x0C, 0xC7, 0x1E, 0xE0, 0x10, 0x0C, 0x03, 0x00, 0x70,       /* 0xB9 */
-    0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xC3, 0x7E, 0x10, 0x1C, 0x0C, 0x38,                               /* 0xBA */
-    0x89, 0x98, 0x99, 0x3C, 0xD1, 0x00,                                                                               /* 0xBB */
-    0xC6, 0xC4, 0xC8, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF,                                     /* 0xBC */
-    0x6F, 0x69, 0x00,                                                                                                 /* 0xBD */
-    0xDE, 0xB9, 0x8C, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x00,                                                             /* 0xBE */
-    0x30, 0x03, 0xF8, 0x30, 0xC3, 0x06, 0x18, 0x60, 0x83, 0x07, 0xF0,                                                 /* 0xBF */
-    0x06, 0x00, 0xC0, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06,
-    0xC0, 0x70,                                                                                                 /* 0xC0 */
-    0x06, 0x03, 0x00, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC1 */
-    0x0C, 0x04, 0x80, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC2 */
-    0x21, 0x07, 0x80, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC3 */
-    0x33, 0x00, 0x00, 0xC0, 0x78, 0x1E, 0x04, 0x83, 0x30, 0xCC, 0x33, 0x1F, 0xE6, 0x19, 0x02, 0xC0, 0xF0, 0x30, /* 0xC4 */
-    0x30, 0x60, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF,                         /* 0xC5 */
-    0x06, 0x01, 0x80, 0x00, 0x0F, 0xC3, 0x0C, 0xC0, 0xD0, 0x1E, 0x00, 0xC0, 0x18, 0x03, 0x01, 0xA0, 0x36, 0x0C, 0x61, 0x87,
-    0xC0, /* 0xC6 */
-    0x1F, 0x06, 0x19, 0x83, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0xE1, 0xF0, 0x08, 0x01, 0xC0,
-    0x18, 0x0E, 0x00, /* 0xC7 */
-    0x19, 0x81, 0xE0, 0x00, 0x0F, 0xC3, 0x0C, 0xC0, 0xF0, 0x1E, 0x00, 0xC0, 0x18, 0x03, 0x01, 0xA0, 0x36, 0x0C, 0x61, 0x87,
-    0xC0,                                                                                           /* 0xC8 */
-    0x0C, 0x0C, 0x00, 0x1F, 0xFC, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC, /* 0xC9 */
-    0xFF, 0xD8, 0x03, 0x00, 0x60, 0x0C, 0x01, 0x80, 0x3F, 0xF6, 0x00, 0xC0, 0x18, 0x03, 0x00, 0x60, 0x0F, 0xFC, 0x01, 0x80, 0x60,
-    0x0C, 0x00, 0xE0,                                                                                                 /* 0xCA */
-    0x33, 0x00, 0x3F, 0xF8, 0x0C, 0x06, 0x03, 0x01, 0xFE, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC,                   /* 0xCB */
-    0x33, 0x0F, 0x00, 0x1F, 0xFC, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFE,             /* 0xCC */
-    0x78, 0x36, 0xDB, 0x6D, 0xB6, 0xC0,                                                                               /* 0xCD */
-    0x76, 0xC0, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x63, 0x18,                                                             /* 0xCE */
-    0x66, 0x0F, 0x00, 0x03, 0xF8, 0xC3, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x3C, 0x0F, 0x03, 0xC1, 0xB0, 0xEF, 0xE0, /* 0xCF */
-    0x7F, 0x0C, 0x31, 0x83, 0x30, 0x36, 0x06, 0xC0, 0xFE, 0x1B, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x30, 0xE7, 0xF0,       /* 0xD0 */
-    0x03, 0x01, 0x83, 0x81, 0xF0, 0x3F, 0x07, 0xA0, 0xF6, 0x1E, 0x63, 0xC4, 0x78, 0xCF, 0x0D, 0xE1, 0xBC, 0x1F, 0x81,
-    0xC0, /* 0xD1 */
-    0x19, 0x81, 0xE3, 0x81, 0xF0, 0x3F, 0x07, 0xA0, 0xF6, 0x1E, 0x63, 0xC4, 0x78, 0xCF, 0x0D, 0xE1, 0xBC, 0x1F, 0x81,
-    0xC0, /* 0xD2 */
-    0x03, 0x00, 0x60, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD3 */
-    0x0F, 0x01, 0x98, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD4 */
-    0x0D, 0x81, 0xB0, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD5 */
-    0x19, 0x81, 0x98, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00,                               /* 0xD6 */
-    0x83, 0x89, 0xA1, 0x83, 0x89, 0xA1, 0x80, /* 0xD7 */
-    0x33, 0x01, 0xE0, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06,
-    0xC0, 0x70, /* 0xD8 */
-    0x04, 0x01, 0x43, 0x11, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xD9 */
-    0x06, 0x01, 0x83, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDA */
-    0x0D, 0x83, 0x63, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDB */
-    0x1B, 0x00, 0x03, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDC */
-    0x03, 0x0C, 0x63, 0x60, 0x63, 0x0C, 0x30, 0xC1, 0x98, 0x1D, 0x80, 0xF0, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00,
-    0x60, /* 0xDD */
-    0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0, 0x40, 0x3C, 0x06, 0x1E,
-    0x00,                                                                                     /* 0xDE */
-    0x3C, 0x33, 0x30, 0xD8, 0x6C, 0x36, 0x33, 0x39, 0x86, 0xC1, 0xE0, 0xF0, 0x78, 0x6D, 0xE0, /* 0xDF */
-    0x19, 0x89, 0xBE, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x00,                                     /* 0xE0 */
-    0x0C, 0x04, 0x04, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8, /* 0xE1 */
-    0x10, 0x14, 0x1B, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8, /* 0xE2 */
-    0x66, 0x1E, 0x00, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8, /* 0xE3 */
-    0x66, 0x00, 0x1F, 0x9C, 0x6C, 0x30, 0x18, 0x3C, 0xF6, 0xC3, 0x61, 0xB1, 0xCF, 0x70,       /* 0xE4 */
-    0x78, 0x36, 0xDB, 0x6D, 0xB6, 0xD8,                                                       /* 0xE5 */
-    0x0C, 0x08, 0x10, 0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,             /* 0xE6 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C, 0x10, 0x1C, 0x0C, 0x38,       /* 0xE7 */
-    0x44, 0x28, 0x38, 0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,             /* 0xE8 */
-    0x0C, 0x08, 0x18, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,             /* 0xE9 */
-    0x3C, 0x62, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3E, 0x04, 0x0C, 0x0C, 0x06,       /* 0xEA */
-    0x66, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                   /* 0xEB */
-    0x64, 0x2C, 0x18, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,             /* 0xEC */
-    0x7A, 0x6D, 0xB6, 0xDB, 0x6C,                                                             /* 0xED */
-    0x69, 0x06, 0x66, 0x66, 0x66, 0x66, 0x60,                                                 /* 0xEE */
-    0x03, 0x30, 0x32, 0x03, 0x43, 0xB0, 0x67, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x06, 0x70, 0x3B,
-    0x00,                                                                                                 /* 0xEF */
-    0x03, 0x07, 0xC0, 0xC7, 0x66, 0x76, 0x1B, 0x0D, 0x86, 0xC3, 0x61, 0xB0, 0xCC, 0xE3, 0xB0,             /* 0xF0 */
-    0x0C, 0x18, 0x00, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                         /* 0xF1 */
-    0x66, 0x3C, 0x00, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                         /* 0xF2 */
-    0x0C, 0x18, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                         /* 0xF3 */
-    0x18, 0x24, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                         /* 0xF4 */
-    0x36, 0x6C, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                         /* 0xF5 */
-    0x66, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                               /* 0xF6 */
-    0x18, 0x00, 0x00, 0x1F, 0xF0, 0x00, 0x00, 0x00, 0x30,                                                 /* 0xF7 */
-    0xDB, 0x81, 0xBE, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x00,                                                 /* 0xF8 */
-    0x10, 0x28, 0x10, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                         /* 0xF9 */
-    0x06, 0x0C, 0x18, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                         /* 0xFA */
-    0x36, 0x6C, 0x00, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                         /* 0xFB */
-    0x66, 0x00, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                               /* 0xFC */
-    0x06, 0x04, 0x08, 0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60, /* 0xFD */
-    0x63, 0x3C, 0xC6, 0x31, 0x8C, 0x63, 0x18, 0xE2, 0x1C, 0x6F,                                           /* 0xFE */
-    0xC0,                                                                                                 /* 0xFF */
-};
-
-const GFXglyph FreeSans9pt_Win1250Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 5, 0, 0},
-    /* '!' 0x21 */ {0, 2, 13, 6, 2, -12},
-    /* '"' 0x22 */ {4, 5, 4, 6, 1, -12},
-    /* '#' 0x23 */ {7, 10, 12, 10, 0, -11},
-    /* '$' 0x24 */ {22, 9, 16, 10, 1, -13},
-    /* '%' 0x25 */ {40, 16, 13, 16, 1, -12},
-    /* '&' 0x26 */ {66, 10, 13, 12, 1, -12},
-    /* ''' 0x27 */ {83, 2, 4, 4, 1, -12},
-    /* '(' 0x28 */ {84, 4, 17, 6, 1, -12},
-    /* ')' 0x29 */ {93, 4, 17, 6, 1, -12},
-    /* '*' 0x2A */ {102, 5, 5, 7, 1, -12},
-    /* '+' 0x2B */ {106, 6, 8, 11, 3, -7},
-    /* ',' 0x2C */ {112, 2, 4, 5, 2, 0},
-    /* '-' 0x2D */ {113, 4, 1, 6, 1, -4},
-    /* '.' 0x2E */ {114, 2, 1, 5, 1, 0},
-    /* '/' 0x2F */ {115, 5, 13, 5, 0, -12},
-    /* '0' 0x30 */ {124, 8, 13, 10, 1, -12},
-    /* '1' 0x31 */ {137, 4, 13, 10, 3, -12},
-    /* '2' 0x32 */ {144, 9, 13, 10, 1, -12},
-    /* '3' 0x33 */ {159, 8, 13, 10, 1, -12},
-    /* '4' 0x34 */ {172, 7, 13, 10, 2, -12},
-    /* '5' 0x35 */ {184, 9, 13, 10, 1, -12},
-    /* '6' 0x36 */ {199, 9, 13, 10, 1, -12},
-    /* '7' 0x37 */ {214, 8, 13, 10, 0, -12},
-    /* '8' 0x38 */ {227, 9, 13, 10, 1, -12},
-    /* '9' 0x39 */ {242, 8, 13, 10, 1, -12},
-    /* ':' 0x3A */ {255, 2, 10, 5, 1, -9},
-    /* ';' 0x3B */ {258, 3, 12, 5, 1, -8},
-    /* '<' 0x3C */ {263, 9, 9, 11, 1, -8},
-    /* '=' 0x3D */ {274, 9, 4, 11, 1, -5},
-    /* '>' 0x3E */ {279, 9, 8, 11, 1, -7},
-    /* '?' 0x3F */ {288, 9, 13, 10, 1, -12},
-    /* '@' 0x40 */ {303, 17, 16, 18, 1, -12},
-    /* 'A' 0x41 */ {337, 12, 13, 12, 0, -12},
-    /* 'B' 0x42 */ {357, 11, 13, 12, 1, -12},
-    /* 'C' 0x43 */ {375, 11, 13, 13, 1, -12},
-    /* 'D' 0x44 */ {393, 11, 13, 13, 1, -12},
-    /* 'E' 0x45 */ {411, 9, 13, 11, 1, -12},
-    /* 'F' 0x46 */ {426, 8, 13, 11, 1, -12},
-    /* 'G' 0x47 */ {439, 12, 13, 14, 1, -12},
-    /* 'H' 0x48 */ {459, 11, 13, 13, 1, -12},
-    /* 'I' 0x49 */ {477, 2, 13, 5, 2, -12},
-    /* 'J' 0x4A */ {481, 7, 13, 10, 1, -12},
-    /* 'K' 0x4B */ {493, 10, 13, 12, 1, -12},
-    /* 'L' 0x4C */ {510, 8, 13, 10, 1, -12},
-    /* 'M' 0x4D */ {523, 13, 13, 15, 1, -12},
-    /* 'N' 0x4E */ {545, 11, 13, 13, 1, -12},
-    /* 'O' 0x4F */ {563, 13, 13, 14, 1, -12},
-    /* 'P' 0x50 */ {585, 10, 13, 12, 1, -12},
-    /* 'Q' 0x51 */ {602, 13, 14, 14, 1, -12},
-    /* 'R' 0x52 */ {625, 12, 13, 13, 1, -12},
-    /* 'S' 0x53 */ {645, 10, 13, 12, 1, -12},
-    /* 'T' 0x54 */ {662, 9, 13, 11, 1, -12},
-    /* 'U' 0x55 */ {677, 11, 13, 13, 1, -12},
-    /* 'V' 0x56 */ {695, 11, 13, 11, 0, -12},
-    /* 'W' 0x57 */ {713, 16, 13, 17, 0, -12},
-    /* 'X' 0x58 */ {739, 10, 13, 12, 1, -12},
-    /* 'Y' 0x59 */ {756, 12, 13, 12, 0, -12},
-    /* 'Z' 0x5A */ {776, 10, 13, 11, 1, -12},
-    /* '[' 0x5B */ {793, 3, 17, 5, 1, -12},
-    /* '\' 0x5C */ {800, 5, 13, 5, 0, -12},
-    /* ']' 0x5D */ {809, 3, 17, 5, 0, -12},
-    /* '^' 0x5E */ {816, 7, 7, 8, 1, -12},
-    /* '_' 0x5F */ {823, 10, 1, 10, 0, 3},
-    /* '`' 0x60 */ {825, 4, 3, 5, 0, -12},
-    /* 'a' 0x61 */ {827, 9, 10, 10, 1, -9},
-    /* 'b' 0x62 */ {839, 9, 13, 10, 1, -12},
-    /* 'c' 0x63 */ {854, 8, 10, 9, 1, -9},
-    /* 'd' 0x64 */ {864, 8, 13, 10, 1, -12},
-    /* 'e' 0x65 */ {877, 8, 10, 10, 1, -9},
-    /* 'f' 0x66 */ {887, 4, 13, 5, 1, -12},
-    /* 'g' 0x67 */ {894, 8, 14, 10, 1, -9},
-    /* 'h' 0x68 */ {908, 8, 13, 10, 1, -12},
-    /* 'i' 0x69 */ {921, 2, 13, 4, 1, -12},
-    /* 'j' 0x6A */ {925, 4, 17, 4, 0, -12},
-    /* 'k' 0x6B */ {934, 8, 13, 9, 1, -12},
-    /* 'l' 0x6C */ {947, 2, 13, 4, 1, -12},
-    /* 'm' 0x6D */ {951, 13, 10, 15, 1, -9},
-    /* 'n' 0x6E */ {968, 8, 10, 10, 1, -9},
-    /* 'o' 0x6F */ {978, 8, 10, 10, 1, -9},
-    /* 'p' 0x70 */ {988, 9, 13, 10, 1, -9},
-    /* 'q' 0x71 */ {1003, 8, 13, 10, 1, -9},
-    /* 'r' 0x72 */ {1016, 5, 10, 6, 1, -9},
-    /* 's' 0x73 */ {1023, 8, 10, 9, 1, -9},
-    /* 't' 0x74 */ {1033, 4, 12, 5, 1, -11},
-    /* 'u' 0x75 */ {1039, 8, 10, 10, 1, -9},
-    /* 'v' 0x76 */ {1049, 9, 10, 9, 0, -9},
-    /* 'w' 0x77 */ {1061, 13, 10, 13, 0, -9},
-    /* 'x' 0x78 */ {1078, 7, 10, 9, 1, -9},
-    /* 'y' 0x79 */ {1087, 8, 14, 9, 0, -9},
-    /* 'z' 0x7A */ {1101, 7, 10, 9, 1, -9},
-    /* '{' 0x7B */ {1110, 4, 17, 6, 1, -12},
-    /* '|' 0x7C */ {1119, 2, 17, 4, 2, -12},
-    /* '}' 0x7D */ {1124, 4, 17, 6, 1, -12},
-    /* '~' 0x7E */ {1133, 7, 3, 9, 1, -7},
-    /* 0x7F */ {1136, 13, 14, 15, 1, -12},
-    /* 0x80 */ {1159, 10, 13, 12, 1, -12},
-    /* 0x81 */ {1176, 0, 0, 0, 0, 0},
-    /* 0x82 */ {1176, 2, 3, 5, 1, 0},
-    /* 0x83 */ {1177, 0, 0, 0, 0, 0},
-    /* 0x84 */ {1177, 5, 3, 7, 1, 0},
-    /* 0x85 */ {1179, 10, 1, 12, 1, 0},
-    /* 0x86 */ {1181, 8, 16, 10, 1, -12},
-    /* 0x87 */ {1197, 8, 16, 10, 1, -12},
-    /* 0x88 */ {1213, 0, 0, 0, 0, 0},
-    /* 0x89 */ {1213, 18, 13, 18, 0, -12},
-    /* 0x8A */ {1243, 10, 15, 12, 1, -14},
-    /* 0x8B */ {1262, 2, 4, 4, 1, -6},
-    /* 0x8C */ {1263, 10, 15, 12, 1, -14},
-    /* 0x8D */ {1282, 9, 15, 11, 1, -14},
-    /* 0x8E */ {1299, 10, 15, 11, 1, -14},
-    /* 0x8F */ {1318, 10, 15, 11, 1, -14},
-    /* 0x90 */ {1337, 0, 0, 0, 0, 0},
-    /* 0x91 */ {1337, 2, 4, 4, 2, -12},
-    /* 0x92 */ {1338, 2, 4, 4, 1, -12},
-    /* 0x93 */ {1339, 5, 4, 7, 2, -12},
-    /* 0x94 */ {1342, 5, 4, 7, 1, -12},
-    /* 0x95 */ {1345, 4, 5, 7, 1, -8},
-    /* 0x96 */ {1348, 7, 1, 9, 1, -4},
-    /* 0x97 */ {1349, 16, 1, 18, 1, -4},
-    /* 0x98 */ {1351, 0, 0, 0, 0, 0},
-    /* 0x99 */ {1351, 18, 10, 18, 1, -13},
-    /* 0x9A */ {1374, 8, 13, 9, 1, -12},
-    /* 0x9B */ {1387, 2, 4, 5, 2, -6},
-    /* 0x9C */ {1388, 8, 13, 9, 1, -12},
-    /* 0x9D */ {1401, 6, 13, 8, 1, -12},
-    /* 0x9E */ {1411, 7, 13, 9, 1, -12},
-    /* 0x9F */ {1423, 7, 13, 9, 1, -12},
-    /* 0xA0 */ {1435, 0, 0, 5, 0, 0},
-    /* 0xA1 */ {1435, 5, 3, 6, 0, -12},
-    /* 0xA2 */ {1437, 6, 2, 6, 0, -12},
-    /* 0xA3 */ {1439, 9, 13, 11, 1, -12},
-    /* 0xA4 */ {1454, 7, 6, 10, 2, -8},
-    /* 0xA5 */ {1460, 12, 17, 12, 1, -12},
-    /* 0xA6 */ {1486, 2, 17, 5, 2, -12},
-    /* 0xA7 */ {1491, 9, 17, 10, 1, -12},
-    /* 0xA8 */ {1511, 6, 1, 6, 0, -11},
-    /* 0xA9 */ {1512, 14, 13, 14, 1, -12},
-    /* 0xAA */ {1535, 10, 17, 12, 1, -12},
-    /* 0xAB */ {1557, 7, 6, 9, 1, -7},
-    /* 0xAC */ {1563, 9, 5, 11, 2, -5},
-    /* 0xAD */ {1569, 0, 0, 0, 0, 0},
-    /* 0xAE */ {1569, 14, 13, 14, 1, -12},
-    /* 0xAF */ {1592, 10, 15, 11, 1, -14},
-    /* 0xB0 */ {1611, 5, 5, 11, 3, -11},
-    /* 0xB1 */ {1615, 9, 11, 11, 1, -10},
-    /* 0xB2 */ {1628, 4, 4, 6, 1, 1},
-    /* 0xB3 */ {1630, 4, 13, 5, 1, -12},
-    /* 0xB4 */ {1637, 4, 3, 6, 2, -12},
-    /* 0xB5 */ {1639, 9, 13, 10, 1, -9},
-    /* 0xB6 */ {1654, 8, 16, 10, 2, -12},
-    /* 0xB7 */ {1670, 3, 1, 5, 1, -4},
-    /* 0xB8 */ {1671, 5, 4, 6, 1, 1},
-    /* 0xB9 */ {1674, 10, 14, 10, 1, -9},
-    /* 0xBA */ {1692, 8, 14, 9, 1, -9},
-    /* 0xBB */ {1706, 7, 6, 9, 1, -7},
-    /* 0xBC */ {1712, 8, 13, 10, 1, -12},
-    /* 0xBD */ {1725, 6, 3, 6, 0, -12},
-    /* 0xBE */ {1728, 5, 13, 7, 1, -12},
-    /* 0xBF */ {1737, 7, 12, 9, 1, -11},
-    /* 0xC0 */ {1748, 12, 15, 13, 1, -14},
-    /* 0xC1 */ {1771, 10, 14, 12, 1, -13},
-    /* 0xC2 */ {1789, 10, 14, 12, 1, -13},
-    /* 0xC3 */ {1807, 10, 14, 12, 1, -13},
-    /* 0xC4 */ {1825, 10, 14, 12, 1, -13},
-    /* 0xC5 */ {1843, 8, 14, 10, 1, -13},
-    /* 0xC6 */ {1857, 11, 15, 13, 1, -14},
-    /* 0xC7 */ {1878, 11, 17, 13, 1, -12},
-    /* 0xC8 */ {1902, 11, 15, 13, 1, -14},
-    /* 0xC9 */ {1923, 9, 14, 11, 1, -13},
-    /* 0xCA */ {1939, 11, 17, 12, 1, -12},
-    /* 0xCB */ {1963, 9, 14, 11, 1, -13},
-    /* 0xCC */ {1979, 9, 15, 11, 1, -14},
-    /* 0xCD */ {1996, 3, 14, 5, 1, -13},
-    /* 0xCE */ {2002, 5, 14, 5, 0, -13},
-    /* 0xCF */ {2011, 10, 15, 13, 2, -14},
-    /* 0xD0 */ {2030, 11, 13, 13, 1, -12},
-    /* 0xD1 */ {2048, 11, 14, 13, 1, -13},
-    /* 0xD2 */ {2068, 11, 14, 13, 1, -13},
-    /* 0xD3 */ {2088, 12, 15, 13, 1, -14},
-    /* 0xD4 */ {2111, 12, 15, 13, 1, -14},
-    /* 0xD5 */ {2134, 12, 15, 13, 1, -14},
-    /* 0xD6 */ {2157, 12, 15, 13, 1, -14},
-    /* 0xD7 */ {2180, 7, 7, 11, 2, -7},
-    /* 0xD8 */ {2187, 12, 15, 13, 1, -14},
-    /* 0xD9 */ {2210, 11, 14, 13, 1, -13},
-    /* 0xDA */ {2230, 11, 14, 13, 1, -13},
-    /* 0xDB */ {2250, 11, 14, 13, 1, -13},
-    /* 0xDC */ {2270, 11, 14, 13, 1, -13},
-    /* 0xDD */ {2290, 12, 14, 12, 0, -13},
-    /* 0xDE */ {2311, 9, 17, 11, 1, -12},
-    /* 0xDF */ {2331, 9, 13, 11, 1, -12},
-    /* 0xE0 */ {2346, 5, 13, 6, 1, -12},
-    /* 0xE1 */ {2355, 9, 13, 10, 1, -12},
-    /* 0xE2 */ {2370, 9, 13, 10, 1, -12},
-    /* 0xE3 */ {2385, 9, 13, 10, 1, -12},
-    /* 0xE4 */ {2400, 9, 12, 10, 1, -11},
-    /* 0xE5 */ {2414, 3, 15, 4, 0, -14},
-    /* 0xE6 */ {2420, 8, 13, 9, 1, -12},
-    /* 0xE7 */ {2433, 8, 14, 9, 1, -9},
-    /* 0xE8 */ {2447, 8, 13, 9, 1, -12},
-    /* 0xE9 */ {2460, 8, 13, 10, 1, -12},
-    /* 0xEA */ {2473, 8, 14, 10, 1, -9},
-    /* 0xEB */ {2487, 8, 12, 10, 1, -11},
-    /* 0xEC */ {2499, 8, 13, 10, 1, -12},
-    /* 0xED */ {2512, 3, 13, 4, 1, -12},
-    /* 0xEE */ {2517, 4, 13, 5, 0, -12},
-    /* 0xEF */ {2524, 12, 13, 12, 1, -12},
-    /* 0xF0 */ {2544, 9, 13, 10, 1, -12},
-    /* 0xF1 */ {2559, 8, 13, 10, 1, -12},
-    /* 0xF2 */ {2572, 8, 13, 10, 1, -12},
-    /* 0xF3 */ {2585, 8, 13, 10, 1, -12},
-    /* 0xF4 */ {2598, 8, 13, 10, 1, -12},
-    /* 0xF5 */ {2611, 8, 13, 10, 1, -12},
-    /* 0xF6 */ {2624, 8, 12, 10, 1, -11},
-    /* 0xF7 */ {2636, 9, 8, 11, 1, -7},
-    /* 0xF8 */ {2645, 5, 13, 6, 1, -12},
-    /* 0xF9 */ {2654, 8, 13, 10, 1, -12},
-    /* 0xFA */ {2667, 8, 13, 10, 1, -12},
-    /* 0xFB */ {2680, 8, 13, 10, 1, -12},
-    /* 0xFC */ {2693, 8, 12, 10, 1, -11},
-    /* 0xFD */ {2705, 8, 17, 9, 0, -12},
-    /* 0xFE */ {2722, 5, 16, 5, 1, -11},
-    /* 0xFF */ {2732, 2, 1, 6, 2, -11},
-};
-
-const GFXfont FreeSans9pt_Win1250 PROGMEM = {(uint8_t *)FreeSans9pt_Win1250Bitmaps, (GFXglyph *)FreeSans9pt_Win1250Glyphs, 0x20,
-                                             0xFF, 21};
--- a/src/graphics/niche/Fonts/FreeSans9pt_Win1251.h
+++ b/src/graphics/niche/Fonts/FreeSans9pt_Win1251.h
@@ -1,493 +0,0 @@
-#pragma once
-const uint8_t FreeSans9pt_Win1251Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFF, 0xFF, 0xF0, 0xC0,                                                                                     /* '!' 0x21 */
-    0xDE, 0xF7, 0x20,                                                                                           /* '"' 0x22 */
-    0x09, 0x86, 0x41, 0x91, 0xFF, 0x13, 0x04, 0xC3, 0x20, 0xC8, 0xFF, 0x89, 0x82, 0x61, 0x90,                   /* '#' 0x23 */
-    0x10, 0x1F, 0x14, 0xDA, 0x3D, 0x1E, 0x83, 0x40, 0x78, 0x17, 0x08, 0xF4, 0x7A, 0x35, 0x33, 0xF0, 0x40, 0x20, /* '$' 0x24 */
-    0x38, 0x10, 0xEC, 0x20, 0xC6, 0x20, 0xC6, 0x40, 0xC6, 0x40, 0x6C, 0x80, 0x39, 0x00, 0x01, 0x3C, 0x02, 0x77, 0x02, 0x63, 0x04,
-    0x63, 0x04, 0x77, 0x08, 0x3C,                                                                         /* '%' 0x25 */
-    0x0E, 0x0C, 0xC3, 0x30, 0xCC, 0x1E, 0x03, 0x03, 0xC1, 0x9B, 0xC2, 0xF0, 0xEC, 0x19, 0x8F, 0x3C, 0x40, /* '&' 0x26 */
-    0xFE,                                                                                                 /* ''' 0x27 */
-    0x13, 0x26, 0x6C, 0xCC, 0xCC, 0xC4, 0x66, 0x23, 0x10,                                                 /* '(' 0x28 */
-    0x8C, 0x46, 0x63, 0x33, 0x33, 0x32, 0x66, 0x4C, 0x80,                                                 /* ')' 0x29 */
-    0x25, 0x7E, 0xA5, 0x00,                                                                               /* '*' 0x2A */
-    0x30, 0xC3, 0x3F, 0x30, 0xC3, 0x0C,                                                                   /* '+' 0x2B */
-    0xD6,                                                                                                 /* ',' 0x2C */
-    0xF0,                                                                                                 /* '-' 0x2D */
-    0xC0,                                                                                                 /* '.' 0x2E */
-    0x08, 0x44, 0x21, 0x10, 0x84, 0x42, 0x11, 0x08, 0x00,                                                 /* '/' 0x2F */
-    0x3C, 0x66, 0x42, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x42, 0x66, 0x3C,                         /* '0' 0x30 */
-    0x11, 0x3F, 0x33, 0x33, 0x33, 0x33, 0x30,                                                             /* '1' 0x31 */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x1C, 0x1C, 0x1C, 0x18, 0x18, 0x10, 0x08, 0x07, 0xF8,             /* '2' 0x32 */
-    0x3C, 0x66, 0xC3, 0xC3, 0x03, 0x06, 0x1C, 0x07, 0x03, 0xC3, 0xC3, 0x66, 0x3C,                         /* '3' 0x33 */
-    0x0C, 0x18, 0x71, 0x62, 0xC9, 0xA3, 0x46, 0xFE, 0x18, 0x30, 0x60, 0xC0,                               /* '4' 0x34 */
-    0x7F, 0x20, 0x10, 0x08, 0x08, 0x07, 0xF3, 0x8C, 0x03, 0x01, 0x80, 0xF0, 0x6C, 0x63, 0xE0,             /* '5' 0x35 */
-    0x1E, 0x31, 0x98, 0x78, 0x0C, 0x06, 0xF3, 0x8D, 0x83, 0xC1, 0xE0, 0xD0, 0x6C, 0x63, 0xE0,             /* '6' 0x36 */
-    0xFF, 0x03, 0x02, 0x06, 0x04, 0x0C, 0x08, 0x18, 0x18, 0x18, 0x10, 0x30, 0x30,                         /* '7' 0x37 */
-    0x3E, 0x31, 0xB0, 0x78, 0x3C, 0x1B, 0x18, 0xF8, 0xC6, 0xC1, 0xE0, 0xF0, 0x6C, 0x63, 0xE0,             /* '8' 0x38 */
-    0x3C, 0x66, 0xC2, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC2, 0x66, 0x3C,                         /* '9' 0x39 */
-    0xC0, 0x00, 0x30,                                                                                     /* ':' 0x3A */
-    0xC0, 0x00, 0x00, 0x64, 0xA0,                                                                         /* ';' 0x3B */
-    0x00, 0x81, 0xC7, 0x8E, 0x0C, 0x07, 0x80, 0x70, 0x0E, 0x01, 0x80,                                     /* '<' 0x3C */
-    0xFF, 0x80, 0x00, 0x1F, 0xF0,                                                                         /* '=' 0x3D */
-    0xE0, 0x1C, 0x03, 0x80, 0x30, 0x70, 0xE3, 0x81, 0x00,                                                 /* '>' 0x3E */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x18, 0x38, 0x18, 0x18, 0x0C, 0x00, 0x00, 0x01, 0x80,             /* '?' 0x3F */
-    0x03, 0xF0, 0x06, 0x0E, 0x06, 0x01, 0x86, 0x00, 0x66, 0x1D, 0xBB, 0x31, 0xCF, 0x18, 0xC7, 0x98, 0x63, 0xCC, 0x31, 0xE6, 0x11,
-    0xB3, 0x99, 0xCC, 0xF7, 0x86, 0x00, 0x01, 0x80, 0x00, 0x70, 0x40, 0x0F, 0xE0, /* '@' 0x40 */
-    0x06, 0x00, 0xF0, 0x0F, 0x00, 0x90, 0x19, 0x81, 0x98, 0x10, 0x83, 0x0C, 0x3F, 0xC2, 0x04, 0x60, 0x66, 0x06, 0xC0,
-    0x30,                                                                                                       /* 'A' 0x41 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x3F, 0xC6, 0x06, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 'B' 0x42 */
-    0x1F, 0x86, 0x19, 0x81, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0, /* 'C' 0x43 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x03, 0x60, 0xCF, 0xF0, /* 'D' 0x44 */
-    0xFF, 0xE0, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0F, 0xF8,                   /* 'E' 0x45 */
-    0xFF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFE, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,                               /* 'F' 0x46 */
-    0x0F, 0x83, 0x0E, 0x60, 0x66, 0x03, 0xC0, 0x0C, 0x00, 0xC1, 0xFC, 0x03, 0xC0, 0x36, 0x03, 0x60, 0x73, 0x0F, 0x0F,
-    0x10,                                                                                                       /* 'G' 0x47 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xFF, 0xFE, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06, /* 'H' 0x48 */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                                     /* 'I' 0x49 */
-    0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07, 0x8F, 0x1E, 0x27, 0x80,                                     /* 'J' 0x4A */
-    0xC0, 0xF0, 0x6C, 0x33, 0x18, 0xCC, 0x37, 0x0F, 0xC3, 0x98, 0xC3, 0x30, 0xCC, 0x1B, 0x03, 0xC0, 0xC0,       /* 'K' 0x4B */
-    0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF,                               /* 'L' 0x4C */
-    0xE0, 0x3F, 0x01, 0xFC, 0x1F, 0xE0, 0xFD, 0x05, 0xEC, 0x6F, 0x63, 0x79, 0x13, 0xCD, 0x9E, 0x6C, 0xF1, 0x47, 0x8E, 0x3C, 0x71,
-    0x80,                                                                                                       /* 'M' 0x4D */
-    0xE0, 0x7C, 0x0F, 0xC1, 0xE8, 0x3D, 0x87, 0x98, 0xF1, 0x1E, 0x33, 0xC3, 0x78, 0x6F, 0x07, 0xE0, 0x7C, 0x0E, /* 'N' 0x4E */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x0C, 0x60, 0xC0, 0xF8,
-    0x00,                                                                                                 /* 'O' 0x4F */
-    0xFF, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x6F, 0xF3, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00, /* 'P' 0x50 */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x6C, 0x60, 0xC0, 0xFB,
-    0x00, 0x08, /* 'Q' 0x51 */
-    0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06, 0xC0,
-    0x70,                                                                                                       /* 'R' 0x52 */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00,       /* 'S' 0x53 */
-    0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0,                   /* 'T' 0x54 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xB0, 0x61, 0xF0, /* 'U' 0x55 */
-    0xC0, 0x6C, 0x0D, 0x81, 0x10, 0x63, 0x0C, 0x61, 0x04, 0x60, 0xCC, 0x19, 0x01, 0x60, 0x3C, 0x07, 0x00, 0x60, /* 'V' 0x56 */
-    0xC1, 0x81, 0x61, 0xC3, 0x61, 0xC3, 0x61, 0x43, 0x62, 0x62, 0x22, 0x66, 0x32, 0x26, 0x36, 0x26, 0x14, 0x34, 0x14, 0x34, 0x1C,
-    0x1C, 0x18, 0x1C, 0x08, 0x18,                                                                         /* 'W' 0x57 */
-    0xC0, 0xD8, 0x66, 0x18, 0xCC, 0x1E, 0x07, 0x00, 0xC0, 0x78, 0x32, 0x0C, 0xC6, 0x1B, 0x07, 0xC0, 0xC0, /* 'X' 0x58 */
-    0xC0, 0x36, 0x06, 0x30, 0xC3, 0x0C, 0x19, 0x81, 0xD8, 0x0F, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06,
-    0x00,                                                                                                 /* 'Y' 0x59 */
-    0xFF, 0xC0, 0x60, 0x30, 0x0C, 0x06, 0x03, 0x01, 0xC0, 0x60, 0x30, 0x18, 0x06, 0x03, 0x00, 0xFF, 0xC0, /* 'Z' 0x5A */
-    0xFB, 0x6D, 0xB6, 0xDB, 0x6D, 0xB6, 0xE0,                                                             /* '[' 0x5B */
-    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x80,                                                 /* '\' 0x5C */
-    0xED, 0xB6, 0xDB, 0x6D, 0xB6, 0xDB, 0xE0,                                                             /* ']' 0x5D */
-    0x30, 0x60, 0xA2, 0x44, 0xD8, 0xA1, 0x80,                                                             /* '^' 0x5E */
-    0xFF, 0xC0,                                                                                           /* '_' 0x5F */
-    0xC6, 0x30,                                                                                           /* '`' 0x60 */
-    0x7E, 0x71, 0xB0, 0xC0, 0x60, 0xF3, 0xDB, 0x0D, 0x86, 0xC7, 0x3D, 0xC0,                               /* 'a' 0x61 */
-    0xC0, 0x60, 0x30, 0x1B, 0xCE, 0x36, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x7C, 0x6D, 0xE0,             /* 'b' 0x62 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'c' 0x63 */
-    0x03, 0x03, 0x03, 0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B,                         /* 'd' 0x64 */
-    0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'e' 0x65 */
-    0x36, 0x6F, 0x66, 0x66, 0x66, 0x66, 0x60,                                                             /* 'f' 0x66 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC6, 0x7C,                   /* 'g' 0x67 */
-    0xC0, 0xC0, 0xC0, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                         /* 'h' 0x68 */
-    0xC3, 0xFF, 0xFF, 0xC0,                                                                               /* 'i' 0x69 */
-    0x30, 0x03, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0xE0,                                                 /* 'j' 0x6A */
-    0xC0, 0xC0, 0xC0, 0xC2, 0xC4, 0xCC, 0xD8, 0xF8, 0xEC, 0xC4, 0xC6, 0xC3, 0xC3,                         /* 'k' 0x6B */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                               /* 'l' 0x6C */
-    0xDE, 0xF7, 0x1C, 0xF0, 0xC7, 0x86, 0x3C, 0x31, 0xE1, 0x8F, 0x0C, 0x78, 0x63, 0xC3, 0x1E, 0x18, 0xC0, /* 'm' 0x6D */
-    0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                                           /* 'n' 0x6E */
-    0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                           /* 'o' 0x6F */
-    0xDE, 0x71, 0xB0, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x83, 0xE3, 0x6F, 0x30, 0x18, 0x0C, 0x00,             /* 'p' 0x70 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0x03,                         /* 'q' 0x71 */
-    0xDF, 0x31, 0x8C, 0x63, 0x18, 0xC6, 0x00,                                                             /* 'r' 0x72 */
-    0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,                                           /* 's' 0x73 */
-    0x66, 0xF6, 0x66, 0x66, 0x66, 0x67,                                                                   /* 't' 0x74 */
-    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                           /* 'u' 0x75 */
-    0xC1, 0xA0, 0x98, 0xCC, 0x42, 0x21, 0xB0, 0xD0, 0x28, 0x1C, 0x0C, 0x00,                               /* 'v' 0x76 */
-    0xC6, 0x1E, 0x38, 0x91, 0xC4, 0xCA, 0x66, 0xD3, 0x16, 0xD0, 0xA6, 0x87, 0x1C, 0x38, 0xC0, 0xC6, 0x00, /* 'w' 0x77 */
-    0x87, 0x89, 0xB1, 0xC3, 0x07, 0x1E, 0x26, 0xC5, 0x0C,                                                 /* 'x' 0x78 */
-    0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 'y' 0x79 */
-    0xFE, 0x0C, 0x30, 0xC1, 0x86, 0x18, 0x20, 0xC1, 0xFC,                                                 /* 'z' 0x7A */
-    0x36, 0x66, 0x66, 0x6E, 0xCE, 0x66, 0x66, 0x66, 0x30,                                                 /* '{' 0x7B */
-    0xFF, 0xFF, 0xFF, 0xFF, 0xC0,                                                                         /* '|' 0x7C */
-    0xC6, 0x66, 0x66, 0x67, 0x37, 0x66, 0x66, 0x66, 0xC0,                                                 /* '}' 0x7D */
-    0x61, 0x24, 0x38,                                                                                     /* '~' 0x7E */
-    0xFF, 0xFC, 0x00, 0x63, 0xE3, 0x31, 0x99, 0x04, 0xC8, 0x66, 0x06, 0x30, 0x61, 0x83, 0x0C, 0x18, 0x60, 0x03, 0x06, 0x18, 0x00,
-    0xFF, 0xFC, /* 0x7F */
-    0xFF, 0x01, 0x80, 0x18, 0x01, 0x80, 0x18, 0x01, 0xFE, 0x18, 0x31, 0x83, 0x18, 0x31, 0x83, 0x18, 0x31, 0x83, 0x18, 0x30, 0x03,
-    0x00, 0x30, 0x0E,                                                                                     /* 0x80 */
-    0x0C, 0x18, 0x00, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,             /* 0x81 */
-    0xDC,                                                                                                 /* 0x82 */
-    0x18, 0x89, 0xFC, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x00,                                                 /* 0x83 */
-    0xDA, 0x76,                                                                                           /* 0x84 */
-    0xCC, 0xC0,                                                                                           /* 0x85 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,       /* 0x86 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18,       /* 0x87 */
-    0x07, 0xC6, 0x13, 0x00, 0xC0, 0x60, 0x3F, 0xE6, 0x03, 0xFC, 0x60, 0x0C, 0x03, 0x00, 0x61, 0x07, 0xC0, /* 0x88 */
-    0x70, 0x80, 0x22, 0x20, 0x08, 0x90, 0x02, 0x24, 0x00, 0x72, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x10, 0x00, 0x09, 0xC7, 0x84,
-    0x8B, 0x31, 0x22, 0x84, 0x88, 0xB3, 0x21, 0xC7, 0x80, /* 0x89 */
-    0x3F, 0x80, 0x18, 0xC0, 0x0C, 0x60, 0x06, 0x30, 0x03, 0x18, 0x01, 0x8C, 0x00, 0xC7, 0xF8, 0x63, 0x06, 0x31, 0x81, 0x90, 0xC0,
-    0xD8, 0x60, 0x6C, 0x30, 0x6C, 0x1F, 0xE0, /* 0x8A */
-    0x69,                                     /* 0x8B */
-    0xC0, 0xC0, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0C, 0x0C, 0x06, 0x06, 0x03, 0xFF, 0xF9, 0x81, 0x86, 0xC0, 0xC1, 0xE0, 0x60,
-    0xF0, 0x30, 0x78, 0x18, 0x6C, 0x0F, 0xE0,                                                                         /* 0x8C */
-    0x0C, 0x06, 0x0C, 0x1B, 0x0C, 0xC6, 0x33, 0x0D, 0x83, 0xC0, 0xF0, 0x3E, 0x0D, 0xC3, 0x38, 0xC7, 0x30, 0xEC, 0x1C, /* 0x8D */
-    0xFF, 0x01, 0x80, 0x18, 0x01, 0x80, 0x18, 0x01, 0xFE, 0x18, 0x31, 0x83, 0x18, 0x31, 0x83, 0x18, 0x31, 0x83, 0x18,
-    0x30, /* 0x8E */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3F, 0xFE, 0x0C, 0x01,
-    0x80,                                                                                                       /* 0x8F */
-    0x60, 0x7C, 0x18, 0x0D, 0xE7, 0x1B, 0x0D, 0x86, 0xC3, 0x61, 0xB0, 0xD8, 0x6C, 0x36, 0x18, 0x18, 0x08, 0x08, /* 0x90 */
-    0x6B,                                                                                                       /* 0x91 */
-    0xD6,                                                                                                       /* 0x92 */
-    0x4C, 0xA5, 0xB0,                                                                                           /* 0x93 */
-    0xDA, 0x53, 0x20,                                                                                           /* 0x94 */
-    0x6F, 0xFF, 0x60,                                                                                           /* 0x95 */
-    0xFE,                                                                                                       /* 0x96 */
-    0xFF, 0xFF,                                                                                                 /* 0x97 */
-    /* 0x98 */
-    0xFC, 0xE1, 0xCC, 0x38, 0x73, 0x0E, 0x1C, 0xC3, 0x8F, 0x30, 0xD2, 0xCC, 0x34, 0xB3, 0x0D, 0x6C, 0xC3, 0x53, 0x30, 0xCC, 0xCC,
-    0x33, 0x30,                                                                                                 /* 0x99 */
-    0x7E, 0x03, 0x30, 0x19, 0x80, 0xCC, 0x06, 0x60, 0x33, 0xF9, 0x98, 0x6C, 0xC3, 0x46, 0x1E, 0x3F, 0x80,       /* 0x9A */
-    0x96,                                                                                                       /* 0x9B */
-    0xC3, 0x03, 0x0C, 0x0C, 0x30, 0x30, 0xC0, 0xC3, 0x03, 0xFF, 0xEC, 0x30, 0xF0, 0xC3, 0xC3, 0x0F, 0x0F, 0xE0, /* 0x9C */
-    0x0C, 0x30, 0x46, 0x3C, 0xDB, 0x34, 0x70, 0xF1, 0xB3, 0x36, 0x3C, 0x20,                                     /* 0x9D */
-    0x60, 0x7C, 0x18, 0x0D, 0xE7, 0x3B, 0x0D, 0x86, 0xC3, 0x61, 0xB0, 0xD8, 0x6C, 0x36, 0x18,                   /* 0x9E */
-    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0x18, 0x18,                                     /* 0x9F */
-    /* 0xA0 */
-    0x21, 0x07, 0x8C, 0x0F, 0x06, 0x61, 0x98, 0xC3, 0x30, 0xD8, 0x1E, 0x07, 0x00, 0xC0, 0x60, 0x18, 0x0C, 0x03, 0x00, /* 0xA1 */
-    0x66, 0x18, 0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 0xA2 */
-    0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07, 0x8F, 0x1E, 0x27, 0x80,                                           /* 0xA3 */
-    0xFF, 0xDF, 0x1E, 0x3E, 0xFF, 0xC0,                                                                               /* 0xA4 */
-    0x00, 0xC0, 0x3F, 0xFF, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x30, 0x00,       /* 0xA5 */
-    0xFF, 0xFC, 0x0F, 0xFF, 0xC0,                                                                                     /* 0xA6 */
-    0x0C, 0x09, 0x0C, 0xC6, 0x63, 0x81, 0xE3, 0x19, 0x87, 0xE1, 0xB8, 0xC6, 0x41, 0xC0, 0x73, 0x19, 0x8C, 0x66, 0x1E,
-    0x00,                                                                                                 /* 0xA7 */
-    0x33, 0x00, 0x3F, 0xF8, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFE, /* 0xA8 */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9B, 0xC6, 0xD9, 0x8F, 0x60, 0x3D, 0x00, 0xF4, 0x03, 0xD8, 0x0D, 0xE6, 0x67, 0xF3, 0x86, 0x18,
-    0x0F, 0xC0,                                                                                                 /* 0xA9 */
-    0x1F, 0x86, 0x19, 0x81, 0xB0, 0x3C, 0x01, 0x80, 0x3F, 0xC6, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0, /* 0xAA */
-    0x22, 0xCF, 0x26, 0x46, 0x64, 0x40,                                                                         /* 0xAB */
-    0xFF, 0x80, 0xC0, 0x60, 0x30, 0x18,                                                                         /* 0xAC */
-    /* 0xAD */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9F, 0xE6, 0xD0, 0x8F, 0x42, 0x3D, 0xF0, 0xF4, 0x23, 0xD0, 0x8D, 0xC2, 0x67, 0x0B, 0x86, 0x18,
-    0x0F, 0xC0,                                                                                     /* 0xAE */
-    0xCC, 0x03, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x00,                         /* 0xAF */
-    0x74, 0x63, 0x17, 0x00,                                                                         /* 0xB0 */
-    0x0C, 0x06, 0x03, 0x07, 0xE0, 0xC0, 0x60, 0x30, 0x18, 0x00, 0x00, 0x3F, 0xE0,                   /* 0xB1 */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                         /* 0xB2 */
-    0xC3, 0xFF, 0xFF, 0xC0,                                                                         /* 0xB3 */
-    0x0C, 0x3F, 0xF0, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x30,                                           /* 0xB4 */
-    0xC3, 0x61, 0xB0, 0xD8, 0x6C, 0x36, 0x1B, 0x0D, 0x86, 0xE7, 0x7D, 0xF0, 0x18, 0x0C, 0x00,       /* 0xB5 */
-    0x3F, 0x7E, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0x72, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, /* 0xB6 */
-    0xE0,                                                                                           /* 0xB7 */
-    0x66, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                         /* 0xB8 */
-    0xC1, 0x81, 0x83, 0x03, 0x86, 0x05, 0x0C, 0xEB, 0x1A, 0x32, 0x34, 0x66, 0x68, 0xC4, 0xD1, 0x8D, 0xB3, 0x0B, 0x3A, 0x1E, 0x04,
-    0x1C, 0x08, 0x1B, 0xC0,                                                                               /* 0xB9 */
-    0x3C, 0x46, 0xC3, 0x80, 0xF8, 0x80, 0x80, 0xC3, 0x46, 0x3C,                                           /* 0xBA */
-    0x89, 0x98, 0x99, 0x3C, 0xD1, 0x00,                                                                   /* 0xBB */
-    0x30, 0x03, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0xE0,                                                 /* 0xBC */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00, /* 0xBD */
-    0x3E, 0xE3, 0xC0, 0xC0, 0x60, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,                                           /* 0xBE */
-    0xCC, 0x03, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x0C,                                                 /* 0xBF */
-    0x06, 0x00, 0xF0, 0x0F, 0x00, 0x90, 0x19, 0x81, 0x98, 0x10, 0x83, 0x0C, 0x3F, 0xC2, 0x04, 0x60, 0x66, 0x06, 0xC0,
-    0x30,                                                                                                       /* 0xC0 */
-    0xFF, 0x18, 0x03, 0x00, 0x60, 0x0C, 0x01, 0x80, 0x3F, 0xE6, 0x06, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 0xC1 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x3F, 0xC6, 0x06, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 0xC2 */
-    0xFF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,                               /* 0xC3 */
-    0x1F, 0xF0, 0x60, 0xC1, 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x03, 0x0C, 0x0C,
-    0xFF, 0xFF, 0x00, 0x3C, 0x00, 0xF0, 0x03,                                                 /* 0xC4 */
-    0xFF, 0xE0, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0F, 0xF8, /* 0xC5 */
-    0x61, 0x86, 0x31, 0x8C, 0x19, 0x98, 0x19, 0x98, 0x0D, 0xB0, 0x07, 0xE0, 0x03, 0xC0, 0x07, 0xE0, 0x0D, 0xB0, 0x19, 0x98, 0x31,
-    0x8C, 0x61, 0x86, 0xC1, 0x83,                                                                               /* 0xC6 */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0x00, 0xC0, 0x60, 0xF0, 0x06, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00,       /* 0xC7 */
-    0xC0, 0xF8, 0x1F, 0x07, 0xE0, 0xBC, 0x37, 0x8C, 0xF1, 0x1E, 0x63, 0xD8, 0x7A, 0x0F, 0xC1, 0xF0, 0x3E, 0x06, /* 0xC8 */
-    0x11, 0x03, 0xE0, 0x00, 0x60, 0x7C, 0x0F, 0x83, 0xF0, 0x5E, 0x1B, 0xC6, 0x78, 0x8F, 0x31, 0xEC, 0x3D, 0x07, 0xE0, 0xF8, 0x1F,
-    0x03,                                                                                                 /* 0xC9 */
-    0xC1, 0xB0, 0xCC, 0x63, 0x30, 0xD8, 0x3C, 0x0F, 0x03, 0xE0, 0xDC, 0x33, 0x8C, 0x73, 0x0E, 0xC1, 0xC0, /* 0xCA */
-    0x3F, 0xCC, 0x33, 0x0C, 0xC3, 0x30, 0xCC, 0x33, 0x0C, 0xC3, 0x30, 0xC8, 0x36, 0x0D, 0x83, 0xC0, 0xC0, /* 0xCB */
-    0xE0, 0x3F, 0x01, 0xFC, 0x1F, 0xE0, 0xFD, 0x05, 0xEC, 0x6F, 0x63, 0x79, 0x13, 0xCD, 0x9E, 0x6C, 0xF1, 0x47, 0x8E, 0x3C, 0x71,
-    0x80,                                                                                                       /* 0xCC */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xFF, 0xFE, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06, /* 0xCD */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x0C, 0x60, 0xC0, 0xF8,
-    0x00,                                                                                                       /* 0xCE */
-    0xFF, 0xF8, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06, /* 0xCF */
-    0xFF, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x6F, 0xF3, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00,       /* 0xD0 */
-    0x1F, 0x86, 0x19, 0x81, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0, /* 0xD1 */
-    0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0,                   /* 0xD2 */
-    0xC0, 0xF0, 0x66, 0x19, 0x8C, 0x33, 0x0D, 0x81, 0xE0, 0x70, 0x0C, 0x06, 0x01, 0x80, 0xC0, 0x30, 0x00,       /* 0xD3 */
-    0x03, 0x00, 0x0C, 0x01, 0xFE, 0x1C, 0xCE, 0xE3, 0x1F, 0x0C, 0x3C, 0x30, 0xF0, 0xC3, 0xE3, 0x1D, 0xCC, 0xE3, 0xFF, 0x00, 0xC0,
-    0x03, 0x00,                                                                                           /* 0xD4 */
-    0xC0, 0xD8, 0x66, 0x18, 0xCC, 0x1E, 0x07, 0x00, 0xC0, 0x78, 0x32, 0x0C, 0xC6, 0x1B, 0x07, 0xC0, 0xC0, /* 0xD5 */
-    0xC0, 0x66, 0x03, 0x30, 0x19, 0x80, 0xCC, 0x06, 0x60, 0x33, 0x01, 0x98, 0x0C, 0xC0, 0x66, 0x03, 0x30, 0x19, 0x80, 0xCF, 0xFF,
-    0x80, 0x0C, 0x00, 0x60,                                                                   /* 0xD6 */
-    0xC1, 0xE0, 0xF0, 0x78, 0x3C, 0x1E, 0x0F, 0x06, 0xFF, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, /* 0xD7 */
-    0xC3, 0x1E, 0x18, 0xF0, 0xC7, 0x86, 0x3C, 0x31, 0xE1, 0x8F, 0x0C, 0x78, 0x63, 0xC3, 0x1E, 0x18, 0xF0, 0xC7, 0x86, 0x3F, 0xFF,
-    0x80, /* 0xD8 */
-    0xC3, 0x19, 0x86, 0x33, 0x0C, 0x66, 0x18, 0xCC, 0x31, 0x98, 0x63, 0x30, 0xC6, 0x61, 0x8C, 0xC3, 0x19, 0x86, 0x33, 0x0C, 0x66,
-    0x18, 0xCF, 0xFF, 0xE0, 0x00, 0xC0, 0x01, 0x80, /* 0xD9 */
-    0xF8, 0x00, 0xC0, 0x06, 0x00, 0x30, 0x01, 0x80, 0x0F, 0xF0, 0x60, 0xC3, 0x03, 0x18, 0x18, 0xC0, 0xC6, 0x06, 0x30, 0x61, 0xFE,
-    0x00, /* 0xDA */
-    0xC0, 0x0F, 0x00, 0x3C, 0x00, 0xF0, 0x03, 0xC0, 0x0F, 0xFE, 0x3C, 0x0C, 0xF0, 0x1B, 0xC0, 0x6F, 0x01, 0xBC, 0x06, 0xF0, 0x33,
-    0xFF, 0x8C,                                                                                                 /* 0xDB */
-    0xC0, 0x18, 0x03, 0x00, 0x60, 0x0C, 0x01, 0xFF, 0x30, 0x36, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 0xDC */
-    0x3F, 0x0C, 0x33, 0x83, 0x60, 0x20, 0x06, 0x00, 0x47, 0xF8, 0x01, 0xC0, 0x78, 0x0D, 0x81, 0x30, 0xC1, 0xF0, /* 0xDD */
-    0xC0, 0xF8, 0x61, 0x83, 0x31, 0x80, 0xD8, 0xC0, 0x6C, 0xC0, 0x1E, 0x60, 0x0F, 0xF0, 0x07, 0x98, 0x03, 0xCC, 0x01, 0xE3, 0x01,
-    0xB1, 0x80, 0xD8, 0x60, 0xCC, 0x0F, 0x80,                                                             /* 0xDE */
-    0x3F, 0xD8, 0x3C, 0x0F, 0x03, 0xC0, 0xD8, 0x33, 0xFC, 0x33, 0x18, 0xCC, 0x36, 0x0D, 0x83, 0xC0, 0xC0, /* 0xDF */
-    0x7E, 0x71, 0xB0, 0xC0, 0x60, 0xF3, 0xDB, 0x0D, 0x86, 0xC7, 0x3D, 0xC0,                               /* 0xE0 */
-    0x03, 0x1F, 0x78, 0x40, 0xFC, 0xE6, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                   /* 0xE1 */
-    0xFD, 0x8F, 0x0E, 0x3F, 0xDF, 0xB1, 0xE1, 0xC7, 0xF8,                                                 /* 0xE2 */
-    0xFE, 0x31, 0x8C, 0x63, 0x18, 0xC6, 0x00,                                                             /* 0xE3 */
-    0x1F, 0x83, 0x30, 0x66, 0x0C, 0xC1, 0x98, 0x33, 0x06, 0x61, 0x8C, 0x31, 0x9F, 0xFF, 0x01, 0xE0, 0x30, /* 0xE4 */
-    0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 0xE5 */
-    0xC6, 0x36, 0x66, 0x36, 0xC1, 0xF8, 0x0F, 0x01, 0xF8, 0x36, 0xC6, 0x66, 0xC6, 0x38, 0x61,             /* 0xE6 */
-    0x79, 0x8C, 0x18, 0x30, 0x43, 0x01, 0xE3, 0xC6, 0xF8,                                                 /* 0xE7 */
-    0xC7, 0xC7, 0xCF, 0xCB, 0xCB, 0xD3, 0xD3, 0xF3, 0xE3, 0xE3,                                           /* 0xE8 */
-    0x66, 0x18, 0xC7, 0xC7, 0xCF, 0xCB, 0xCB, 0xD3, 0xD3, 0xF3, 0xE3, 0xE3,                               /* 0xE9 */
-    0xC7, 0x9B, 0x66, 0x8E, 0x1E, 0x36, 0x66, 0xC7, 0x84,                                                 /* 0xEA */
-    0x7E, 0xCD, 0x9B, 0x36, 0x6C, 0xD9, 0xA3, 0xC7, 0x0C,                                                 /* 0xEB */
-    0xE3, 0xF1, 0xF8, 0xFE, 0xFF, 0x7E, 0xAF, 0x77, 0x93, 0xC9, 0xE0, 0xC0,                               /* 0xEC */
-    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0xC3, 0xC3, 0xC3, 0xC3,                                           /* 0xED */
-    0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                           /* 0xEE */
-    0xFF, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                                           /* 0xEF */
-    0xDE, 0x71, 0xB0, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x83, 0xE3, 0x6F, 0x30, 0x18, 0x0C, 0x00,             /* 0xF0 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 0xF1 */
-    0xFC, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC0,                                                       /* 0xF2 */
-    0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 0xF3 */
-    0x03, 0x00, 0x0C, 0x03, 0xB7, 0x19, 0xE6, 0xC3, 0x0F, 0x0C, 0x3C, 0x30, 0xF0, 0xC3, 0xC3, 0x0F, 0x0C, 0x36, 0x79, 0x8E, 0xDC,
-    0x03, 0x00, 0x0C, 0x00, 0x30, 0x00,                                                                         /* 0xF4 */
-    0x87, 0x89, 0xB1, 0xC3, 0x07, 0x1E, 0x26, 0xC5, 0x0C,                                                       /* 0xF5 */
-    0xC3, 0x30, 0xCC, 0x33, 0x0C, 0xC3, 0x30, 0xCC, 0x33, 0x0C, 0xC3, 0x3F, 0xF0, 0x0C, 0x03,                   /* 0xF6 */
-    0xC7, 0x8F, 0x1E, 0x3C, 0x6F, 0xC1, 0x83, 0x06, 0x0C,                                                       /* 0xF7 */
-    0xCC, 0xF3, 0x3C, 0xCF, 0x33, 0xCC, 0xF3, 0x3C, 0xCF, 0x33, 0xCC, 0xFF, 0xF0,                               /* 0xF8 */
-    0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCF, 0xFF, 0x00, 0x30, 0x03, /* 0xF9 */
-    0xF0, 0x18, 0x0C, 0x06, 0x03, 0xF1, 0x8C, 0xC6, 0x63, 0x31, 0x9F, 0x80,                                     /* 0xFA */
-    0xC0, 0xF0, 0x3C, 0x0F, 0x03, 0xFE, 0xF0, 0xFC, 0x3F, 0x0F, 0xC3, 0xFF, 0xB0,                               /* 0xFB */
-    0xC0, 0xC0, 0xC0, 0xC0, 0xFE, 0xC3, 0xC3, 0xC3, 0xC3, 0xFE,                                                 /* 0xFC */
-    0x3C, 0x62, 0xC3, 0x01, 0x1F, 0x01, 0x01, 0xC3, 0x62, 0x3C,                                                 /* 0xFD */
-    0xC7, 0xCC, 0xC6, 0xD8, 0x3D, 0x83, 0xF8, 0x3D, 0x83, 0xD8, 0x3C, 0xC2, 0xCC, 0x6C, 0x7C,                   /* 0xFE */
-    0x7F, 0xC3, 0xC3, 0xC3, 0x7F, 0x13, 0x33, 0x63, 0xC3, 0x83,                                                 /* 0xFF */
-};
-
-const GFXglyph FreeSans9pt_Win1251Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 5, 0, 0},
-    /* '!' 0x21 */ {0, 2, 13, 6, 2, -12},
-    /* '"' 0x22 */ {4, 5, 4, 6, 1, -12},
-    /* '#' 0x23 */ {7, 10, 12, 10, 0, -11},
-    /* '$' 0x24 */ {22, 9, 16, 10, 1, -13},
-    /* '%' 0x25 */ {40, 16, 13, 16, 1, -12},
-    /* '&' 0x26 */ {66, 10, 13, 12, 1, -12},
-    /* ''' 0x27 */ {83, 2, 4, 4, 1, -12},
-    /* '(' 0x28 */ {84, 4, 17, 6, 1, -12},
-    /* ')' 0x29 */ {93, 4, 17, 6, 1, -12},
-    /* '*' 0x2A */ {102, 5, 5, 7, 1, -12},
-    /* '+' 0x2B */ {106, 6, 8, 11, 3, -7},
-    /* ',' 0x2C */ {112, 2, 4, 5, 2, 0},
-    /* '-' 0x2D */ {113, 4, 1, 6, 1, -4},
-    /* '.' 0x2E */ {114, 2, 1, 5, 1, 0},
-    /* '/' 0x2F */ {115, 5, 13, 5, 0, -12},
-    /* '0' 0x30 */ {124, 8, 13, 10, 1, -12},
-    /* '1' 0x31 */ {137, 4, 13, 10, 3, -12},
-    /* '2' 0x32 */ {144, 9, 13, 10, 1, -12},
-    /* '3' 0x33 */ {159, 8, 13, 10, 1, -12},
-    /* '4' 0x34 */ {172, 7, 13, 10, 2, -12},
-    /* '5' 0x35 */ {184, 9, 13, 10, 1, -12},
-    /* '6' 0x36 */ {199, 9, 13, 10, 1, -12},
-    /* '7' 0x37 */ {214, 8, 13, 10, 0, -12},
-    /* '8' 0x38 */ {227, 9, 13, 10, 1, -12},
-    /* '9' 0x39 */ {242, 8, 13, 10, 1, -12},
-    /* ':' 0x3A */ {255, 2, 10, 5, 1, -9},
-    /* ';' 0x3B */ {258, 3, 12, 5, 1, -8},
-    /* '<' 0x3C */ {263, 9, 9, 11, 1, -8},
-    /* '=' 0x3D */ {274, 9, 4, 11, 1, -5},
-    /* '>' 0x3E */ {279, 9, 8, 11, 1, -7},
-    /* '?' 0x3F */ {288, 9, 13, 10, 1, -12},
-    /* '@' 0x40 */ {303, 17, 16, 18, 1, -12},
-    /* 'A' 0x41 */ {337, 12, 13, 12, 0, -12},
-    /* 'B' 0x42 */ {357, 11, 13, 12, 1, -12},
-    /* 'C' 0x43 */ {375, 11, 13, 13, 1, -12},
-    /* 'D' 0x44 */ {393, 11, 13, 13, 1, -12},
-    /* 'E' 0x45 */ {411, 9, 13, 11, 1, -12},
-    /* 'F' 0x46 */ {426, 8, 13, 11, 1, -12},
-    /* 'G' 0x47 */ {439, 12, 13, 14, 1, -12},
-    /* 'H' 0x48 */ {459, 11, 13, 13, 1, -12},
-    /* 'I' 0x49 */ {477, 2, 13, 5, 2, -12},
-    /* 'J' 0x4A */ {481, 7, 13, 10, 1, -12},
-    /* 'K' 0x4B */ {493, 10, 13, 12, 1, -12},
-    /* 'L' 0x4C */ {510, 8, 13, 10, 1, -12},
-    /* 'M' 0x4D */ {523, 13, 13, 15, 1, -12},
-    /* 'N' 0x4E */ {545, 11, 13, 13, 1, -12},
-    /* 'O' 0x4F */ {563, 13, 13, 14, 1, -12},
-    /* 'P' 0x50 */ {585, 10, 13, 12, 1, -12},
-    /* 'Q' 0x51 */ {602, 13, 14, 14, 1, -12},
-    /* 'R' 0x52 */ {625, 12, 13, 13, 1, -12},
-    /* 'S' 0x53 */ {645, 10, 13, 12, 1, -12},
-    /* 'T' 0x54 */ {662, 9, 13, 11, 1, -12},
-    /* 'U' 0x55 */ {677, 11, 13, 13, 1, -12},
-    /* 'V' 0x56 */ {695, 11, 13, 11, 0, -12},
-    /* 'W' 0x57 */ {713, 16, 13, 17, 0, -12},
-    /* 'X' 0x58 */ {739, 10, 13, 12, 1, -12},
-    /* 'Y' 0x59 */ {756, 12, 13, 12, 0, -12},
-    /* 'Z' 0x5A */ {776, 10, 13, 11, 1, -12},
-    /* '[' 0x5B */ {793, 3, 17, 5, 1, -12},
-    /* '\' 0x5C */ {800, 5, 13, 5, 0, -12},
-    /* ']' 0x5D */ {809, 3, 17, 5, 0, -12},
-    /* '^' 0x5E */ {816, 7, 7, 8, 1, -12},
-    /* '_' 0x5F */ {823, 10, 1, 10, 0, 3},
-    /* '`' 0x60 */ {825, 4, 3, 5, 0, -12},
-    /* 'a' 0x61 */ {827, 9, 10, 10, 1, -9},
-    /* 'b' 0x62 */ {839, 9, 13, 10, 1, -12},
-    /* 'c' 0x63 */ {854, 8, 10, 9, 1, -9},
-    /* 'd' 0x64 */ {864, 8, 13, 10, 1, -12},
-    /* 'e' 0x65 */ {877, 8, 10, 10, 1, -9},
-    /* 'f' 0x66 */ {887, 4, 13, 5, 1, -12},
-    /* 'g' 0x67 */ {894, 8, 14, 10, 1, -9},
-    /* 'h' 0x68 */ {908, 8, 13, 10, 1, -12},
-    /* 'i' 0x69 */ {921, 2, 13, 4, 1, -12},
-    /* 'j' 0x6A */ {925, 4, 17, 4, 0, -12},
-    /* 'k' 0x6B */ {934, 8, 13, 9, 1, -12},
-    /* 'l' 0x6C */ {947, 2, 13, 4, 1, -12},
-    /* 'm' 0x6D */ {951, 13, 10, 15, 1, -9},
-    /* 'n' 0x6E */ {968, 8, 10, 10, 1, -9},
-    /* 'o' 0x6F */ {978, 8, 10, 10, 1, -9},
-    /* 'p' 0x70 */ {988, 9, 13, 10, 1, -9},
-    /* 'q' 0x71 */ {1003, 8, 13, 10, 1, -9},
-    /* 'r' 0x72 */ {1016, 5, 10, 6, 1, -9},
-    /* 's' 0x73 */ {1023, 8, 10, 9, 1, -9},
-    /* 't' 0x74 */ {1033, 4, 12, 5, 1, -11},
-    /* 'u' 0x75 */ {1039, 8, 10, 10, 1, -9},
-    /* 'v' 0x76 */ {1049, 9, 10, 9, 0, -9},
-    /* 'w' 0x77 */ {1061, 13, 10, 13, 0, -9},
-    /* 'x' 0x78 */ {1078, 7, 10, 9, 1, -9},
-    /* 'y' 0x79 */ {1087, 8, 14, 9, 0, -9},
-    /* 'z' 0x7A */ {1101, 7, 10, 9, 1, -9},
-    /* '{' 0x7B */ {1110, 4, 17, 6, 1, -12},
-    /* '|' 0x7C */ {1119, 2, 17, 4, 2, -12},
-    /* '}' 0x7D */ {1124, 4, 17, 6, 1, -12},
-    /* '~' 0x7E */ {1133, 7, 3, 9, 1, -7},
-    /* 0x7F */ {1136, 13, 14, 15, 1, -12},
-    /* 0x80 */ {1159, 12, 16, 14, 1, -12},
-    /* 0x81 */ {1183, 8, 15, 11, 1, -14},
-    /* 0x82 */ {1198, 2, 3, 5, 1, 0},
-    /* 0x83 */ {1199, 5, 13, 7, 1, -12},
-    /* 0x84 */ {1208, 5, 3, 7, 1, 0},
-    /* 0x85 */ {1210, 10, 1, 12, 1, 0},
-    /* 0x86 */ {1212, 8, 16, 10, 1, -12},
-    /* 0x87 */ {1228, 8, 16, 10, 1, -12},
-    /* 0x88 */ {1244, 10, 13, 12, 1, -12},
-    /* 0x89 */ {1261, 18, 13, 18, 0, -12},
-    /* 0x8A */ {1291, 17, 13, 18, 1, -12},
-    /* 0x8B */ {1319, 2, 4, 4, 1, -6},
-    /* 0x8C */ {1320, 17, 13, 18, 1, -12},
-    /* 0x8D */ {1348, 10, 15, 11, 1, -14},
-    /* 0x8E */ {1367, 12, 13, 14, 1, -12},
-    /* 0x8F */ {1387, 11, 15, 13, 1, -12},
-    /* 0x90 */ {1408, 9, 16, 10, 1, -12},
-    /* 0x91 */ {1426, 2, 4, 4, 2, -12},
-    /* 0x92 */ {1427, 2, 4, 4, 1, -12},
-    /* 0x93 */ {1428, 5, 4, 7, 2, -12},
-    /* 0x94 */ {1431, 5, 4, 7, 1, -12},
-    /* 0x95 */ {1434, 4, 5, 7, 1, -8},
-    /* 0x96 */ {1437, 7, 1, 9, 1, -4},
-    /* 0x97 */ {1438, 16, 1, 18, 1, -4},
-    /* 0x98 */ {1440, 0, 0, 0, 0, 0},
-    /* 0x99 */ {1440, 18, 10, 18, 1, -13},
-    /* 0x9A */ {1463, 13, 10, 14, 1, -9},
-    /* 0x9B */ {1480, 2, 4, 5, 2, -6},
-    /* 0x9C */ {1481, 14, 10, 15, 1, -9},
-    /* 0x9D */ {1499, 7, 13, 9, 1, -12},
-    /* 0x9E */ {1511, 9, 13, 10, 1, -12},
-    /* 0x9F */ {1526, 8, 12, 10, 1, -9},
-    /* 0xA0 */ {1538, 0, 0, 5, 0, 0},
-    /* 0xA1 */ {1538, 10, 15, 11, 1, -14},
-    /* 0xA2 */ {1557, 8, 16, 9, 0, -11},
-    /* 0xA3 */ {1573, 7, 13, 10, 1, -12},
-    /* 0xA4 */ {1585, 7, 6, 10, 2, -8},
-    /* 0xA5 */ {1591, 10, 14, 11, 1, -13},
-    /* 0xA6 */ {1609, 2, 17, 5, 2, -12},
-    /* 0xA7 */ {1614, 9, 17, 10, 1, -12},
-    /* 0xA8 */ {1634, 9, 15, 12, 1, -14},
-    /* 0xA9 */ {1651, 14, 13, 14, 1, -12},
-    /* 0xAA */ {1674, 11, 13, 13, 1, -12},
-    /* 0xAB */ {1692, 7, 6, 9, 1, -7},
-    /* 0xAC */ {1698, 9, 5, 11, 2, -5},
-    /* 0xAD */ {1704, 0, 0, 0, 0, 0},
-    /* 0xAE */ {1704, 14, 13, 14, 1, -12},
-    /* 0xAF */ {1727, 6, 15, 5, 0, -14},
-    /* 0xB0 */ {1739, 5, 5, 11, 3, -11},
-    /* 0xB1 */ {1743, 9, 11, 11, 1, -10},
-    /* 0xB2 */ {1756, 2, 13, 4, 1, -12},
-    /* 0xB3 */ {1760, 2, 13, 4, 1, -12},
-    /* 0xB4 */ {1764, 6, 12, 7, 1, -11},
-    /* 0xB5 */ {1773, 9, 13, 10, 1, -9},
-    /* 0xB6 */ {1788, 8, 16, 10, 2, -12},
-    /* 0xB7 */ {1804, 3, 1, 5, 1, -4},
-    /* 0xB8 */ {1805, 8, 12, 10, 1, -11},
-    /* 0xB9 */ {1817, 15, 13, 17, 1, -12},
-    /* 0xBA */ {1842, 8, 10, 9, 1, -9},
-    /* 0xBB */ {1852, 7, 6, 9, 1, -7},
-    /* 0xBC */ {1858, 4, 17, 4, 0, -12},
-    /* 0xBD */ {1867, 10, 13, 12, 1, -12},
-    /* 0xBE */ {1884, 8, 10, 9, 1, -9},
-    /* 0xBF */ {1894, 6, 12, 5, -1, -11},
-    /* 0xC0 */ {1903, 12, 13, 12, 0, -12},
-    /* 0xC1 */ {1923, 11, 13, 12, 1, -12},
-    /* 0xC2 */ {1941, 11, 13, 12, 1, -12},
-    /* 0xC3 */ {1959, 8, 13, 8, 1, -12},
-    /* 0xC4 */ {1972, 14, 16, 15, 1, -12},
-    /* 0xC5 */ {2000, 9, 13, 12, 1, -12},
-    /* 0xC6 */ {2015, 16, 13, 16, 0, -12},
-    /* 0xC7 */ {2041, 10, 13, 12, 1, -12},
-    /* 0xC8 */ {2058, 11, 13, 13, 1, -12},
-    /* 0xC9 */ {2076, 11, 16, 13, 1, -15},
-    /* 0xCA */ {2098, 10, 13, 11, 1, -12},
-    /* 0xCB */ {2115, 10, 13, 12, 1, -12},
-    /* 0xCC */ {2132, 13, 13, 15, 1, -12},
-    /* 0xCD */ {2154, 11, 13, 13, 1, -12},
-    /* 0xCE */ {2172, 13, 13, 14, 1, -12},
-    /* 0xCF */ {2194, 11, 13, 13, 1, -12},
-    /* 0xD0 */ {2212, 10, 13, 12, 1, -12},
-    /* 0xD1 */ {2229, 11, 13, 13, 1, -12},
-    /* 0xD2 */ {2247, 9, 13, 11, 1, -12},
-    /* 0xD3 */ {2262, 10, 13, 11, 1, -12},
-    /* 0xD4 */ {2279, 14, 13, 15, 1, -12},
-    /* 0xD5 */ {2302, 10, 13, 12, 1, -12},
-    /* 0xD6 */ {2319, 13, 15, 13, 1, -12},
-    /* 0xD7 */ {2344, 9, 13, 11, 1, -12},
-    /* 0xD8 */ {2359, 13, 13, 15, 1, -12},
-    /* 0xD9 */ {2381, 15, 15, 15, 1, -12},
-    /* 0xDA */ {2410, 13, 13, 15, 2, -12},
-    /* 0xDB */ {2432, 14, 13, 16, 1, -12},
-    /* 0xDC */ {2455, 11, 13, 12, 1, -12},
-    /* 0xDD */ {2473, 11, 13, 13, 1, -12},
-    /* 0xDE */ {2491, 17, 13, 18, 1, -12},
-    /* 0xDF */ {2519, 10, 13, 12, 1, -12},
-    /* 0xE0 */ {2536, 9, 10, 10, 1, -9},
-    /* 0xE1 */ {2548, 8, 14, 10, 1, -13},
-    /* 0xE2 */ {2562, 7, 10, 9, 1, -9},
-    /* 0xE3 */ {2571, 5, 10, 7, 1, -9},
-    /* 0xE4 */ {2578, 11, 12, 10, 0, -9},
-    /* 0xE5 */ {2595, 8, 10, 10, 1, -9},
-    /* 0xE6 */ {2605, 12, 10, 14, 1, -9},
-    /* 0xE7 */ {2620, 7, 10, 9, 1, -9},
-    /* 0xE8 */ {2629, 8, 10, 10, 1, -9},
-    /* 0xE9 */ {2639, 8, 12, 10, 1, -11},
-    /* 0xEA */ {2651, 7, 10, 9, 1, -9},
-    /* 0xEB */ {2660, 7, 10, 8, 0, -9},
-    /* 0xEC */ {2669, 9, 10, 11, 1, -9},
-    /* 0xED */ {2681, 8, 10, 10, 1, -9},
-    /* 0xEE */ {2691, 8, 10, 10, 1, -9},
-    /* 0xEF */ {2701, 8, 10, 10, 1, -9},
-    /* 0xF0 */ {2711, 9, 13, 10, 1, -9},
-    /* 0xF1 */ {2726, 8, 10, 9, 1, -9},
-    /* 0xF2 */ {2736, 6, 10, 7, 1, -9},
-    /* 0xF3 */ {2744, 8, 14, 9, 0, -9},
-    /* 0xF4 */ {2758, 14, 15, 15, 1, -11},
-    /* 0xF5 */ {2785, 7, 10, 9, 1, -9},
-    /* 0xF6 */ {2794, 10, 12, 10, 1, -9},
-    /* 0xF7 */ {2809, 7, 10, 9, 1, -9},
-    /* 0xF8 */ {2818, 10, 10, 12, 1, -9},
-    /* 0xF9 */ {2831, 12, 12, 13, 1, -9},
-    /* 0xFA */ {2849, 9, 10, 12, 2, -9},
-    /* 0xFB */ {2861, 10, 10, 12, 1, -9},
-    /* 0xFC */ {2874, 8, 10, 9, 1, -9},
-    /* 0xFD */ {2884, 8, 10, 9, 1, -9},
-    /* 0xFE */ {2894, 12, 10, 13, 1, -9},
-    /* 0xFF */ {2909, 8, 10, 10, 1, -9},
-};
-
-const GFXfont FreeSans9pt_Win1251 PROGMEM = {(uint8_t *)FreeSans9pt_Win1251Bitmaps, (GFXglyph *)FreeSans9pt_Win1251Glyphs, 0x20,
-                                             0xFF, 21};
--- a/src/graphics/niche/Fonts/FreeSans9pt_Win1252.h
+++ b/src/graphics/niche/Fonts/FreeSans9pt_Win1252.h
@@ -1,494 +0,0 @@
-#pragma once
-const uint8_t FreeSans9pt_Win1252Bitmaps[] PROGMEM = {
-    /* ' ' 0x20 */
-    0xFF, 0xFF, 0xF0, 0xC0,                                                                                     /* '!' 0x21 */
-    0xDE, 0xF7, 0x20,                                                                                           /* '"' 0x22 */
-    0x09, 0x86, 0x41, 0x91, 0xFF, 0x13, 0x04, 0xC3, 0x20, 0xC8, 0xFF, 0x89, 0x82, 0x61, 0x90,                   /* '#' 0x23 */
-    0x10, 0x1F, 0x14, 0xDA, 0x3D, 0x1E, 0x83, 0x40, 0x78, 0x17, 0x08, 0xF4, 0x7A, 0x35, 0x33, 0xF0, 0x40, 0x20, /* '$' 0x24 */
-    0x38, 0x10, 0xEC, 0x20, 0xC6, 0x20, 0xC6, 0x40, 0xC6, 0x40, 0x6C, 0x80, 0x39, 0x00, 0x01, 0x3C, 0x02, 0x77, 0x02, 0x63, 0x04,
-    0x63, 0x04, 0x77, 0x08, 0x3C,                                                                         /* '%' 0x25 */
-    0x0E, 0x0C, 0xC3, 0x30, 0xCC, 0x1E, 0x03, 0x03, 0xC1, 0x9B, 0xC2, 0xF0, 0xEC, 0x19, 0x8F, 0x3C, 0x40, /* '&' 0x26 */
-    0xFE,                                                                                                 /* ''' 0x27 */
-    0x13, 0x26, 0x6C, 0xCC, 0xCC, 0xC4, 0x66, 0x23, 0x10,                                                 /* '(' 0x28 */
-    0x8C, 0x46, 0x63, 0x33, 0x33, 0x32, 0x66, 0x4C, 0x80,                                                 /* ')' 0x29 */
-    0x25, 0x7E, 0xA5, 0x00,                                                                               /* '*' 0x2A */
-    0x30, 0xC3, 0x3F, 0x30, 0xC3, 0x0C,                                                                   /* '+' 0x2B */
-    0xD6,                                                                                                 /* ',' 0x2C */
-    0xF0,                                                                                                 /* '-' 0x2D */
-    0xC0,                                                                                                 /* '.' 0x2E */
-    0x08, 0x44, 0x21, 0x10, 0x84, 0x42, 0x11, 0x08, 0x00,                                                 /* '/' 0x2F */
-    0x3C, 0x66, 0x42, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x42, 0x66, 0x3C,                         /* '0' 0x30 */
-    0x11, 0x3F, 0x33, 0x33, 0x33, 0x33, 0x30,                                                             /* '1' 0x31 */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x1C, 0x1C, 0x1C, 0x18, 0x18, 0x10, 0x08, 0x07, 0xF8,             /* '2' 0x32 */
-    0x3C, 0x66, 0xC3, 0xC3, 0x03, 0x06, 0x1C, 0x07, 0x03, 0xC3, 0xC3, 0x66, 0x3C,                         /* '3' 0x33 */
-    0x0C, 0x18, 0x71, 0x62, 0xC9, 0xA3, 0x46, 0xFE, 0x18, 0x30, 0x60, 0xC0,                               /* '4' 0x34 */
-    0x7F, 0x20, 0x10, 0x08, 0x08, 0x07, 0xF3, 0x8C, 0x03, 0x01, 0x80, 0xF0, 0x6C, 0x63, 0xE0,             /* '5' 0x35 */
-    0x1E, 0x31, 0x98, 0x78, 0x0C, 0x06, 0xF3, 0x8D, 0x83, 0xC1, 0xE0, 0xD0, 0x6C, 0x63, 0xE0,             /* '6' 0x36 */
-    0xFF, 0x03, 0x02, 0x06, 0x04, 0x0C, 0x08, 0x18, 0x18, 0x18, 0x10, 0x30, 0x30,                         /* '7' 0x37 */
-    0x3E, 0x31, 0xB0, 0x78, 0x3C, 0x1B, 0x18, 0xF8, 0xC6, 0xC1, 0xE0, 0xF0, 0x6C, 0x63, 0xE0,             /* '8' 0x38 */
-    0x3C, 0x66, 0xC2, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC2, 0x66, 0x3C,                         /* '9' 0x39 */
-    0xC0, 0x00, 0x30,                                                                                     /* ':' 0x3A */
-    0xC0, 0x00, 0x00, 0x64, 0xA0,                                                                         /* ';' 0x3B */
-    0x00, 0x81, 0xC7, 0x8E, 0x0C, 0x07, 0x80, 0x70, 0x0E, 0x01, 0x80,                                     /* '<' 0x3C */
-    0xFF, 0x80, 0x00, 0x1F, 0xF0,                                                                         /* '=' 0x3D */
-    0xE0, 0x1C, 0x03, 0x80, 0x30, 0x70, 0xE3, 0x81, 0x00,                                                 /* '>' 0x3E */
-    0x3E, 0x31, 0xB0, 0x78, 0x30, 0x18, 0x18, 0x38, 0x18, 0x18, 0x0C, 0x00, 0x00, 0x01, 0x80,             /* '?' 0x3F */
-    0x03, 0xF0, 0x06, 0x0E, 0x06, 0x01, 0x86, 0x00, 0x66, 0x1D, 0xBB, 0x31, 0xCF, 0x18, 0xC7, 0x98, 0x63, 0xCC, 0x31, 0xE6, 0x11,
-    0xB3, 0x99, 0xCC, 0xF7, 0x86, 0x00, 0x01, 0x80, 0x00, 0x70, 0x40, 0x0F, 0xE0, /* '@' 0x40 */
-    0x06, 0x00, 0xF0, 0x0F, 0x00, 0x90, 0x19, 0x81, 0x98, 0x10, 0x83, 0x0C, 0x3F, 0xC2, 0x04, 0x60, 0x66, 0x06, 0xC0,
-    0x30,                                                                                                       /* 'A' 0x41 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x3F, 0xC6, 0x06, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x6F, 0xF8, /* 'B' 0x42 */
-    0x1F, 0x86, 0x19, 0x81, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0x61, 0xF0, /* 'C' 0x43 */
-    0xFF, 0x18, 0x33, 0x03, 0x60, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x03, 0x60, 0xCF, 0xF0, /* 'D' 0x44 */
-    0xFF, 0xE0, 0x30, 0x18, 0x0C, 0x06, 0x03, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0F, 0xF8,                   /* 'E' 0x45 */
-    0xFF, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFE, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,                               /* 'F' 0x46 */
-    0x0F, 0x83, 0x0E, 0x60, 0x66, 0x03, 0xC0, 0x0C, 0x00, 0xC1, 0xFC, 0x03, 0xC0, 0x36, 0x03, 0x60, 0x73, 0x0F, 0x0F,
-    0x10,                                                                                                       /* 'G' 0x47 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xFF, 0xFE, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x06, /* 'H' 0x48 */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                                     /* 'I' 0x49 */
-    0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07, 0x8F, 0x1E, 0x27, 0x80,                                     /* 'J' 0x4A */
-    0xC0, 0xF0, 0x6C, 0x33, 0x18, 0xCC, 0x37, 0x0F, 0xC3, 0x98, 0xC3, 0x30, 0xCC, 0x1B, 0x03, 0xC0, 0xC0,       /* 'K' 0x4B */
-    0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xFF,                               /* 'L' 0x4C */
-    0xE0, 0x3F, 0x01, 0xFC, 0x1F, 0xE0, 0xFD, 0x05, 0xEC, 0x6F, 0x63, 0x79, 0x13, 0xCD, 0x9E, 0x6C, 0xF1, 0x47, 0x8E, 0x3C, 0x71,
-    0x80,                                                                                                       /* 'M' 0x4D */
-    0xE0, 0x7C, 0x0F, 0xC1, 0xE8, 0x3D, 0x87, 0x98, 0xF1, 0x1E, 0x33, 0xC3, 0x78, 0x6F, 0x07, 0xE0, 0x7C, 0x0E, /* 'N' 0x4E */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x0C, 0x60, 0xC0, 0xF8,
-    0x00,                                                                                                 /* 'O' 0x4F */
-    0xFF, 0x30, 0x6C, 0x0F, 0x03, 0xC0, 0xF0, 0x6F, 0xF3, 0x00, 0xC0, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00, /* 'P' 0x50 */
-    0x0F, 0x81, 0x83, 0x18, 0x0C, 0xC0, 0x6C, 0x01, 0xE0, 0x0F, 0x00, 0x78, 0x03, 0xC0, 0x1B, 0x01, 0x98, 0x6C, 0x60, 0xC0, 0xFB,
-    0x00, 0x08, /* 'Q' 0x51 */
-    0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x0C, 0xFF, 0x8C, 0x0E, 0xC0, 0x6C, 0x06, 0xC0, 0x6C, 0x06, 0xC0,
-    0x70,                                                                                                       /* 'R' 0x52 */
-    0x3F, 0x18, 0x6C, 0x0F, 0x03, 0xC0, 0x1E, 0x01, 0xF0, 0x0E, 0x00, 0xF0, 0x3C, 0x0D, 0x86, 0x3F, 0x00,       /* 'S' 0x53 */
-    0xFF, 0x86, 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x80, 0xC0,                   /* 'T' 0x54 */
-    0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xB0, 0x61, 0xF0, /* 'U' 0x55 */
-    0xC0, 0x6C, 0x0D, 0x81, 0x10, 0x63, 0x0C, 0x61, 0x04, 0x60, 0xCC, 0x19, 0x01, 0x60, 0x3C, 0x07, 0x00, 0x60, /* 'V' 0x56 */
-    0xC1, 0x81, 0x61, 0xC3, 0x61, 0xC3, 0x61, 0x43, 0x62, 0x62, 0x22, 0x66, 0x32, 0x26, 0x36, 0x26, 0x14, 0x34, 0x14, 0x34, 0x1C,
-    0x1C, 0x18, 0x1C, 0x08, 0x18,                                                                         /* 'W' 0x57 */
-    0xC0, 0xD8, 0x66, 0x18, 0xCC, 0x1E, 0x07, 0x00, 0xC0, 0x78, 0x32, 0x0C, 0xC6, 0x1B, 0x07, 0xC0, 0xC0, /* 'X' 0x58 */
-    0xC0, 0x36, 0x06, 0x30, 0xC3, 0x0C, 0x19, 0x81, 0xD8, 0x0F, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06,
-    0x00,                                                                                                 /* 'Y' 0x59 */
-    0xFF, 0xC0, 0x60, 0x30, 0x0C, 0x06, 0x03, 0x01, 0xC0, 0x60, 0x30, 0x18, 0x06, 0x03, 0x00, 0xFF, 0xC0, /* 'Z' 0x5A */
-    0xFB, 0x6D, 0xB6, 0xDB, 0x6D, 0xB6, 0xE0,                                                             /* '[' 0x5B */
-    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x80,                                                 /* '\' 0x5C */
-    0xED, 0xB6, 0xDB, 0x6D, 0xB6, 0xDB, 0xE0,                                                             /* ']' 0x5D */
-    0x30, 0x60, 0xA2, 0x44, 0xD8, 0xA1, 0x80,                                                             /* '^' 0x5E */
-    0xFF, 0xC0,                                                                                           /* '_' 0x5F */
-    0xC6, 0x30,                                                                                           /* '`' 0x60 */
-    0x7E, 0x71, 0xB0, 0xC0, 0x60, 0xF3, 0xDB, 0x0D, 0x86, 0xC7, 0x3D, 0xC0,                               /* 'a' 0x61 */
-    0xC0, 0x60, 0x30, 0x1B, 0xCE, 0x36, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x7C, 0x6D, 0xE0,             /* 'b' 0x62 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'c' 0x63 */
-    0x03, 0x03, 0x03, 0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B,                         /* 'd' 0x64 */
-    0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 'e' 0x65 */
-    0x36, 0x6F, 0x66, 0x66, 0x66, 0x66, 0x60,                                                             /* 'f' 0x66 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0xC6, 0x7C,                   /* 'g' 0x67 */
-    0xC0, 0xC0, 0xC0, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                         /* 'h' 0x68 */
-    0xC3, 0xFF, 0xFF, 0xC0,                                                                               /* 'i' 0x69 */
-    0x30, 0x03, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0xE0,                                                 /* 'j' 0x6A */
-    0xC0, 0xC0, 0xC0, 0xC2, 0xC4, 0xCC, 0xD8, 0xF8, 0xEC, 0xC4, 0xC6, 0xC3, 0xC3,                         /* 'k' 0x6B */
-    0xFF, 0xFF, 0xFF, 0xC0,                                                                               /* 'l' 0x6C */
-    0xDE, 0xF7, 0x1C, 0xF0, 0xC7, 0x86, 0x3C, 0x31, 0xE1, 0x8F, 0x0C, 0x78, 0x63, 0xC3, 0x1E, 0x18, 0xC0, /* 'm' 0x6D */
-    0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                                           /* 'n' 0x6E */
-    0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                           /* 'o' 0x6F */
-    0xDE, 0x71, 0xB0, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x83, 0xE3, 0x6F, 0x30, 0x18, 0x0C, 0x00,             /* 'p' 0x70 */
-    0x3B, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x67, 0x3B, 0x03, 0x03, 0x03,                         /* 'q' 0x71 */
-    0xDF, 0x31, 0x8C, 0x63, 0x18, 0xC6, 0x00,                                                             /* 'r' 0x72 */
-    0x3E, 0xE3, 0xC0, 0xC0, 0xE0, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,                                           /* 's' 0x73 */
-    0x66, 0xF6, 0x66, 0x66, 0x66, 0x67,                                                                   /* 't' 0x74 */
-    0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                           /* 'u' 0x75 */
-    0xC1, 0xA0, 0x98, 0xCC, 0x42, 0x21, 0xB0, 0xD0, 0x28, 0x1C, 0x0C, 0x00,                               /* 'v' 0x76 */
-    0xC6, 0x1E, 0x38, 0x91, 0xC4, 0xCA, 0x66, 0xD3, 0x16, 0xD0, 0xA6, 0x87, 0x1C, 0x38, 0xC0, 0xC6, 0x00, /* 'w' 0x77 */
-    0x87, 0x89, 0xB1, 0xC3, 0x07, 0x1E, 0x26, 0xC5, 0x0C,                                                 /* 'x' 0x78 */
-    0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 'y' 0x79 */
-    0xFE, 0x0C, 0x30, 0xC1, 0x86, 0x18, 0x20, 0xC1, 0xFC,                                                 /* 'z' 0x7A */
-    0x36, 0x66, 0x66, 0x6E, 0xCE, 0x66, 0x66, 0x66, 0x30,                                                 /* '{' 0x7B */
-    0xFF, 0xFF, 0xFF, 0xFF, 0xC0,                                                                         /* '|' 0x7C */
-    0xC6, 0x66, 0x66, 0x67, 0x37, 0x66, 0x66, 0x66, 0xC0,                                                 /* '}' 0x7D */
-    0x61, 0x24, 0x38,                                                                                     /* '~' 0x7E */
-    0xFF, 0xFC, 0x00, 0x63, 0xE3, 0x31, 0x99, 0x04, 0xC8, 0x66, 0x06, 0x30, 0x61, 0x83, 0x0C, 0x18, 0x60, 0x03, 0x06, 0x18, 0x00,
-    0xFF, 0xFC,                                                                                           /* 0x7F */
-    0x07, 0xC6, 0x13, 0x00, 0xC0, 0x60, 0x3F, 0xE6, 0x03, 0xFC, 0x60, 0x0C, 0x03, 0x00, 0x61, 0x07, 0xC0, /* 0x80 */
-    /* 0x81 */
-    0xDC,                                                                                           /* 0x82 */
-    0x19, 0x8C, 0xF3, 0x18, 0xC6, 0x31, 0x8C, 0x63, 0x18, 0xC6, 0xE0,                               /* 0x83 */
-    0xDA, 0x76,                                                                                     /* 0x84 */
-    0xCC, 0xC0,                                                                                     /* 0x85 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, /* 0x86 */
-    0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, 0x18, 0x18, 0x18, /* 0x87 */
-    0x72, 0xA2,                                                                                     /* 0x88 */
-    0x70, 0x80, 0x22, 0x20, 0x08, 0x90, 0x02, 0x24, 0x00, 0x72, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x10, 0x00, 0x09, 0xC7, 0x84,
-    0x8B, 0x31, 0x22, 0x84, 0x88, 0xB3, 0x21, 0xC7, 0x80, /* 0x89 */
-    0x1B, 0x03, 0x80, 0x00, 0xFC, 0x61, 0xB0, 0x3C, 0x0F, 0x00, 0x78, 0x07, 0xC0, 0x38, 0x03, 0xC0, 0xF0, 0x36, 0x18,
-    0xFC, /* 0x8A */
-    0x69, /* 0x8B */
-    0x1E, 0xFE, 0x43, 0x81, 0x83, 0x06, 0x06, 0x0C, 0x0C, 0x18, 0x18, 0x30, 0x3F, 0xE0, 0x60, 0xC0, 0xC1, 0x81, 0x81, 0x83, 0x01,
-    0x8E, 0x01, 0xEF, 0xE0, /* 0x8C */
-    /* 0x8D */
-    0x1B, 0x03, 0x80, 0x03, 0xFF, 0x01, 0x80, 0xC0, 0x30, 0x18, 0x0C, 0x07, 0x01, 0x80, 0xC0, 0x60, 0x18, 0x0C, 0x03,
-    0xFF, /* 0x8E */
-    /* 0x8F */
-    /* 0x90 */
-    0x6B,             /* 0x91 */
-    0xD6,             /* 0x92 */
-    0x4C, 0xA5, 0xB0, /* 0x93 */
-    0xDA, 0x53, 0x20, /* 0x94 */
-    0x6F, 0xFF, 0x60, /* 0x95 */
-    0xFE,             /* 0x96 */
-    0xFF, 0xFF,       /* 0x97 */
-    0x4D, 0xC0,       /* 0x98 */
-    0xFC, 0xE1, 0xCC, 0x38, 0x73, 0x0E, 0x1C, 0xC3, 0x8F, 0x30, 0xD2, 0xCC, 0x34, 0xB3, 0x0D, 0x6C, 0xC3, 0x53, 0x30, 0xCC, 0xCC,
-    0x33, 0x30,                                                                                                       /* 0x99 */
-    0x24, 0x3C, 0x18, 0x7E, 0xE3, 0xC0, 0xC0, 0x60, 0x3C, 0x07, 0xC3, 0xE3, 0x7E,                                     /* 0x9A */
-    0x96,                                                                                                             /* 0x9B */
-    0x3C, 0xF8, 0xCF, 0x1B, 0x0C, 0x1E, 0x18, 0x3C, 0x3F, 0xF8, 0x60, 0x30, 0xC0, 0x61, 0x83, 0x67, 0x8C, 0x79, 0xF0, /* 0x9C */
-    /* 0x9D */
-    0x48, 0xF0, 0xC7, 0xF0, 0x61, 0x86, 0x0C, 0x30, 0xC1, 0x06, 0x0F, 0xE0, /* 0x9E */
-    0x19, 0x80, 0x00, 0xC0, 0x36, 0x06, 0x30, 0xC3, 0x0C, 0x19, 0x81, 0xD8, 0x0F, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00,
-    0x60, /* 0x9F */
-    /* 0xA0 */
-    0xCF, 0xFF, 0xFF, 0xC0,                                                                               /* 0xA1 */
-    0x08, 0x04, 0x0F, 0x8D, 0x6C, 0x9E, 0x43, 0x21, 0x90, 0xC8, 0x64, 0xDA, 0xC7, 0xC0, 0x80, 0x40,       /* 0xA2 */
-    0x1F, 0x0C, 0x66, 0x0D, 0x83, 0x60, 0x0C, 0x0F, 0xC0, 0x60, 0x18, 0x06, 0x03, 0x01, 0xF1, 0x43, 0xC0, /* 0xA3 */
-    0xFF, 0xDF, 0x1E, 0x3E, 0xFF, 0xC0,                                                                   /* 0xA4 */
-    0xC3, 0x42, 0x42, 0x24, 0x24, 0x3C, 0x18, 0x7E, 0x18, 0x7E, 0x18, 0x18, 0x18,                         /* 0xA5 */
-    0xFF, 0xFC, 0x0F, 0xFF, 0xC0,                                                                         /* 0xA6 */
-    0x0C, 0x09, 0x0C, 0xC6, 0x63, 0x81, 0xE3, 0x19, 0x87, 0xE1, 0xB8, 0xC6, 0x41, 0xC0, 0x73, 0x19, 0x8C, 0x66, 0x1E,
-    0x00, /* 0xA7 */
-    0xCC, /* 0xA8 */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9B, 0xC6, 0xD9, 0x8F, 0x60, 0x3D, 0x00, 0xF4, 0x03, 0xD8, 0x0D, 0xE6, 0x67, 0xF3, 0x86, 0x18,
-    0x0F, 0xC0,                         /* 0xA9 */
-    0x74, 0x8D, 0xA9, 0x7C, 0x1F,       /* 0xAA */
-    0x22, 0xCF, 0x26, 0x46, 0x64, 0x40, /* 0xAB */
-    0xFF, 0x80, 0xC0, 0x60, 0x30, 0x18, /* 0xAC */
-    /* 0xAD */
-    0x0F, 0xC0, 0x61, 0x87, 0x03, 0x9F, 0xE6, 0xD0, 0x8F, 0x42, 0x3D, 0xF0, 0xF4, 0x23, 0xD0, 0x8D, 0xC2, 0x67, 0x0B, 0x86, 0x18,
-    0x0F, 0xC0,                                                                                     /* 0xAE */
-    0xF8,                                                                                           /* 0xAF */
-    0x74, 0x63, 0x17, 0x00,                                                                         /* 0xB0 */
-    0x0C, 0x06, 0x03, 0x07, 0xE0, 0xC0, 0x60, 0x30, 0x18, 0x00, 0x00, 0x3F, 0xE0,                   /* 0xB1 */
-    0x7B, 0x30, 0xC3, 0x11, 0x84, 0x3F,                                                             /* 0xB2 */
-    0x7D, 0x8C, 0x18, 0xC0, 0x60, 0xF1, 0xBE,                                                       /* 0xB3 */
-    0x36, 0xC0,                                                                                     /* 0xB4 */
-    0xC3, 0x61, 0xB0, 0xD8, 0x6C, 0x36, 0x1B, 0x0D, 0x86, 0xE7, 0x7D, 0xF0, 0x18, 0x0C, 0x00,       /* 0xB5 */
-    0x3F, 0x7E, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0x72, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, /* 0xB6 */
-    0xE0,                                                                                           /* 0xB7 */
-    0x21, 0xC7, 0xE0,                                                                               /* 0xB8 */
-    0x3D, 0xB6, 0xD8,                                                                               /* 0xB9 */
-    0x74, 0x63, 0x18, 0xB8, 0x1F,                                                                   /* 0xBA */
-    0x89, 0x98, 0x99, 0x3C, 0xD1, 0x00,                                                             /* 0xBB */
-    0x20, 0x43, 0x81, 0x06, 0x08, 0x18, 0x20, 0x61, 0x01, 0x84, 0x06, 0x21, 0x80, 0x86, 0x04, 0x78, 0x32, 0x60, 0x87, 0xC4, 0x06,
-    0x10, 0x18, /* 0xBC */
-    0x20, 0x43, 0x81, 0x06, 0x08, 0x18, 0x20, 0x61, 0x01, 0x8D, 0xE6, 0x2C, 0xC1, 0x03, 0x0C, 0x0C, 0x20, 0x41, 0x86, 0x0C, 0x30,
-    0x20, 0xFC, /* 0xBD */
-    0x78, 0x11, 0x98, 0x40, 0x31, 0x00, 0x82, 0x00, 0xC8, 0x01, 0x90, 0x33, 0x43, 0x3D, 0x06, 0x02, 0x3C, 0x08, 0x98, 0x10, 0xF8,
-    0x40, 0x61, 0x00, 0xC0,                                                                                     /* 0xBE */
-    0x0C, 0x00, 0x00, 0x01, 0x80, 0xC0, 0xC0, 0xE0, 0xC0, 0xC0, 0x60, 0xF0, 0x6C, 0x63, 0xE0,                   /* 0xBF */
-    0x18, 0x03, 0x00, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC0 */
-    0x06, 0x03, 0x00, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC1 */
-    0x0C, 0x04, 0x80, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC2 */
-    0x19, 0x09, 0x80, 0x00, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC3 */
-    0x33, 0x00, 0x00, 0xC0, 0x78, 0x1E, 0x04, 0x83, 0x30, 0xCC, 0x33, 0x1F, 0xE6, 0x19, 0x02, 0xC0, 0xF0, 0x30, /* 0xC4 */
-    0x0C, 0x04, 0x81, 0x20, 0x30, 0x1E, 0x07, 0x81, 0x20, 0xCC, 0x33, 0x0F, 0xC6, 0x19, 0x86, 0x40, 0xB0, 0x30, /* 0xC5 */
-    0x07, 0xFF, 0x04, 0xC0, 0x0C, 0xC0, 0x08, 0xC0, 0x18, 0xC0, 0x18, 0xC0, 0x30, 0xFF, 0x30, 0xC0, 0x3F, 0xC0, 0x60, 0xC0, 0x60,
-    0xC0, 0xC0, 0xC0, 0xC0, 0xFF, /* 0xC6 */
-    0x1F, 0x06, 0x19, 0x83, 0xA0, 0x3C, 0x01, 0x80, 0x30, 0x06, 0x00, 0xC0, 0x68, 0x0D, 0x83, 0x18, 0xE1, 0xF0, 0x08, 0x01, 0xC0,
-    0x18, 0x0E, 0x00,                                                                                           /* 0xC7 */
-    0x18, 0x06, 0x00, 0x1F, 0xFC, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC,             /* 0xC8 */
-    0x0C, 0x0C, 0x00, 0x1F, 0xFC, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC,             /* 0xC9 */
-    0x1C, 0x1B, 0x00, 0x1F, 0xFC, 0x06, 0x03, 0x01, 0x80, 0xFF, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC,             /* 0xCA */
-    0x33, 0x00, 0x3F, 0xF8, 0x0C, 0x06, 0x03, 0x01, 0xFE, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x07, 0xFC,             /* 0xCB */
-    0xCC, 0x36, 0xDB, 0x6D, 0xB6, 0xD8,                                                                         /* 0xCC */
-    0x78, 0x36, 0xDB, 0x6D, 0xB6, 0xC0,                                                                         /* 0xCD */
-    0x76, 0xC0, 0x63, 0x18, 0xC6, 0x31, 0x8C, 0x63, 0x18,                                                       /* 0xCE */
-    0xCC, 0x03, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC0,                                           /* 0xCF */
-    0x7F, 0x0C, 0x31, 0x83, 0x30, 0x36, 0x06, 0xC0, 0xFE, 0x1B, 0x03, 0x60, 0x6C, 0x0D, 0x83, 0x30, 0xE7, 0xF0, /* 0xD0 */
-    0x19, 0x02, 0xC3, 0x81, 0xF0, 0x3F, 0x07, 0xA0, 0xF6, 0x1E, 0x63, 0xC4, 0x78, 0xCF, 0x0D, 0xE1, 0xBC, 0x1F, 0x81,
-    0xC0, /* 0xD1 */
-    0x0C, 0x00, 0x60, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD2 */
-    0x03, 0x00, 0x60, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD3 */
-    0x0F, 0x01, 0x98, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD4 */
-    0x1C, 0x81, 0x38, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00, /* 0xD5 */
-    0x19, 0x81, 0x98, 0x00, 0x00, 0xF0, 0x39, 0xC6, 0x06, 0x60, 0x6C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x36, 0x06, 0x60, 0x63, 0x9C,
-    0x0F, 0x00,                               /* 0xD6 */
-    0x83, 0x89, 0xA1, 0x83, 0x89, 0xA1, 0x80, /* 0xD7 */
-    0x0F, 0xD9, 0x83, 0x18, 0x1C, 0xC1, 0xEC, 0x19, 0xE0, 0x8F, 0x08, 0x78, 0x83, 0xC8, 0x1B, 0x81, 0x98, 0x0C, 0xE0, 0xC8, 0xF8,
-    0x00, /* 0xD8 */
-    0x0C, 0x00, 0xC3, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xD9 */
-    0x06, 0x01, 0x83, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDA */
-    0x0E, 0x03, 0x63, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDB */
-    0x1B, 0x00, 0x03, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x01, 0xE0, 0x36, 0x0C, 0x3E,
-    0x00, /* 0xDC */
-    0x03, 0x0C, 0x63, 0x60, 0x63, 0x0C, 0x30, 0xC1, 0x98, 0x1D, 0x80, 0xF0, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00,
-    0x60,                                                                                                             /* 0xDD */
-    0xC0, 0x30, 0x0F, 0xF3, 0x06, 0xC0, 0xF0, 0x3C, 0x0F, 0x06, 0xFF, 0x30, 0x0C, 0x03, 0x00, 0xC0, 0x00,             /* 0xDE */
-    0x3C, 0x33, 0x30, 0xD8, 0x6C, 0x36, 0x33, 0x39, 0x86, 0xC1, 0xE0, 0xF0, 0x78, 0x6D, 0xE0,                         /* 0xDF */
-    0x60, 0x18, 0x06, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8,                         /* 0xE0 */
-    0x0C, 0x04, 0x04, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8,                         /* 0xE1 */
-    0x10, 0x14, 0x1B, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8,                         /* 0xE2 */
-    0x24, 0x2E, 0x00, 0x0F, 0xCE, 0x36, 0x18, 0x0C, 0x1E, 0x7B, 0x61, 0xB0, 0xD8, 0xE7, 0xB8,                         /* 0xE3 */
-    0x66, 0x00, 0x1F, 0x9C, 0x6C, 0x30, 0x18, 0x3C, 0xF6, 0xC3, 0x61, 0xB1, 0xCF, 0x70,                               /* 0xE4 */
-    0x1C, 0x1B, 0x0D, 0x83, 0x87, 0xE7, 0x1B, 0x0C, 0x06, 0x0F, 0x3D, 0xB0, 0xD8, 0x6C, 0x73, 0xDC,                   /* 0xE5 */
-    0x7E, 0xF9, 0xC7, 0x1B, 0x0C, 0x18, 0x18, 0x33, 0xFF, 0xFC, 0x60, 0x30, 0xC0, 0x61, 0x83, 0xC7, 0x8C, 0xF1, 0xF0, /* 0xE6 */
-    0x3C, 0x66, 0xC3, 0xC0, 0xC0, 0xC0, 0xC0, 0xC3, 0x66, 0x3C, 0x10, 0x1C, 0x0C, 0x38,                               /* 0xE7 */
-    0x60, 0x30, 0x18, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                     /* 0xE8 */
-    0x0C, 0x08, 0x18, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                     /* 0xE9 */
-    0x10, 0x28, 0x6C, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                     /* 0xEA */
-    0x66, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xFF, 0xC0, 0xC0, 0xC3, 0x66, 0x3C,                                           /* 0xEB */
-    0xCC, 0xB6, 0xDB, 0x6D, 0xB6,                                                                                     /* 0xEC */
-    0x7A, 0x6D, 0xB6, 0xDB, 0x6C,                                                                                     /* 0xED */
-    0x6E, 0x96, 0x66, 0x66, 0x66, 0x66, 0x60,                                                                         /* 0xEE */
-    0xCC, 0x03, 0x0C, 0x30, 0xC3, 0x0C, 0x30, 0xC3, 0x0C,                                                             /* 0xEF */
-    0x34, 0x0C, 0x16, 0x03, 0x3F, 0x67, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                     /* 0xF0 */
-    0x24, 0x5C, 0x00, 0xDE, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,                                     /* 0xF1 */
-    0x30, 0x18, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                     /* 0xF2 */
-    0x0C, 0x18, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                     /* 0xF3 */
-    0x18, 0x24, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                     /* 0xF4 */
-    0x34, 0x2C, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                     /* 0xF5 */
-    0x66, 0x00, 0x3C, 0x66, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0x66, 0x3C,                                           /* 0xF6 */
-    0x18, 0x00, 0x00, 0x1F, 0xF0, 0x00, 0x00, 0x00, 0x30,                                                             /* 0xF7 */
-    0x3D, 0x66, 0xC7, 0xCB, 0xCB, 0xD3, 0xD3, 0xE3, 0x66, 0xBC,                                                       /* 0xF8 */
-    0x60, 0x30, 0x18, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                     /* 0xF9 */
-    0x06, 0x0C, 0x18, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                     /* 0xFA */
-    0x3C, 0x66, 0x00, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                     /* 0xFB */
-    0x66, 0x00, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0x7B,                                           /* 0xFC */
-    0x06, 0x04, 0x08, 0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,             /* 0xFD */
-    0xC0, 0x60, 0x30, 0x1B, 0xCE, 0x36, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF0, 0x7C, 0x6D, 0xE6, 0x03, 0x01, 0x80,       /* 0xFE */
-    0x33, 0x00, 0xC1, 0x43, 0x63, 0x62, 0x26, 0x36, 0x34, 0x1C, 0x1C, 0x18, 0x18, 0x18, 0x10, 0x60,                   /* 0xFF */
-};
-
-const GFXglyph FreeSans9pt_Win1252Glyphs[] PROGMEM = {
-    /* ' ' 0x20 */ {0, 0, 0, 5, 0, 0},
-    /* '!' 0x21 */ {0, 2, 13, 6, 2, -12},
-    /* '"' 0x22 */ {4, 5, 4, 6, 1, -12},
-    /* '#' 0x23 */ {7, 10, 12, 10, 0, -11},
-    /* '$' 0x24 */ {22, 9, 16, 10, 1, -13},
-    /* '%' 0x25 */ {40, 16, 13, 16, 1, -12},
-    /* '&' 0x26 */ {66, 10, 13, 12, 1, -12},
-    /* ''' 0x27 */ {83, 2, 4, 4, 1, -12},
-    /* '(' 0x28 */ {84, 4, 17, 6, 1, -12},
-    /* ')' 0x29 */ {93, 4, 17, 6, 1, -12},
-    /* '*' 0x2A */ {102, 5, 5, 7, 1, -12},
-    /* '+' 0x2B */ {106, 6, 8, 11, 3, -7},
-    /* ',' 0x2C */ {112, 2, 4, 5, 2, 0},
-    /* '-' 0x2D */ {113, 4, 1, 6, 1, -4},
-    /* '.' 0x2E */ {114, 2, 1, 5, 1, 0},
-    /* '/' 0x2F */ {115, 5, 13, 5, 0, -12},
-    /* '0' 0x30 */ {124, 8, 13, 10, 1, -12},
-    /* '1' 0x31 */ {137, 4, 13, 10, 3, -12},
-    /* '2' 0x32 */ {144, 9, 13, 10, 1, -12},
-    /* '3' 0x33 */ {159, 8, 13, 10, 1, -12},
-    /* '4' 0x34 */ {172, 7, 13, 10, 2, -12},
-    /* '5' 0x35 */ {184, 9, 13, 10, 1, -12},
-    /* '6' 0x36 */ {199, 9, 13, 10, 1, -12},
-    /* '7' 0x37 */ {214, 8, 13, 10, 0, -12},
-    /* '8' 0x38 */ {227, 9, 13, 10, 1, -12},
-    /* '9' 0x39 */ {242, 8, 13, 10, 1, -12},
-    /* ':' 0x3A */ {255, 2, 10, 5, 1, -9},
-    /* ';' 0x3B */ {258, 3, 12, 5, 1, -8},
-    /* '<' 0x3C */ {263, 9, 9, 11, 1, -8},
-    /* '=' 0x3D */ {274, 9, 4, 11, 1, -5},
-    /* '>' 0x3E */ {279, 9, 8, 11, 1, -7},
-    /* '?' 0x3F */ {288, 9, 13, 10, 1, -12},
-    /* '@' 0x40 */ {303, 17, 16, 18, 1, -12},
-    /* 'A' 0x41 */ {337, 12, 13, 12, 0, -12},
-    /* 'B' 0x42 */ {357, 11, 13, 12, 1, -12},
-    /* 'C' 0x43 */ {375, 11, 13, 13, 1, -12},
-    /* 'D' 0x44 */ {393, 11, 13, 13, 1, -12},
-    /* 'E' 0x45 */ {411, 9, 13, 11, 1, -12},
-    /* 'F' 0x46 */ {426, 8, 13, 11, 1, -12},
-    /* 'G' 0x47 */ {439, 12, 13, 14, 1, -12},
-    /* 'H' 0x48 */ {459, 11, 13, 13, 1, -12},
-    /* 'I' 0x49 */ {477, 2, 13, 5, 2, -12},
-    /* 'J' 0x4A */ {481, 7, 13, 10, 1, -12},
-    /* 'K' 0x4B */ {493, 10, 13, 12, 1, -12},
-    /* 'L' 0x4C */ {510, 8, 13, 10, 1, -12},
-    /* 'M' 0x4D */ {523, 13, 13, 15, 1, -12},
-    /* 'N' 0x4E */ {545, 11, 13, 13, 1, -12},
-    /* 'O' 0x4F */ {563, 13, 13, 14, 1, -12},
-    /* 'P' 0x50 */ {585, 10, 13, 12, 1, -12},
-    /* 'Q' 0x51 */ {602, 13, 14, 14, 1, -12},
-    /* 'R' 0x52 */ {625, 12, 13, 13, 1, -12},
-    /* 'S' 0x53 */ {645, 10, 13, 12, 1, -12},
-    /* 'T' 0x54 */ {662, 9, 13, 11, 1, -12},
-    /* 'U' 0x55 */ {677, 11, 13, 13, 1, -12},
-    /* 'V' 0x56 */ {695, 11, 13, 11, 0, -12},
-    /* 'W' 0x57 */ {713, 16, 13, 17, 0, -12},
-    /* 'X' 0x58 */ {739, 10, 13, 12, 1, -12},
-    /* 'Y' 0x59 */ {756, 12, 13, 12, 0, -12},
-    /* 'Z' 0x5A */ {776, 10, 13, 11, 1, -12},
-    /* '[' 0x5B */ {793, 3, 17, 5, 1, -12},
-    /* '\' 0x5C */ {800, 5, 13, 5, 0, -12},
-    /* ']' 0x5D */ {809, 3, 17, 5, 0, -12},
-    /* '^' 0x5E */ {816, 7, 7, 8, 1, -12},
-    /* '_' 0x5F */ {823, 10, 1, 10, 0, 3},
-    /* '`' 0x60 */ {825, 4, 3, 5, 0, -12},
-    /* 'a' 0x61 */ {827, 9, 10, 10, 1, -9},
-    /* 'b' 0x62 */ {839, 9, 13, 10, 1, -12},
-    /* 'c' 0x63 */ {854, 8, 10, 9, 1, -9},
-    /* 'd' 0x64 */ {864, 8, 13, 10, 1, -12},
-    /* 'e' 0x65 */ {877, 8, 10, 10, 1, -9},
-    /* 'f' 0x66 */ {887, 4, 13, 5, 1, -12},
-    /* 'g' 0x67 */ {894, 8, 14, 10, 1, -9},
-    /* 'h' 0x68 */ {908, 8, 13, 10, 1, -12},
-    /* 'i' 0x69 */ {921, 2, 13, 4, 1, -12},
-    /* 'j' 0x6A */ {925, 4, 17, 4, 0, -12},
-    /* 'k' 0x6B */ {934, 8, 13, 9, 1, -12},
-    /* 'l' 0x6C */ {947, 2, 13, 4, 1, -12},
-    /* 'm' 0x6D */ {951, 13, 10, 15, 1, -9},
-    /* 'n' 0x6E */ {968, 8, 10, 10, 1, -9},
-    /* 'o' 0x6F */ {978, 8, 10, 10, 1, -9},
-    /* 'p' 0x70 */ {988, 9, 13, 10, 1, -9},
-    /* 'q' 0x71 */ {1003, 8, 13, 10, 1, -9},
-    /* 'r' 0x72 */ {1016, 5, 10, 6, 1, -9},
-    /* 's' 0x73 */ {1023, 8, 10, 9, 1, -9},
-    /* 't' 0x74 */ {1033, 4, 12, 5, 1, -11},
-    /* 'u' 0x75 */ {1039, 8, 10, 10, 1, -9},
-    /* 'v' 0x76 */ {1049, 9, 10, 9, 0, -9},
-    /* 'w' 0x77 */ {1061, 13, 10, 13, 0, -9},
-    /* 'x' 0x78 */ {1078, 7, 10, 9, 1, -9},
-    /* 'y' 0x79 */ {1087, 8, 14, 9, 0, -9},
-    /* 'z' 0x7A */ {1101, 7, 10, 9, 1, -9},
-    /* '{' 0x7B */ {1110, 4, 17, 6, 1, -12},
-    /* '|' 0x7C */ {1119, 2, 17, 4, 2, -12},
-    /* '}' 0x7D */ {1124, 4, 17, 6, 1, -12},
-    /* '~' 0x7E */ {1133, 7, 3, 9, 1, -7},
-    /* 0x7F */ {1136, 13, 14, 15, 1, -12},
-    /* 0x80 */ {1159, 10, 13, 12, 1, -12},
-    /* 0x81 */ {1176, 0, 0, 8, 0, 0},
-    /* 0x82 */ {1176, 2, 3, 5, 1, 0},
-    /* 0x83 */ {1177, 5, 17, 5, 0, -12},
-    /* 0x84 */ {1188, 5, 3, 7, 1, 0},
-    /* 0x85 */ {1190, 10, 1, 12, 1, 0},
-    /* 0x86 */ {1192, 8, 16, 10, 1, -12},
-    /* 0x87 */ {1208, 8, 16, 10, 1, -12},
-    /* 0x88 */ {1224, 5, 3, 6, 0, -12},
-    /* 0x89 */ {1226, 18, 13, 18, 0, -12},
-    /* 0x8A */ {1256, 10, 16, 12, 1, -15},
-    /* 0x8B */ {1276, 2, 4, 4, 1, -6},
-    /* 0x8C */ {1277, 15, 13, 18, 1, -12},
-    /* 0x8D */ {1302, 0, 0, 8, 0, 0},
-    /* 0x8E */ {1302, 10, 16, 11, 1, -15},
-    /* 0x8F */ {1322, 0, 0, 8, 0, 0},
-    /* 0x90 */ {1322, 0, 0, 8, 0, 0},
-    /* 0x91 */ {1322, 2, 4, 4, 2, -12},
-    /* 0x92 */ {1323, 2, 4, 4, 1, -12},
-    /* 0x93 */ {1324, 5, 4, 7, 2, -12},
-    /* 0x94 */ {1327, 5, 4, 7, 1, -12},
-    /* 0x95 */ {1330, 4, 5, 7, 1, -8},
-    /* 0x96 */ {1333, 7, 1, 9, 1, -4},
-    /* 0x97 */ {1334, 16, 1, 18, 1, -4},
-    /* 0x98 */ {1336, 5, 2, 6, 0, -12},
-    /* 0x99 */ {1338, 18, 10, 18, 1, -13},
-    /* 0x9A */ {1361, 8, 13, 9, 1, -12},
-    /* 0x9B */ {1374, 2, 4, 5, 2, -6},
-    /* 0x9C */ {1375, 15, 10, 17, 1, -9},
-    /* 0x9D */ {1394, 0, 0, 8, 0, 0},
-    /* 0x9E */ {1394, 7, 13, 9, 1, -12},
-    /* 0x9F */ {1406, 12, 14, 12, 0, -13},
-    /* 0xA0 */ {1427, 0, 0, 5, 0, 0},
-    /* 0xA1 */ {1427, 2, 13, 6, 2, -8},
-    /* 0xA2 */ {1431, 9, 14, 10, 1, -11},
-    /* 0xA3 */ {1447, 10, 13, 10, 0, -12},
-    /* 0xA4 */ {1464, 7, 6, 10, 2, -8},
-    /* 0xA5 */ {1470, 8, 13, 10, 1, -12},
-    /* 0xA6 */ {1483, 2, 17, 5, 2, -12},
-    /* 0xA7 */ {1488, 9, 17, 10, 1, -12},
-    /* 0xA8 */ {1508, 6, 1, 6, 0, -11},
-    /* 0xA9 */ {1509, 14, 13, 14, 1, -12},
-    /* 0xAA */ {1532, 5, 8, 7, 1, -12},
-    /* 0xAB */ {1537, 7, 6, 9, 1, -7},
-    /* 0xAC */ {1543, 9, 5, 11, 2, -5},
-    /* 0xAD */ {1549, 0, 0, 0, 0, 0},
-    /* 0xAE */ {1549, 14, 13, 14, 1, -12},
-    /* 0xAF */ {1572, 5, 1, 6, 0, -12},
-    /* 0xB0 */ {1573, 5, 5, 11, 3, -11},
-    /* 0xB1 */ {1577, 9, 11, 11, 1, -10},
-    /* 0xB2 */ {1590, 6, 8, 6, 1, -13},
-    /* 0xB3 */ {1596, 7, 8, 6, 0, -13},
-    /* 0xB4 */ {1603, 4, 3, 6, 2, -12},
-    /* 0xB5 */ {1605, 9, 13, 10, 1, -9},
-    /* 0xB6 */ {1620, 8, 16, 10, 2, -12},
-    /* 0xB7 */ {1636, 3, 1, 5, 1, -4},
-    /* 0xB8 */ {1637, 5, 4, 6, 1, 1},
-    /* 0xB9 */ {1640, 3, 7, 6, 2, -13},
-    /* 0xBA */ {1643, 5, 8, 7, 1, -12},
-    /* 0xBB */ {1648, 7, 6, 9, 1, -7},
-    /* 0xBC */ {1654, 14, 13, 16, 2, -12},
-    /* 0xBD */ {1677, 14, 13, 16, 2, -12},
-    /* 0xBE */ {1700, 15, 13, 16, 1, -12},
-    /* 0xBF */ {1725, 9, 13, 10, 1, -8},
-    /* 0xC0 */ {1740, 10, 14, 12, 1, -13},
-    /* 0xC1 */ {1758, 10, 14, 12, 1, -13},
-    /* 0xC2 */ {1776, 10, 14, 12, 1, -13},
-    /* 0xC3 */ {1794, 10, 14, 12, 1, -13},
-    /* 0xC4 */ {1812, 10, 14, 12, 1, -13},
-    /* 0xC5 */ {1830, 10, 14, 12, 1, -13},
-    /* 0xC6 */ {1848, 16, 13, 18, 1, -12},
-    /* 0xC7 */ {1874, 11, 17, 13, 1, -12},
-    /* 0xC8 */ {1898, 9, 14, 11, 1, -13},
-    /* 0xC9 */ {1914, 9, 14, 11, 1, -13},
-    /* 0xCA */ {1930, 9, 14, 11, 1, -13},
-    /* 0xCB */ {1946, 9, 14, 11, 1, -13},
-    /* 0xCC */ {1962, 3, 15, 5, 1, -13},
-    /* 0xCD */ {1968, 3, 14, 5, 1, -13},
-    /* 0xCE */ {1974, 5, 14, 5, 0, -13},
-    /* 0xCF */ {1983, 6, 14, 5, 0, -13},
-    /* 0xD0 */ {1994, 11, 13, 13, 1, -12},
-    /* 0xD1 */ {2012, 11, 14, 13, 1, -13},
-    /* 0xD2 */ {2032, 12, 15, 13, 1, -14},
-    /* 0xD3 */ {2055, 12, 15, 13, 1, -14},
-    /* 0xD4 */ {2078, 12, 15, 13, 1, -14},
-    /* 0xD5 */ {2101, 12, 15, 13, 1, -14},
-    /* 0xD6 */ {2124, 12, 15, 13, 1, -14},
-    /* 0xD7 */ {2147, 7, 7, 11, 2, -7},
-    /* 0xD8 */ {2154, 13, 13, 14, 1, -12},
-    /* 0xD9 */ {2176, 11, 14, 13, 1, -13},
-    /* 0xDA */ {2196, 11, 14, 13, 1, -13},
-    /* 0xDB */ {2216, 11, 14, 13, 1, -13},
-    /* 0xDC */ {2236, 11, 14, 13, 1, -13},
-    /* 0xDD */ {2256, 12, 14, 12, 0, -13},
-    /* 0xDE */ {2277, 10, 13, 12, 1, -12},
-    /* 0xDF */ {2294, 9, 13, 11, 1, -12},
-    /* 0xE0 */ {2309, 9, 13, 10, 1, -12},
-    /* 0xE1 */ {2324, 9, 13, 10, 1, -12},
-    /* 0xE2 */ {2339, 9, 13, 10, 1, -12},
-    /* 0xE3 */ {2354, 9, 13, 10, 1, -12},
-    /* 0xE4 */ {2369, 9, 12, 10, 1, -11},
-    /* 0xE5 */ {2383, 9, 14, 10, 1, -13},
-    /* 0xE6 */ {2399, 15, 10, 16, 1, -9},
-    /* 0xE7 */ {2418, 8, 14, 9, 1, -9},
-    /* 0xE8 */ {2432, 8, 13, 10, 1, -12},
-    /* 0xE9 */ {2445, 8, 13, 10, 1, -12},
-    /* 0xEA */ {2458, 8, 13, 10, 1, -12},
-    /* 0xEB */ {2471, 8, 12, 10, 1, -11},
-    /* 0xEC */ {2483, 3, 13, 4, 0, -12},
-    /* 0xED */ {2488, 3, 13, 4, 1, -12},
-    /* 0xEE */ {2493, 4, 13, 5, 0, -12},
-    /* 0xEF */ {2500, 6, 12, 5, -1, -11},
-    /* 0xF0 */ {2509, 8, 13, 10, 1, -12},
-    /* 0xF1 */ {2522, 8, 13, 10, 1, -12},
-    /* 0xF2 */ {2535, 8, 13, 10, 1, -12},
-    /* 0xF3 */ {2548, 8, 13, 10, 1, -12},
-    /* 0xF4 */ {2561, 8, 13, 10, 1, -12},
-    /* 0xF5 */ {2574, 8, 13, 10, 1, -12},
-    /* 0xF6 */ {2587, 8, 12, 10, 1, -11},
-    /* 0xF7 */ {2599, 9, 8, 11, 1, -7},
-    /* 0xF8 */ {2608, 8, 10, 10, 1, -9},
-    /* 0xF9 */ {2618, 8, 13, 10, 1, -12},
-    /* 0xFA */ {2631, 8, 13, 10, 1, -12},
-    /* 0xFB */ {2644, 8, 13, 10, 1, -12},
-    /* 0xFC */ {2657, 8, 12, 10, 1, -11},
-    /* 0xFD */ {2669, 8, 17, 9, 0, -12},
-    /* 0xFE */ {2686, 9, 16, 10, 1, -12},
-    /* 0xFF */ {2704, 8, 16, 9, 0, -11},
-};
-
-const GFXfont FreeSans9pt_Win1252 PROGMEM = {(uint8_t *)FreeSans9pt_Win1252Bitmaps, (GFXglyph *)FreeSans9pt_Win1252Glyphs, 0x20,
-                                             0xFF, 21};
--- a/src/graphics/niche/InkHUD/Applet.cpp
+++ b/src/graphics/niche/InkHUD/Applet.cpp
@@ -263,10 +263,22 @@ uint16_t InkHUD::Applet::Y(float f)
 // Print text, specifying the position of any edge / corner of the textbox
 void InkHUD::Applet::printAt(int16_t x, int16_t y, const char *text, HorizontalAlignment ha, VerticalAlignment va)
 {
+    printAt(x, y, std::string(text), ha, va);
+}
+
+// Print text, specifying the position of any edge / corner of the textbox
+void InkHUD::Applet::printAt(int16_t x, int16_t y, std::string text, HorizontalAlignment ha, VerticalAlignment va)
+{
+    // Custom font
+    // - set with AppletFont::addSubstitution
+    // - find certain UTF8 chars
+    // - replace with glyph from custom font (or suitable ASCII addSubstitution?)
+    getFont().applySubstitutions(&text);
+
    // We do still have to run getTextBounds to find the width
    int16_t textOffsetX, textOffsetY;
    uint16_t textWidth, textHeight;
-    getTextBounds(text, 0, 0, &textOffsetX, &textOffsetY, &textWidth, &textHeight);
+    getTextBounds(text.c_str(), 0, 0, &textOffsetX, &textOffsetY, &textWidth, &textHeight);

    int16_t cursorX = 0;
    int16_t cursorY = 0;
@@ -298,13 +310,7 @@ void InkHUD::Applet::printAt(int16_t x, int16_t y, const char *text, HorizontalA
    }

    setCursor(cursorX, cursorY);
-    print(text);
-}
-
-// Print text, specifying the position of any edge / corner of the textbox
-void InkHUD::Applet::printAt(int16_t x, int16_t y, std::string text, HorizontalAlignment ha, VerticalAlignment va)
-{
-    printAt(x, y, text.c_str(), ha, va);
+    print(text.c_str());
 }

 // Set which font should be used for subsequent drawing
@@ -322,52 +328,11 @@ InkHUD::AppletFont InkHUD::Applet::getFont()
    return currentFont;
 }

-// Parse any text which might have "special characters"
-// Re-encodes UTF-8 characters to match our 8-bit encoded fonts
-std::string InkHUD::Applet::parse(std::string text)
-{
-    return getFont().decodeUTF8(text);
-}
-
-// Get the best version of a node's short name available to us
-// Parses any non-ascii chars
-// Swaps for last-four of node-id if the real short name is unknown or can't be rendered (emoji)
-std::string InkHUD::Applet::parseShortName(meshtastic_NodeInfoLite *node)
-{
-    assert(node);
-
-    // Use the true shortname if known, and doesn't contain any unprintable characters (emoji, etc.)
-    if (node->has_user) {
-        std::string parsed = parse(node->user.short_name);
-        if (isPrintable(parsed))
-            return parsed;
-    }
-
-    // Otherwise, use the "last 4" of node id
-    // - if short name unknown, or
-    // - if short name is emoji (we can't render this)
-    std::string nodeID = hexifyNodeNum(node->num);
-    return nodeID.substr(nodeID.length() - 4);
-}
-
-// Determine if all characters of a string are printable using the current font
-bool InkHUD::Applet::isPrintable(std::string text)
-{
-    // Scan for DEL (0x7F), which is the value assigned by AppletFont::applyEncoding if a unicode character is not handled
-    // Todo: move this to from DEL to SUB, once the fonts have been changed for this
-    for (char &c : text) {
-        if (c == '\x7F')
-            return false;
-    }
-
-    // No unprintable characters found
-    return true;
-}
-
 // Gets rendered width of a string
 // Wrapper for getTextBounds
 uint16_t InkHUD::Applet::getTextWidth(const char *text)
 {
+
    // We do still have to run getTextBounds to find the width
    int16_t textOffsetX, textOffsetY;
    uint16_t textWidth, textHeight;
@@ -380,6 +345,8 @@ uint16_t InkHUD::Applet::getTextWidth(const char *text)
 // Wrapper for getTextBounds
 uint16_t InkHUD::Applet::getTextWidth(std::string text)
 {
+    getFont().applySubstitutions(&text);
+
    return getTextWidth(text.c_str());
 }

@@ -428,6 +395,12 @@ std::string InkHUD::Applet::hexifyNodeNum(NodeNum num)
 // Avoids splitting words in half, instead moving the entire word to a new line wherever possible
 void InkHUD::Applet::printWrapped(int16_t left, int16_t top, uint16_t width, std::string text)
 {
+    // Custom font glyphs
+    // - set with AppletFont::addSubstitution
+    // - find certain UTF8 chars
+    // - replace with glyph from custom font (or suitable ASCII addSubstitution?)
+    getFont().applySubstitutions(&text);
+
    // Place the AdafruitGFX cursor to suit our "top" coord
    setCursor(left, top + getFont().heightAboveCursor());

--- a/src/graphics/niche/InkHUD/Applet.h
+++ b/src/graphics/niche/InkHUD/Applet.h
@@ -133,15 +133,12 @@ class Applet : public GFX
    void drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height,
                  Color color = BLACK); // Draw the Meshtastic logo

-    std::string hexifyNodeNum(NodeNum num);                    // Style as !0123abdc
-    SignalStrength getSignalStrength(float snr, float rssi);   // Interpret SNR and RSSI, as an easy to understand value
-    std::string getTimeString(uint32_t epochSeconds);          // Human readable
-    std::string getTimeString();                               // Current time, human readable
-    uint16_t getActiveNodeCount();                             // Duration determined by user, in onscreen menu
-    std::string localizeDistance(uint32_t meters);             // Human readable distance, imperial or metric
-    std::string parse(std::string text);                       // Handle text which might contain special chars
-    std::string parseShortName(meshtastic_NodeInfoLite *node); // Get the shortname, or a substitute if has unprintable chars
-    bool isPrintable(std::string);                             // Check for characters which the font can't print
+    std::string hexifyNodeNum(NodeNum num);                  // Style as !0123abdc
+    SignalStrength getSignalStrength(float snr, float rssi); // Interpret SNR and RSSI, as an easy to understand value
+    std::string getTimeString(uint32_t epochSeconds);        // Human readable
+    std::string getTimeString();                             // Current time, human readable
+    uint16_t getActiveNodeCount();                           // Duration determined by user, in onscreen menu
+    std::string localizeDistance(uint32_t meters);           // Human readable distance, imperial or metric

    // Convenient references

--- a/src/graphics/niche/InkHUD/AppletFont.cpp
+++ b/src/graphics/niche/InkHUD/AppletFont.cpp
@@ -2,17 +2,14 @@

 #include "./AppletFont.h"

-#include <assert.h>
-
 using namespace NicheGraphics;

 InkHUD::AppletFont::AppletFont()
 {
-    // Default constructor uses the in-built AdafruitGFX font (not recommended)
+    // Default constructor uses the in-built AdafruitGFX font
 }

-InkHUD::AppletFont::AppletFont(const GFXfont &adafruitGFXFont, Encoding encoding, int8_t paddingTop, int8_t paddingBottom)
-    : gfxFont(&adafruitGFXFont), encoding(encoding)
+InkHUD::AppletFont::AppletFont(const GFXfont &adafruitGFXFont) : gfxFont(&adafruitGFXFont)
 {
    // AdafruitGFX fonts are drawn relative to a "cursor line";
    // they print as if the glyphs are resting on the line of piece of ruled paper.
@@ -25,10 +22,6 @@ InkHUD::AppletFont::AppletFont(const GFXfont &adafruitGFXFont, Encoding encoding
    // AdafruitGFX fonts do declare a line-height, but this seems to include a certain amount of padding,
    // which we'd rather not deal with. If we want padding, we'll add it manually.

-    this->ascenderHeight = 0;
-    this->descenderHeight = 0;
-    this->height = 0;
-
    // Scan each glyph in the AdafruitGFX font
    for (uint16_t i = 0; i <= (gfxFont->last - gfxFont->first); i++) {
        uint8_t glyphHeight = gfxFont->glyph[i].height; // Height of glyph
@@ -40,16 +33,10 @@ InkHUD::AppletFont::AppletFont(const GFXfont &adafruitGFXFont, Encoding encoding
        int8_t glyphAscender = 0 - gfxFont->glyph[i].yOffset;
        if (glyphAscender > 0)
            this->ascenderHeight = max(this->ascenderHeight, (uint8_t)glyphAscender);
-
-        int8_t glyphDescender = gfxFont->glyph[i].height + gfxFont->glyph[i].yOffset;
-        if (glyphDescender > 0)
-            this->descenderHeight = max(this->descenderHeight, (uint8_t)glyphDescender);
    }

-    // Apply any manual padding to grow or shrink the line size
-    // Helpful if a font has one or two exceptionally large characters, which would make the lines ridiculously tall
-    ascenderHeight += paddingTop;
-    descenderHeight += paddingBottom;
+    // Determine how far characters may hang "below the line"
+    descenderHeight = height - ascenderHeight;

    // Find how far the cursor advances when we "print" a space character
    spaceCharWidth = gfxFont->glyph[(uint8_t)' ' - gfxFont->first].xAdvance;
@@ -96,533 +83,139 @@ uint8_t InkHUD::AppletFont::widthBetweenWords()
    return this->spaceCharWidth;
 }

-// Convert a unicode char from set of UTF-8 bytes to UTF-32
-// Used by AppletFont::applyEncoding, which remaps unicode chars for extended ASCII fonts, based on their UTF-32 value
-uint32_t InkHUD::AppletFont::toUtf32(std::string utf8)
+// Add to the list of substituted glyphs
+// This "find and replace" operation will be run before text is printed
+// Used to swap out UTF8 special characters, either with a custom font, or with a suitable ASCII approximation
+void InkHUD::AppletFont::addSubstitution(const char *from, const char *to)
 {
-    uint32_t utf32 = 0;
-
-    switch (utf8.length()) {
-    case 2:
-        // 5 bits + 6 bits
-        utf32 |= (utf8.at(0) & 0b00011111) << 6;
-        utf32 |= (utf8.at(1) & 0b00111111);
-        break;
-
-    case 3:
-        // 4 bits + 6 bits + 6 bits
-        utf32 |= (utf8.at(0) & 0b00001111) << (6 + 6);
-        utf32 |= (utf8.at(1) & 0b00111111) << 6;
-        utf32 |= (utf8.at(2) & 0b00111111);
-        break;
-
-    case 4:
-        // 3 bits + 6 bits + 6 bits + 6 bits
-        utf32 |= (utf8.at(0) & 0b00000111) << (6 + 6 + 6);
-        utf32 |= (utf8.at(1) & 0b00111111) << (6 + 6);
-        utf32 |= (utf8.at(2) & 0b00111111) << 6;
-        utf32 |= (utf8.at(3) & 0b00111111);
-        break;
-    default:
-        assert(false);
-    }
-
-    return utf32;
+    substitutions.push_back({.from = from, .to = to});
 }

-// Process a string, collating UTF-8 bytes, and sending them off for re-encoding to extended ASCII
-// Not all InkHUD text is passed through here, only text which could potentially contain non-ASCII chars
-std::string InkHUD::AppletFont::decodeUTF8(std::string encoded)
+// Run all registered substitutions on a string
+// Used to swap out UTF8 special chars
+void InkHUD::AppletFont::applySubstitutions(std::string *text)
 {
-    // Final processed output
-    std::string decoded;
+    // For each substitution
+    for (Substitution s : substitutions) {

-    // Holds bytes for one UTF-8 char during parsing
-    std::string utf8Char;
-    uint8_t utf8CharSize = 0;
-
-    for (char &c : encoded) {
-
-        // If first byte
-        if (utf8Char.empty()) {
-            // If MSB is unset, byte is an ASCII char
-            // If MSB is set, byte is part of a UTF-8 char. Counting number of higher-order bits tells how many bytes in char
-            if ((c & 0x80)) {
-                char c1 = c;
-                while (c1 & 0x80) {
-                    c1 <<= 1;
-                    utf8CharSize++;
-                }
-            }
+        // Find and replace
+        // - search for Substitution::from
+        // - replace with Substitution::to
+        size_t i = text->find(s.from);
+        while (i != std::string::npos) {
+            text->replace(i, strlen(s.from), s.to);
+            i = text->find(s.from, i); // Continue looking from last position
        }
-
-        // Append the byte to the UTF-8 char we're building
-        utf8Char += c;
-
-        // More bytes left to collect. Iterate.
-        if (utf8Char.length() < utf8CharSize)
-            continue;
-
-        // Now collected all bytes for this char
-        // Remap the value to match the encoding of our 8-bit AppletFont
-        decoded += applyEncoding(utf8Char);
-
-        // Reset, ready to build next UTF-8 char from the encoded bytes
-        utf8Char.clear();
-        utf8CharSize = 0;
-    } // For each char
-
-    // All chars processed, return result
-    return decoded;
+    }
 }

-// Re-encode a single UTF-8 character to extended ASCII
-// Target encoding depends on the font
-char InkHUD::AppletFont::applyEncoding(std::string utf8)
+// Apply a set of substitutions which remap UTF8 for a Windows-1251 font
+// Windows-1251 is an 8-bit character encoding, suitable for several languages which use the Cyrillic script
+void InkHUD::AppletFont::addSubstitutionsWin1251()
 {
-    // ##################################################### Syntactic Sugar #####################################################
-#define REMAP(in, out)                                                                                                           \
-    case in:                                                                                                                     \
-        return out;
-    // ###########################################################################################################################
+    addSubstitution("Ђ", "\x80");
+    addSubstitution("Ѓ", "\x81");
+    addSubstitution("ѓ", "\x83");
+    addSubstitution("€", "\x88");
+    addSubstitution("Љ", "\x8A");
+    addSubstitution("Њ", "\x8C");
+    addSubstitution("Ќ", "\x8D");
+    addSubstitution("Ћ", "\x8E");
+    addSubstitution("Џ", "\x8F");

-    // Latin - Central Europe
-    // https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
-    if (encoding == WINDOWS_1250) {
-        // 1-Byte chars: no remapping
-        if (utf8.length() == 1)
-            return utf8.at(0);
+    addSubstitution("ђ", "\x90");
+    addSubstitution("љ", "\x9A");
+    addSubstitution("њ", "\x9C");
+    addSubstitution("ќ", "\x9D");
+    addSubstitution("ћ", "\x9E");
+    addSubstitution("џ", "\x9F");

-        // Multi-byte chars:
-        switch (toUtf32(utf8)) {
-            REMAP(0x20AC, 0x80); // EURO SIGN
-            REMAP(0x201A, 0x82); // SINGLE LOW-9 QUOTATION MARK
-            REMAP(0x201E, 0x84); // DOUBLE LOW-9 QUOTATION MARK
-            REMAP(0x2026, 0x85); // HORIZONTAL ELLIPSIS
-            REMAP(0x2020, 0x86); // DAGGER
-            REMAP(0x2021, 0x87); // DOUBLE DAGGER
-            REMAP(0x2030, 0x89); // PER MILLE SIGN
-            REMAP(0x0160, 0x8A); // LATIN CAPITAL LETTER S WITH CARON
-            REMAP(0x2039, 0x8B); // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x015A, 0x8C); // LATIN CAPITAL LETTER S WITH ACUTE
-            REMAP(0x0164, 0x8D); // LATIN CAPITAL LETTER T WITH CARON
-            REMAP(0x017D, 0x8E); // LATIN CAPITAL LETTER Z WITH CARON
-            REMAP(0x0179, 0x8F); // LATIN CAPITAL LETTER Z WITH ACUTE
+    addSubstitution("Ў", "\xA1");
+    addSubstitution("ў", "\xA2");
+    addSubstitution("Ј", "\xA3");
+    addSubstitution("Ґ", "\xA5");
+    addSubstitution("Ё", "\xA8");
+    addSubstitution("Є", "\xAA");
+    addSubstitution("Ї", "\xAF");

-            REMAP(0x2018, 0x91); // LEFT SINGLE QUOTATION MARK
-            REMAP(0x2019, 0x92); // RIGHT SINGLE QUOTATION MARK
-            REMAP(0x201C, 0x93); // LEFT DOUBLE QUOTATION MARK
-            REMAP(0x201D, 0x94); // RIGHT DOUBLE QUOTATION MARK
-            REMAP(0x2022, 0x95); // BULLET
-            REMAP(0x2013, 0x96); // EN DASH
-            REMAP(0x2014, 0x97); // EM DASH
-            REMAP(0x2122, 0x99); // TRADE MARK SIGN
-            REMAP(0x0161, 0x9A); // LATIN SMALL LETTER S WITH CARON
-            REMAP(0x203A, 0x9B); // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x015B, 0x9C); // LATIN SMALL LETTER S WITH ACUTE
-            REMAP(0x0165, 0x9D); // LATIN SMALL LETTER T WITH CARON
-            REMAP(0x017E, 0x9E); // LATIN SMALL LETTER Z WITH CARON
-            REMAP(0x017A, 0x9F); // LATIN SMALL LETTER Z WITH ACUTE
+    addSubstitution("І", "\xB2");
+    addSubstitution("і", "\xB3");
+    addSubstitution("ґ", "\xB4");
+    addSubstitution("ё", "\xB8");
+    addSubstitution("№", "\xB9");
+    addSubstitution("є", "\xBA");
+    addSubstitution("ј", "\xBC");
+    addSubstitution("Ѕ", "\xBD");
+    addSubstitution("ѕ", "\xBE");
+    addSubstitution("ї", "\xBF");

-            REMAP(0x00A0, 0xA0); // NO-BREAK SPACE
-            REMAP(0x02C7, 0xA1); // CARON
-            REMAP(0x02D8, 0xA2); // BREVE
-            REMAP(0x0141, 0xA3); // LATIN CAPITAL LETTER L WITH STROKE
-            REMAP(0x00A4, 0xA4); // CURRENCY SIGN
-            REMAP(0x0104, 0xA5); // LATIN CAPITAL LETTER A WITH OGONEK
-            REMAP(0x00A6, 0xA6); // BROKEN BAR
-            REMAP(0x00A7, 0xA7); // SECTION SIGN
-            REMAP(0x00A8, 0xA8); // DIAERESIS
-            REMAP(0x00A9, 0xA9); // COPYRIGHT SIGN
-            REMAP(0x015E, 0xAA); // LATIN CAPITAL LETTER S WITH CEDILLA
-            REMAP(0x00AB, 0xAB); // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x00AC, 0xAC); // NOT SIGN
-            REMAP(0x00AD, 0xAD); // SOFT HYPHEN
-            REMAP(0x00AE, 0xAE); // REGISTERED SIGN
-            REMAP(0x017B, 0xAF); // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+    addSubstitution("А", "\xC0");
+    addSubstitution("Б", "\xC1");
+    addSubstitution("В", "\xC2");
+    addSubstitution("Г", "\xC3");
+    addSubstitution("Д", "\xC4");
+    addSubstitution("Е", "\xC5");
+    addSubstitution("Ж", "\xC6");
+    addSubstitution("З", "\xC7");
+    addSubstitution("И", "\xC8");
+    addSubstitution("Й", "\xC9");
+    addSubstitution("К", "\xCA");
+    addSubstitution("Л", "\xCB");
+    addSubstitution("М", "\xCC");
+    addSubstitution("Н", "\xCD");
+    addSubstitution("О", "\xCE");
+    addSubstitution("П", "\xCF");

-            REMAP(0x00B0, 0xB0); // DEGREE SIGN
-            REMAP(0x00B1, 0xB1); // PLUS-MINUS SIGN
-            REMAP(0x02DB, 0xB2); // OGONEK
-            REMAP(0x0142, 0xB3); // LATIN SMALL LETTER L WITH STROKE
-            REMAP(0x00B4, 0xB4); // ACUTE ACCENT
-            REMAP(0x00B5, 0xB5); // MICRO SIGN
-            REMAP(0x00B6, 0xB6); // PILCROW SIGN
-            REMAP(0x00B7, 0xB7); // MIDDLE DOT
-            REMAP(0x00B8, 0xB8); // CEDILLA
-            REMAP(0x0105, 0xB9); // LATIN SMALL LETTER A WITH OGONEK
-            REMAP(0x015F, 0xBA); // LATIN SMALL LETTER S WITH CEDILLA
-            REMAP(0x00BB, 0xBB); // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x013D, 0xBC); // LATIN CAPITAL LETTER L WITH CARON
-            REMAP(0x02DD, 0xBD); // DOUBLE ACUTE ACCENT
-            REMAP(0x013E, 0xBE); // LATIN SMALL LETTER L WITH CARON
-            REMAP(0x017C, 0xBF); // LATIN SMALL LETTER Z WITH DOT ABOVE
+    addSubstitution("Р", "\xD0");
+    addSubstitution("С", "\xD1");
+    addSubstitution("Т", "\xD2");
+    addSubstitution("У", "\xD3");
+    addSubstitution("Ф", "\xD4");
+    addSubstitution("Х", "\xD5");
+    addSubstitution("Ц", "\xD6");
+    addSubstitution("Ч", "\xD7");
+    addSubstitution("Ш", "\xD8");
+    addSubstitution("Щ", "\xD9");
+    addSubstitution("Ъ", "\xDA");
+    addSubstitution("Ы", "\xDB");
+    addSubstitution("Ь", "\xDC");
+    addSubstitution("Э", "\xDD");
+    addSubstitution("Ю", "\xDE");
+    addSubstitution("Я", "\xDF");

-            REMAP(0x0154, 0xC0); // LATIN CAPITAL LETTER R WITH ACUTE
-            REMAP(0x00C1, 0xC1); // LATIN CAPITAL LETTER A WITH ACUTE
-            REMAP(0x00C2, 0xC2); // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-            REMAP(0x0102, 0xC3); // LATIN CAPITAL LETTER A WITH BREVE
-            REMAP(0x00C4, 0xC4); // LATIN CAPITAL LETTER A WITH DIAERESIS
-            REMAP(0x0139, 0xC5); // LATIN CAPITAL LETTER L WITH ACUTE
-            REMAP(0x0106, 0xC6); // LATIN CAPITAL LETTER C WITH ACUTE
-            REMAP(0x00C7, 0xC7); // LATIN CAPITAL LETTER C WITH CEDILLA
-            REMAP(0x010C, 0xC8); // LATIN CAPITAL LETTER C WITH CARON
-            REMAP(0x00C9, 0xC9); // LATIN CAPITAL LETTER E WITH ACUTE
-            REMAP(0x0118, 0xCA); // LATIN CAPITAL LETTER E WITH OGONEK
-            REMAP(0x00CB, 0xCB); // LATIN CAPITAL LETTER E WITH DIAERESIS
-            REMAP(0x011A, 0xCC); // LATIN CAPITAL LETTER E WITH CARON
-            REMAP(0x00CD, 0xCD); // LATIN CAPITAL LETTER I WITH ACUTE
-            REMAP(0x00CE, 0xCE); // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-            REMAP(0x010E, 0xCF); // LATIN CAPITAL LETTER D WITH CARON
+    addSubstitution("а", "\xE0");
+    addSubstitution("б", "\xE1");
+    addSubstitution("в", "\xE2");
+    addSubstitution("г", "\xE3");
+    addSubstitution("д", "\xE4");
+    addSubstitution("е", "\xE5");
+    addSubstitution("ж", "\xE6");
+    addSubstitution("з", "\xE7");
+    addSubstitution("и", "\xE8");
+    addSubstitution("й", "\xE9");
+    addSubstitution("к", "\xEA");
+    addSubstitution("л", "\xEB");
+    addSubstitution("м", "\xEC");
+    addSubstitution("н", "\xED");
+    addSubstitution("о", "\xEE");
+    addSubstitution("п", "\xEF");

-            REMAP(0x0110, 0xD0); // LATIN CAPITAL LETTER D WITH STROKE
-            REMAP(0x0143, 0xD1); // LATIN CAPITAL LETTER N WITH ACUTE
-            REMAP(0x0147, 0xD2); // LATIN CAPITAL LETTER N WITH CARON
-            REMAP(0x00D3, 0xD3); // LATIN CAPITAL LETTER O WITH ACUTE
-            REMAP(0x00D4, 0xD4); // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-            REMAP(0x0150, 0xD5); // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-            REMAP(0x00D6, 0xD6); // LATIN CAPITAL LETTER O WITH DIAERESIS
-            REMAP(0x00D7, 0xD7); // MULTIPLICATION SIGN
-            REMAP(0x0158, 0xD8); // LATIN CAPITAL LETTER R WITH CARON
-            REMAP(0x016E, 0xD9); // LATIN CAPITAL LETTER U WITH RING ABOVE
-            REMAP(0x00DA, 0xDA); // LATIN CAPITAL LETTER U WITH ACUTE
-            REMAP(0x0170, 0xDB); // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-            REMAP(0x00DC, 0xDC); // LATIN CAPITAL LETTER U WITH DIAERESIS
-            REMAP(0x00DD, 0xDD); // LATIN CAPITAL LETTER Y WITH ACUTE
-            REMAP(0x0162, 0xDE); // LATIN CAPITAL LETTER T WITH CEDILLA
-            REMAP(0x00DF, 0xDF); // LATIN SMALL LETTER SHARP S
-
-            REMAP(0x0155, 0xE0); // LATIN SMALL LETTER R WITH ACUTE
-            REMAP(0x00E1, 0xE1); // LATIN SMALL LETTER A WITH ACUTE
-            REMAP(0x00E2, 0xE2); // LATIN SMALL LETTER A WITH CIRCUMFLEX
-            REMAP(0x0103, 0xE3); // LATIN SMALL LETTER A WITH BREVE
-            REMAP(0x00E4, 0xE4); // LATIN SMALL LETTER A WITH DIAERESIS
-            REMAP(0x013A, 0xE5); // LATIN SMALL LETTER L WITH ACUTE
-            REMAP(0x0107, 0xE6); // LATIN SMALL LETTER C WITH ACUTE
-            REMAP(0x00E7, 0xE7); // LATIN SMALL LETTER C WITH CEDILLA
-            REMAP(0x010D, 0xE8); // LATIN SMALL LETTER C WITH CARON
-            REMAP(0x00E9, 0xE9); // LATIN SMALL LETTER E WITH ACUTE
-            REMAP(0x0119, 0xEA); // LATIN SMALL LETTER E WITH OGONEK
-            REMAP(0x00EB, 0xEB); // LATIN SMALL LETTER E WITH DIAERESIS
-            REMAP(0x011B, 0xEC); // LATIN SMALL LETTER E WITH CARON
-            REMAP(0x00ED, 0xED); // LATIN SMALL LETTER I WITH ACUTE
-            REMAP(0x00EE, 0xEE); // LATIN SMALL LETTER I WITH CIRCUMFLEX
-            REMAP(0x010F, 0xEF); // LATIN SMALL LETTER D WITH CARON
-
-            REMAP(0x0111, 0xF0); // LATIN SMALL LETTER D WITH STROKE
-            REMAP(0x0144, 0xF1); // LATIN SMALL LETTER N WITH ACUTE
-            REMAP(0x0148, 0xF2); // LATIN SMALL LETTER N WITH CARON
-            REMAP(0x00F3, 0xF3); // LATIN SMALL LETTER O WITH ACUTE
-            REMAP(0x00F4, 0xF4); // LATIN SMALL LETTER O WITH CIRCUMFLEX
-            REMAP(0x0151, 0xF5); // LATIN SMALL LETTER O WITH DOUBLE ACUTE
-            REMAP(0x00F6, 0xF6); // LATIN SMALL LETTER O WITH DIAERESIS
-            REMAP(0x00F7, 0xF7); // DIVISION SIGN
-            REMAP(0x0159, 0xF8); // LATIN SMALL LETTER R WITH CARON
-            REMAP(0x016F, 0xF9); // LATIN SMALL LETTER U WITH RING ABOVE
-            REMAP(0x00FA, 0xFA); // LATIN SMALL LETTER U WITH ACUTE
-            REMAP(0x0171, 0xFB); // LATIN SMALL LETTER U WITH DOUBLE ACUTE
-            REMAP(0x00FC, 0xFC); // LATIN SMALL LETTER U WITH DIAERESIS
-            REMAP(0x00FD, 0xFD); // LATIN SMALL LETTER Y WITH ACUTE
-            REMAP(0x0163, 0xFE); // LATIN SMALL LETTER T WITH CEDILLA
-            REMAP(0x02D9, 0xFF); // DOT ABOVE
-        }
-    }
-
-    // Latin - Cyrillic
-    // https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1251.TXT
-    else if (encoding == WINDOWS_1251) {
-        // 1-Byte chars: no remapping
-        if (utf8.length() == 1)
-            return utf8.at(0);
-
-        // Multi-byte chars:
-        switch (toUtf32(utf8)) {
-            REMAP(0x0402, 0x80); // CYRILLIC CAPITAL LETTER DJE
-            REMAP(0x0403, 0x81); // CYRILLIC CAPITAL LETTER GJE
-            REMAP(0x201A, 0x82); // SINGLE LOW-9 QUOTATION MARK
-            REMAP(0x0453, 0x83); // CYRILLIC SMALL LETTER GJE
-            REMAP(0x201E, 0x84); // DOUBLE LOW-9 QUOTATION MARK
-            REMAP(0x2026, 0x85); // HORIZONTAL ELLIPSIS
-            REMAP(0x2020, 0x86); // DAGGER
-            REMAP(0x2021, 0x87); // DOUBLE DAGGER
-            REMAP(0x20AC, 0x88); // EURO SIGN
-            REMAP(0x2030, 0x89); // PER MILLE SIGN
-            REMAP(0x0409, 0x8A); // CYRILLIC CAPITAL LETTER LJE
-            REMAP(0x2039, 0x8B); // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x040A, 0x8C); // CYRILLIC CAPITAL LETTER NJE
-            REMAP(0x040C, 0x8D); // CYRILLIC CAPITAL LETTER KJE
-            REMAP(0x040B, 0x8E); // CYRILLIC CAPITAL LETTER TSHE
-            REMAP(0x040F, 0x8F); // CYRILLIC CAPITAL LETTER DZHE
-
-            REMAP(0x0452, 0x90); // CYRILLIC SMALL LETTER DJE
-            REMAP(0x2018, 0x91); // LEFT SINGLE QUOTATION MARK
-            REMAP(0x2019, 0x92); // RIGHT SINGLE QUOTATION MARK
-            REMAP(0x201C, 0x93); // LEFT DOUBLE QUOTATION MARK
-            REMAP(0x201D, 0x94); // RIGHT DOUBLE QUOTATION MARK
-            REMAP(0x2022, 0x95); // BULLET
-            REMAP(0x2013, 0x96); // EN DASH
-            REMAP(0x2014, 0x97); // EM DASH
-            REMAP(0x2122, 0x99); // TRADE MARK SIGN
-            REMAP(0x0459, 0x9A); // CYRILLIC SMALL LETTER LJE
-            REMAP(0x203A, 0x9B); // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x045A, 0x9C); // CYRILLIC SMALL LETTER NJE
-            REMAP(0x045C, 0x9D); // CYRILLIC SMALL LETTER KJE
-            REMAP(0x045B, 0x9E); // CYRILLIC SMALL LETTER TSHE
-            REMAP(0x045F, 0x9F); // CYRILLIC SMALL LETTER DZHE
-
-            REMAP(0x00A0, 0xA0); // NO-BREAK SPACE
-            REMAP(0x040E, 0xA1); // CYRILLIC CAPITAL LETTER SHORT U
-            REMAP(0x045E, 0xA2); // CYRILLIC SMALL LETTER SHORT U
-            REMAP(0x0408, 0xA3); // CYRILLIC CAPITAL LETTER JE
-            REMAP(0x00A4, 0xA4); // CURRENCY SIGN
-            REMAP(0x0490, 0xA5); // CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-            REMAP(0x00A6, 0xA6); // BROKEN BAR
-            REMAP(0x00A7, 0xA7); // SECTION SIGN
-            REMAP(0x0401, 0xA8); // CYRILLIC CAPITAL LETTER IO
-            REMAP(0x00A9, 0xA9); // COPYRIGHT SIGN
-            REMAP(0x0404, 0xAA); // CYRILLIC CAPITAL LETTER UKRAINIAN IE
-            REMAP(0x00AB, 0xAB); // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x00AC, 0xAC); // NOT SIGN
-            REMAP(0x00AD, 0xAD); // SOFT HYPHEN
-            REMAP(0x00AE, 0xAE); // REGISTERED SIGN
-            REMAP(0x0407, 0xAF); // CYRILLIC CAPITAL LETTER YI
-
-            REMAP(0x00B0, 0xB0); // DEGREE SIGN
-            REMAP(0x00B1, 0xB1); // PLUS-MINUS SIGN
-            REMAP(0x0406, 0xB2); // CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-            REMAP(0x0456, 0xB3); // CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-            REMAP(0x0491, 0xB4); // CYRILLIC SMALL LETTER GHE WITH UPTURN
-            REMAP(0x00B5, 0xB5); // MICRO SIGN
-            REMAP(0x00B6, 0xB6); // PILCROW SIGN
-            REMAP(0x00B7, 0xB7); // MIDDLE DOT
-            REMAP(0x0451, 0xB8); // CYRILLIC SMALL LETTER IO
-            REMAP(0x2116, 0xB9); // NUMERO SIGN
-            REMAP(0x0454, 0xBA); // CYRILLIC SMALL LETTER UKRAINIAN IE
-            REMAP(0x00BB, 0xBB); // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x0458, 0xBC); // CYRILLIC SMALL LETTER JE
-            REMAP(0x0405, 0xBD); // CYRILLIC CAPITAL LETTER DZE
-            REMAP(0x0455, 0xBE); // CYRILLIC SMALL LETTER DZE
-            REMAP(0x0457, 0xBF); // CYRILLIC SMALL LETTER YI
-
-            REMAP(0x0410, 0xC0); // CYRILLIC CAPITAL LETTER A
-            REMAP(0x0411, 0xC1); // CYRILLIC CAPITAL LETTER BE
-            REMAP(0x0412, 0xC2); // CYRILLIC CAPITAL LETTER VE
-            REMAP(0x0413, 0xC3); // CYRILLIC CAPITAL LETTER GHE
-            REMAP(0x0414, 0xC4); // CYRILLIC CAPITAL LETTER DE
-            REMAP(0x0415, 0xC5); // CYRILLIC CAPITAL LETTER IE
-            REMAP(0x0416, 0xC6); // CYRILLIC CAPITAL LETTER ZHE
-            REMAP(0x0417, 0xC7); // CYRILLIC CAPITAL LETTER ZE
-            REMAP(0x0418, 0xC8); // CYRILLIC CAPITAL LETTER I
-            REMAP(0x0419, 0xC9); // CYRILLIC CAPITAL LETTER SHORT I
-            REMAP(0x041A, 0xCA); // CYRILLIC CAPITAL LETTER KA
-            REMAP(0x041B, 0xCB); // CYRILLIC CAPITAL LETTER EL
-            REMAP(0x041C, 0xCC); // CYRILLIC CAPITAL LETTER EM
-            REMAP(0x041D, 0xCD); // CYRILLIC CAPITAL LETTER EN
-            REMAP(0x041E, 0xCE); // CYRILLIC CAPITAL LETTER O
-            REMAP(0x041F, 0xCF); // CYRILLIC CAPITAL LETTER PE
-
-            REMAP(0x0420, 0xD0); // CYRILLIC CAPITAL LETTER ER
-            REMAP(0x0421, 0xD1); // CYRILLIC CAPITAL LETTER ES
-            REMAP(0x0422, 0xD2); // CYRILLIC CAPITAL LETTER TE
-            REMAP(0x0423, 0xD3); // CYRILLIC CAPITAL LETTER U
-            REMAP(0x0424, 0xD4); // CYRILLIC CAPITAL LETTER EF
-            REMAP(0x0425, 0xD5); // CYRILLIC CAPITAL LETTER HA
-            REMAP(0x0426, 0xD6); // CYRILLIC CAPITAL LETTER TSE
-            REMAP(0x0427, 0xD7); // CYRILLIC CAPITAL LETTER CHE
-            REMAP(0x0428, 0xD8); // CYRILLIC CAPITAL LETTER SHA
-            REMAP(0x0429, 0xD9); // CYRILLIC CAPITAL LETTER SHCHA
-            REMAP(0x042A, 0xDA); // CYRILLIC CAPITAL LETTER HARD SIGN
-            REMAP(0x042B, 0xDB); // CYRILLIC CAPITAL LETTER YERU
-            REMAP(0x042C, 0xDC); // CYRILLIC CAPITAL LETTER SOFT SIGN
-            REMAP(0x042D, 0xDD); // CYRILLIC CAPITAL LETTER E
-            REMAP(0x042E, 0xDE); // CYRILLIC CAPITAL LETTER YU
-            REMAP(0x042F, 0xDF); // CYRILLIC CAPITAL LETTER YA
-
-            REMAP(0x0430, 0xE0); // CYRILLIC SMALL LETTER A
-            REMAP(0x0431, 0xE1); // CYRILLIC SMALL LETTER BE
-            REMAP(0x0432, 0xE2); // CYRILLIC SMALL LETTER VE
-            REMAP(0x0433, 0xE3); // CYRILLIC SMALL LETTER GHE
-            REMAP(0x0434, 0xE4); // CYRILLIC SMALL LETTER DE
-            REMAP(0x0435, 0xE5); // CYRILLIC SMALL LETTER IE
-            REMAP(0x0436, 0xE6); // CYRILLIC SMALL LETTER ZHE
-            REMAP(0x0437, 0xE7); // CYRILLIC SMALL LETTER ZE
-            REMAP(0x0438, 0xE8); // CYRILLIC SMALL LETTER I
-            REMAP(0x0439, 0xE9); // CYRILLIC SMALL LETTER SHORT I
-            REMAP(0x043A, 0xEA); // CYRILLIC SMALL LETTER KA
-            REMAP(0x043B, 0xEB); // CYRILLIC SMALL LETTER EL
-            REMAP(0x043C, 0xEC); // CYRILLIC SMALL LETTER EM
-            REMAP(0x043D, 0xED); // CYRILLIC SMALL LETTER EN
-            REMAP(0x043E, 0xEE); // CYRILLIC SMALL LETTER O
-            REMAP(0x043F, 0xEF); // CYRILLIC SMALL LETTER PE
-
-            REMAP(0x0440, 0xF0); // CYRILLIC SMALL LETTER ER
-            REMAP(0x0441, 0xF1); // CYRILLIC SMALL LETTER ES
-            REMAP(0x0442, 0xF2); // CYRILLIC SMALL LETTER TE
-            REMAP(0x0443, 0xF3); // CYRILLIC SMALL LETTER U
-            REMAP(0x0444, 0xF4); // CYRILLIC SMALL LETTER EF
-            REMAP(0x0445, 0xF5); // CYRILLIC SMALL LETTER HA
-            REMAP(0x0446, 0xF6); // CYRILLIC SMALL LETTER TSE
-            REMAP(0x0447, 0xF7); // CYRILLIC SMALL LETTER CHE
-            REMAP(0x0448, 0xF8); // CYRILLIC SMALL LETTER SHA
-            REMAP(0x0449, 0xF9); // CYRILLIC SMALL LETTER SHCHA
-            REMAP(0x044A, 0xFA); // CYRILLIC SMALL LETTER HARD SIGN
-            REMAP(0x044B, 0xFB); // CYRILLIC SMALL LETTER YERU
-            REMAP(0x044C, 0xFC); // CYRILLIC SMALL LETTER SOFT SIGN
-            REMAP(0x044D, 0xFD); // CYRILLIC SMALL LETTER E
-            REMAP(0x044E, 0xFE); // CYRILLIC SMALL LETTER YU
-            REMAP(0x044F, 0xFF); // CYRILLIC SMALL LETTER YA
-        }
-    }
-
-    // Latin - Western Europe
-    // https://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT
-    else if (encoding == WINDOWS_1252) {
-        // 1-Byte chars: no remapping
-        if (utf8.length() == 1)
-            return utf8.at(0);
-
-        // Multi-byte chars:
-        switch (toUtf32(utf8)) {
-            REMAP(0x20AC, 0x80) // EURO SIGN
-            REMAP(0x201A, 0x82) // SINGLE LOW-9 QUOTATION MARK
-            REMAP(0x0192, 0x83) // LATIN SMALL LETTER F WITH HOOK
-            REMAP(0x201E, 0x84) // DOUBLE LOW-9 QUOTATION MARK
-            REMAP(0x2026, 0x85) // HORIZONTAL ELLIPSIS
-            REMAP(0x2020, 0x86) // DAGGER
-            REMAP(0x2021, 0x87) // DOUBLE DAGGER
-            REMAP(0x02C6, 0x88) // MODIFIER LETTER CIRCUMFLEX ACCENT
-            REMAP(0x2030, 0x89) // PER MILLE SIGN
-            REMAP(0x0160, 0x8A) // LATIN CAPITAL LETTER S WITH CARON
-            REMAP(0x2039, 0x8B) // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x0152, 0x8C) // LATIN CAPITAL LIGATURE OE
-            REMAP(0x017D, 0x8E) // LATIN CAPITAL LETTER Z WITH CARON
-
-            REMAP(0x2018, 0x91) // LEFT SINGLE QUOTATION MARK
-            REMAP(0x2019, 0x92) // RIGHT SINGLE QUOTATION MARK
-            REMAP(0x201C, 0x93) // LEFT DOUBLE QUOTATION MARK
-            REMAP(0x201D, 0x94) // RIGHT DOUBLE QUOTATION MARK
-            REMAP(0x2022, 0x95) // BULLET
-            REMAP(0x2013, 0x96) // EN DASH
-            REMAP(0x2014, 0x97) // EM DASH
-            REMAP(0x02DC, 0x98) // SMALL TILDE
-            REMAP(0x2122, 0x99) // TRADE MARK SIGN
-            REMAP(0x0161, 0x9A) // LATIN SMALL LETTER S WITH CARON
-            REMAP(0x203A, 0x9B) // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-            REMAP(0x0153, 0x9C) // LATIN SMALL LIGATURE OE
-            REMAP(0x017E, 0x9E) // LATIN SMALL LETTER Z WITH CARON
-            REMAP(0x0178, 0x9F) // LATIN CAPITAL LETTER Y WITH DIAERESIS
-
-            REMAP(0x00A0, 0xA0) // NO-BREAK SPACE
-            REMAP(0x00A1, 0xA1) // INVERTED EXCLAMATION MARK
-            REMAP(0x00A2, 0xA2) // CENT SIGN
-            REMAP(0x00A3, 0xA3) // POUND SIGN
-            REMAP(0x00A4, 0xA4) // CURRENCY SIGN
-            REMAP(0x00A5, 0xA5) // YEN SIGN
-            REMAP(0x00A6, 0xA6) // BROKEN BAR
-            REMAP(0x00A7, 0xA7) // SECTION SIGN
-            REMAP(0x00A8, 0xA8) // DIAERESIS
-            REMAP(0x00A9, 0xA9) // COPYRIGHT SIGN
-            REMAP(0x00AA, 0xAA) // FEMININE ORDINAL INDICATOR
-            REMAP(0x00AB, 0xAB) // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x00AC, 0xAC) // NOT SIGN
-            REMAP(0x00AD, 0xAD) // SOFT HYPHEN
-            REMAP(0x00AE, 0xAE) // REGISTERED SIGN
-            REMAP(0x00AF, 0xAF) // MACRON
-
-            REMAP(0x00B0, 0xB0) // DEGREE SIGN
-            REMAP(0x00B1, 0xB1) // PLUS-MINUS SIGN
-            REMAP(0x00B2, 0xB2) // SUPERSCRIPT TWO
-            REMAP(0x00B3, 0xB3) // SUPERSCRIPT THREE
-            REMAP(0x00B4, 0xB4) // ACUTE ACCENT
-            REMAP(0x00B5, 0xB5) // MICRO SIGN
-            REMAP(0x00B6, 0xB6) // PILCROW SIGN
-            REMAP(0x00B7, 0xB7) // MIDDLE DOT
-            REMAP(0x00B8, 0xB8) // CEDILLA
-            REMAP(0x00B9, 0xB9) // SUPERSCRIPT ONE
-            REMAP(0x00BA, 0xBA) // MASCULINE ORDINAL INDICATOR
-            REMAP(0x00BB, 0xBB) // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-            REMAP(0x00BC, 0xBC) // VULGAR FRACTION ONE QUARTER
-            REMAP(0x00BD, 0xBD) // VULGAR FRACTION ONE HALF
-            REMAP(0x00BE, 0xBE) // VULGAR FRACTION THREE QUARTERS
-            REMAP(0x00BF, 0xBF) // INVERTED QUESTION MARK
-
-            REMAP(0x00C0, 0xC0) // LATIN CAPITAL LETTER A WITH GRAVE
-            REMAP(0x00C1, 0xC1) // LATIN CAPITAL LETTER A WITH ACUTE
-            REMAP(0x00C2, 0xC2) // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-            REMAP(0x00C3, 0xC3) // LATIN CAPITAL LETTER A WITH TILDE
-            REMAP(0x00C4, 0xC4) // LATIN CAPITAL LETTER A WITH DIAERESIS
-            REMAP(0x00C5, 0xC5) // LATIN CAPITAL LETTER A WITH RING ABOVE
-            REMAP(0x00C6, 0xC6) // LATIN CAPITAL LETTER AE
-            REMAP(0x00C7, 0xC7) // LATIN CAPITAL LETTER C WITH CEDILLA
-            REMAP(0x00C8, 0xC8) // LATIN CAPITAL LETTER E WITH GRAVE
-            REMAP(0x00C9, 0xC9) // LATIN CAPITAL LETTER E WITH ACUTE
-            REMAP(0x00CA, 0xCA) // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-            REMAP(0x00CB, 0xCB) // LATIN CAPITAL LETTER E WITH DIAERESIS
-            REMAP(0x00CC, 0xCC) // LATIN CAPITAL LETTER I WITH GRAVE
-            REMAP(0x00CD, 0xCD) // LATIN CAPITAL LETTER I WITH ACUTE
-            REMAP(0x00CE, 0xCE) // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-            REMAP(0x00CF, 0xCF) // LATIN CAPITAL LETTER I WITH DIAERESIS
-
-            REMAP(0x00D0, 0xD0) // LATIN CAPITAL LETTER ETH
-            REMAP(0x00D1, 0xD1) // LATIN CAPITAL LETTER N WITH TILDE
-            REMAP(0x00D2, 0xD2) // LATIN CAPITAL LETTER O WITH GRAVE
-            REMAP(0x00D3, 0xD3) // LATIN CAPITAL LETTER O WITH ACUTE
-            REMAP(0x00D4, 0xD4) // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-            REMAP(0x00D5, 0xD5) // LATIN CAPITAL LETTER O WITH TILDE
-            REMAP(0x00D6, 0xD6) // LATIN CAPITAL LETTER O WITH DIAERESIS
-            REMAP(0x00D7, 0xD7) // MULTIPLICATION SIGN
-            REMAP(0x00D8, 0xD8) // LATIN CAPITAL LETTER O WITH STROKE
-            REMAP(0x00D9, 0xD9) // LATIN CAPITAL LETTER U WITH GRAVE
-            REMAP(0x00DA, 0xDA) // LATIN CAPITAL LETTER U WITH ACUTE
-            REMAP(0x00DB, 0xDB) // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-            REMAP(0x00DC, 0xDC) // LATIN CAPITAL LETTER U WITH DIAERESIS
-            REMAP(0x00DD, 0xDD) // LATIN CAPITAL LETTER Y WITH ACUTE
-            REMAP(0x00DE, 0xDE) // LATIN CAPITAL LETTER THORN
-            REMAP(0x00DF, 0xDF) // LATIN SMALL LETTER SHARP S
-
-            REMAP(0x00E0, 0xE0) // LATIN SMALL LETTER A WITH GRAVE
-            REMAP(0x00E1, 0xE1) // LATIN SMALL LETTER A WITH ACUTE
-            REMAP(0x00E2, 0xE2) // LATIN SMALL LETTER A WITH CIRCUMFLEX
-            REMAP(0x00E3, 0xE3) // LATIN SMALL LETTER A WITH TILDE
-            REMAP(0x00E4, 0xE4) // LATIN SMALL LETTER A WITH DIAERESIS
-            REMAP(0x00E5, 0xE5) // LATIN SMALL LETTER A WITH RING ABOVE
-            REMAP(0x00E6, 0xE6) // LATIN SMALL LETTER AE
-            REMAP(0x00E7, 0xE7) // LATIN SMALL LETTER C WITH CEDILLA
-            REMAP(0x00E8, 0xE8) // LATIN SMALL LETTER E WITH GRAVE
-            REMAP(0x00E9, 0xE9) // LATIN SMALL LETTER E WITH ACUTE
-            REMAP(0x00EA, 0xEA) // LATIN SMALL LETTER E WITH CIRCUMFLEX
-            REMAP(0x00EB, 0xEB) // LATIN SMALL LETTER E WITH DIAERESIS
-            REMAP(0x00EC, 0xEC) // LATIN SMALL LETTER I WITH GRAVE
-            REMAP(0x00ED, 0xED) // LATIN SMALL LETTER I WITH ACUTE
-            REMAP(0x00EE, 0xEE) // LATIN SMALL LETTER I WITH CIRCUMFLEX
-            REMAP(0x00EF, 0xEF) // LATIN SMALL LETTER I WITH DIAERESIS
-
-            REMAP(0x00F0, 0xF0) // LATIN SMALL LETTER ETH
-            REMAP(0x00F1, 0xF1) // LATIN SMALL LETTER N WITH TILDE
-            REMAP(0x00F2, 0xF2) // LATIN SMALL LETTER O WITH GRAVE
-            REMAP(0x00F3, 0xF3) // LATIN SMALL LETTER O WITH ACUTE
-            REMAP(0x00F4, 0xF4) // LATIN SMALL LETTER O WITH CIRCUMFLEX
-            REMAP(0x00F5, 0xF5) // LATIN SMALL LETTER O WITH TILDE
-            REMAP(0x00F6, 0xF6) // LATIN SMALL LETTER O WITH DIAERESIS
-            REMAP(0x00F7, 0xF7) // DIVISION SIGN
-            REMAP(0x00F8, 0xF8) // LATIN SMALL LETTER O WITH STROKE
-            REMAP(0x00F9, 0xF9) // LATIN SMALL LETTER U WITH GRAVE
-            REMAP(0x00FA, 0xFA) // LATIN SMALL LETTER U WITH ACUTE
-            REMAP(0x00FB, 0xFB) // LATIN SMALL LETTER U WITH CIRCUMFLEX
-            REMAP(0x00FC, 0xFC) // LATIN SMALL LETTER U WITH DIAERESIS
-            REMAP(0x00FD, 0xFD) // LATIN SMALL LETTER Y WITH ACUTE
-            REMAP(0x00FE, 0xFE) // LATIN SMALL LETTER THORN
-            REMAP(0x00FF, 0xFF) // LATIN SMALL LETTER Y WITH DIAERESIS
-        }
-    }
-
-    // If not handled, return DEL
-    // Todo: swap this to SUB, and modify the fonts
-    return '\x7F';
-
-// Sweep up the syntactic sugar
-// Don't want ants in the house
-#undef REMAP
+    addSubstitution("р", "\xF0");
+    addSubstitution("с", "\xF1");
+    addSubstitution("т", "\xF2");
+    addSubstitution("у", "\xF3");
+    addSubstitution("ф", "\xF4");
+    addSubstitution("х", "\xF5");
+    addSubstitution("ц", "\xF6");
+    addSubstitution("ч", "\xF7");
+    addSubstitution("ш", "\xF8");
+    addSubstitution("щ", "\xF9");
+    addSubstitution("ъ", "\xFA");
+    addSubstitution("ы", "\xFB");
+    addSubstitution("ь", "\xFC");
+    addSubstitution("э", "\xFD");
+    addSubstitution("ю", "\xFE");
+    addSubstitution("я", "\xFF");
 }

 #endif
--- a/src/graphics/niche/InkHUD/AppletFont.h
+++ b/src/graphics/niche/InkHUD/AppletFont.h
@@ -4,7 +4,10 @@

    Wrapper class for an AdafruitGFX font
    Pre-calculates some font dimension info which InkHUD uses repeatedly
-    Re-encodes UTF-8 characters to suit extended ASCII AdafruitGFX fonts
+
+    Also contains an optional set of "substitutions".
+    These can be used to detect special UTF8 chars, and replace occurrences with a remapped char val to suit a custom font
+    These can also be used to swap UTF8 chars for a suitable ASCII substitution (e.g. German ö -> oe, etc)

 */

@@ -21,61 +24,36 @@ namespace NicheGraphics::InkHUD
 class AppletFont
 {
  public:
-    enum Encoding {
-        ASCII,
-        WINDOWS_1250,
-        WINDOWS_1251,
-        WINDOWS_1252,
-    };
-
    AppletFont();
-    AppletFont(const GFXfont &adafruitGFXFont, Encoding encoding = ASCII, int8_t paddingTop = 0, int8_t paddingBottom = 0);
+    explicit AppletFont(const GFXfont &adafruitGFXFont);

    uint8_t lineHeight();
    uint8_t heightAboveCursor();
    uint8_t heightBelowCursor();
    uint8_t widthBetweenWords(); // Width of the space character

-    std::string decodeUTF8(std::string encoded);
+    void applySubstitutions(std::string *text);             // Run all char-substitution operations, prior to printing
+    void addSubstitution(const char *from, const char *to); // Register a find-replace action, for remapping UTF8 chars
+    void addSubstitutionsWin1251();                         // Cyrillic fonts: remap UTF8 values to their Win-1251 equivalent
+    // Todo: Polish font

    const GFXfont *gfxFont = NULL; // Default value: in-built AdafruitGFX font

  private:
-    uint32_t toUtf32(std::string utf8);
-    char applyEncoding(std::string utf8);
-
    uint8_t height = 8;          // Default value: in-built AdafruitGFX font
    uint8_t ascenderHeight = 0;  // Default value: in-built AdafruitGFX font
    uint8_t descenderHeight = 8; // Default value: in-built AdafruitGFX font
    uint8_t spaceCharWidth = 8;  // Default value: in-built AdafruitGFX font

-    Encoding encoding = ASCII;
+    // One pair of find-replace values, for substituting or remapping UTF8 chars
+    struct Substitution {
+        const char *from;
+        const char *to;
+    };
+
+    std::vector<Substitution> substitutions; // List of all character substitutions to run, prior to printing a string
 };

 } // namespace NicheGraphics::InkHUD

-// Macros for InkHUD's standard fonts
-// --------------------------------------
-
-// Use these once only, passing them to InkHUD::Applet::fontLarge and InkHUD::Applet:fontSmall
-// Line padding has been adjusted manually, to compensate for a few *extra tall* diacritics
-
-// Central European
-#include "graphics/niche/Fonts/FreeSans6pt_Win1250.h"
-#include "graphics/niche/Fonts/FreeSans9pt_Win1250.h"
-#define FREESANS_9PT_WIN1250 InkHUD::AppletFont(FreeSans9pt_Win1250, InkHUD::AppletFont::WINDOWS_1250, -1, -1)
-#define FREESANS_6PT_WIN1250 InkHUD::AppletFont(FreeSans6pt_Win1250, InkHUD::AppletFont::WINDOWS_1250, -1, -2)
-
-// Cyrillic
-#include "graphics/niche/Fonts/FreeSans6pt_Win1251.h"
-#include "graphics/niche/Fonts/FreeSans9pt_Win1251.h"
-#define FREESANS_9PT_WIN1251 InkHUD::AppletFont(FreeSans9pt_Win1251, InkHUD::AppletFont::WINDOWS_1251, -2, -1)
-#define FREESANS_6PT_WIN1251 InkHUD::AppletFont(FreeSans6pt_Win1251, InkHUD::AppletFont::WINDOWS_1251, -1, -2)
-
-// Western European
-#include "graphics/niche/Fonts/FreeSans6pt_Win1252.h"
-#include "graphics/niche/Fonts/FreeSans9pt_Win1252.h"
-#define FREESANS_9PT_WIN1252 InkHUD::AppletFont(FreeSans9pt_Win1252, InkHUD::AppletFont::WINDOWS_1252, -2, -1)
-#define FREESANS_6PT_WIN1252 InkHUD::AppletFont(FreeSans6pt_Win1252, InkHUD::AppletFont::WINDOWS_1252, -1, -2)
-
 #endif
--- a/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Bases/Map/MapApplet.cpp
@@ -286,10 +286,6 @@ void InkHUD::MapApplet::drawLabeledMarker(meshtastic_NodeInfoLite *node)
    bool isOurNode = node->num == nodeDB->getNodeNum();
    bool unknownHops = !node->has_hops_away && !isOurNode;

-    // Parse any non-ascii chars in the short name,
-    // and use last 4 instead if unknown / can't render
-    std::string shortName = parseShortName(node);
-
    // We will draw a left or right hand variant, to place text towards screen center
    // Hopefully avoid text spilling off screen
    // Most values are the same, regardless of left-right handedness
@@ -303,7 +299,7 @@ void InkHUD::MapApplet::drawLabeledMarker(meshtastic_NodeInfoLite *node)
        markerSize = map(node->hops_away, 0, config.lora.hop_limit, markerSizeMax, markerSizeMin);

    // Common dimensions (left or right variant)
-    textW = getTextWidth(shortName);
+    textW = getTextWidth(node->user.short_name);
    if (textW == 0)
        paddingInnerW = 0; // If no text, no padding for text
    textH = fontSmall.lineHeight();
@@ -329,7 +325,7 @@ void InkHUD::MapApplet::drawLabeledMarker(meshtastic_NodeInfoLite *node)
    drawRect(labelX, labelY, labelW, labelH, BLACK);

    // Short name
-    printAt(textX, textY, shortName, LEFT, MIDDLE);
+    printAt(textX, textY, node->user.short_name, LEFT, MIDDLE);

    // If the label is for our own node,
    // fade it by overdrawing partially with white
--- a/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Bases/NodeList/NodeListApplet.cpp
@@ -142,18 +142,16 @@ void InkHUD::NodeListApplet::onRender()
        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeNum);

        // -- Shortname --
-        // Parse special chars in the short name
-        // Use "?" if unknown
-        if (node)
-            shortName = parseShortName(node);
+        // use "?" if unknown
+        if (node && node->has_user)
+            shortName = node->user.short_name;
        else
            shortName = "?";

        // -- Longname --
-        // Parse special chars in long name
-        // Use node id if unknown
+        // use node id if unknown
        if (node && node->has_user)
-            longName = parse(node->user.long_name); // Found in nodeDB
+            longName = node->user.long_name; // Found in nodeDB
        else {
            // Not found in nodeDB, show a hex nodeid instead
            longName = hexifyNodeNum(nodeNum);
--- a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
@@ -9,12 +9,6 @@ using namespace NicheGraphics;
 void InkHUD::BasicExampleApplet::onRender()
 {
    printAt(0, 0, "Hello, World!");
-
-    // If text might contain "special characters", is needs parsing first
-    // This applies to data such as text-messages and and node names
-
-    // std::string greeting = parse("Grüezi mitenand!");
-    // printAt(0, 0, greeting);
 }

 #endif
--- a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h
@@ -5,7 +5,7 @@
 An example of an InkHUD applet.
 Tells us when a new text message arrives.

-This applet makes use of the Module API to detect new messages,
+This applet makes use of the MeshModule API to detect new messages,
 which is a general part of the Meshtastic firmware, and not part of InkHUD.

 In variants/<your device>/nicheGraphics.h:
--- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
@@ -111,10 +111,9 @@ void InkHUD::LogoApplet::onShutdown()

    // Prepare for the powered-off screen now
    // We can change these values because the initial "shutting down" screen has already rendered at this point
-    meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
    textLeft = "";
    textRight = "";
-    textTitle = parseShortName(ourNode);
+    textTitle = owner.short_name;
    fontTitle = fontLarge;

    // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -244,7 +244,6 @@ void InkHUD::MenuApplet::execute(MenuItem item)
 void InkHUD::MenuApplet::showPage(MenuPage page)
 {
    items.clear();
-    items.shrink_to_fit();

    switch (page) {
    case ROOT:
--- a/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Notification/NotificationApplet.cpp
@@ -33,6 +33,11 @@ int InkHUD::NotificationApplet::onReceiveTextMessage(const meshtastic_MeshPacket
    if (getFrom(p) == nodeDB->getNodeNum())
        return 0;

+    // Abort if message was only an "emoji reaction"
+    // Possibly some implementation of this in future?
+    if (p->decoded.emoji)
+        return 0;
+
    Notification n;
    n.timestamp = getValidTime(RTCQuality::RTCQualityDevice, true); // Current RTC time

@@ -117,7 +122,7 @@ void InkHUD::NotificationApplet::onRender()
    int16_t textM = divX + padW + (getTextWidth(text) / 2);

    // Restrict area for printing
-    // - don't overlap border, or divider
+    // - don't overlap border, or diveder
    setCrop(divX + 1, 1, (width() - (divX + 1) - 1), height() - 2);

    // Drop shadow
@@ -213,7 +218,7 @@ std::string InkHUD::NotificationApplet::getNotificationText(uint16_t widthAvaila

        // Sender id
        if (node && node->has_user)
-            text += parseShortName(node);
+            text += node->user.short_name;
        else
            text += hexifyNodeNum(message->sender);

@@ -227,7 +232,7 @@ std::string InkHUD::NotificationApplet::getNotificationText(uint16_t widthAvaila

            // Sender id
            if (node && node->has_user)
-                text += parseShortName(node);
+                text += node->user.short_name;
            else
                text += hexifyNodeNum(message->sender);

@@ -236,8 +241,7 @@ std::string InkHUD::NotificationApplet::getNotificationText(uint16_t widthAvaila
        }
    }

-    // Parse any non-ascii characters and return
-    return parse(text);
+    return text;
 }

 #endif
--- a/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Pairing/PairingApplet.cpp
@@ -23,9 +23,9 @@ void InkHUD::PairingApplet::onRender()

    // Device's bluetooth name, if it will fit
    setFont(fontSmall);
-    std::string name = "Name: " + parse(getDeviceName());
+    std::string name = "Name: " + std::string(getDeviceName());
    if (getTextWidth(name) > width()) // Too wide, try without the leading "Name: "
-        name = parse(getDeviceName());
+        name = std::string(getDeviceName());
    if (getTextWidth(name) < width()) // Does it fit?
        printAt(X(0.5), Y(0.75), name, CENTER, MIDDLE);
 }
--- a/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.cpp
@@ -27,6 +27,11 @@ int InkHUD::AllMessageApplet::onReceiveTextMessage(const meshtastic_MeshPacket *
    if (getFrom(p) == nodeDB->getNodeNum())
        return 0;

+    // Abort if message was only an "emoji reaction"
+    // Possibly some implemetation of this in future?
+    if (p->decoded.emoji)
+        return 0;
+
    requestAutoshow(); // Want to become foreground, if permitted
    requestUpdate();   // Want to update display, if applet is foreground

@@ -67,13 +72,13 @@ void InkHUD::AllMessageApplet::onRender()
    }

    // Sender's id
-    // - short name and long name, if available, or
+    // - shortname, if available, or
    // - node id
    meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(message->sender);
    if (sender && sender->has_user) {
-        header += parseShortName(sender); // May be last-four of node if unprintable (emoji, etc)
+        header += sender->user.short_name;
        header += " (";
-        header += parse(sender->user.long_name);
+        header += sender->user.long_name;
        header += ")";
    } else
        header += hexifyNodeNum(message->sender);
@@ -95,22 +100,19 @@ void InkHUD::AllMessageApplet::onRender()
    // Print message text
    // ===================

-    // Parse any non-ascii chars in the message
-    std::string text = parse(message->text);
-
    // Extra gap below the header
    int16_t textTop = headerDivY + padDivH;

    // Determine size if printed large
    setFont(fontLarge);
-    uint32_t textHeight = getWrappedTextHeight(0, width(), text);
+    uint32_t textHeight = getWrappedTextHeight(0, width(), message->text);

    // If too large, swap to small font
    if (textHeight + textTop > (uint32_t)height()) // (compare signed and unsigned)
        setFont(fontSmall);

    // Print text
-    printWrapped(0, textTop, width(), text);
+    printWrapped(0, textTop, width(), message->text);
 }

 // Don't show notifications for text messages when our applet is displayed
--- a/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/DM/DMApplet.cpp
@@ -23,6 +23,11 @@ int InkHUD::DMApplet::onReceiveTextMessage(const meshtastic_MeshPacket *p)
    if (!isActive())
        return 0;

+    // Abort if only an "emoji reactions"
+    // Possibly some implemetation of this in future?
+    if (p->decoded.emoji)
+        return 0;
+
    // If DM (not broadcast)
    if (!isBroadcast(p->to)) {
        // Want to update display, if applet is foreground
@@ -63,13 +68,13 @@ void InkHUD::DMApplet::onRender()
    }

    // Sender's id
-    // - shortname and long name, if available, or
+    // - shortname, if available, or
    // - node id
    meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(latestMessage->dm.sender);
    if (sender && sender->has_user) {
-        header += parseShortName(sender); // May be last-four of node if unprintable (emoji, etc)
+        header += sender->user.short_name;
        header += " (";
-        header += parse(sender->user.long_name);
+        header += sender->user.long_name;
        header += ")";
    } else
        header += hexifyNodeNum(latestMessage->dm.sender);
@@ -91,22 +96,19 @@ void InkHUD::DMApplet::onRender()
    // Print message text
    // ===================

-    // Parse any non-ascii chars in the message
-    std::string text = parse(latestMessage->dm.text);
-
    // Extra gap below the header
    int16_t textTop = headerDivY + padDivH;

    // Determine size if printed large
    setFont(fontLarge);
-    uint32_t textHeight = getWrappedTextHeight(0, width(), text);
+    uint32_t textHeight = getWrappedTextHeight(0, width(), latestMessage->dm.text);

    // If too large, swap to small font
    if (textHeight + textTop > (uint32_t)height()) // (compare signed and unsigned)
        setFont(fontSmall);

    // Print text
-    printWrapped(0, textTop, width(), text);
+    printWrapped(0, textTop, width(), latestMessage->dm.text);
 }

 // Don't show notifications for direct messages when our applet is displayed
--- a/src/graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.cpp
@@ -16,7 +16,7 @@ void InkHUD::HeardApplet::onActivate()

 void InkHUD::HeardApplet::onDeactivate()
 {
-    // Avoid an unlikely situation where frequent activation / deactivation populates duplicate info from node DB
+    // Avoid an unlikely situation where frquent activation / deactivation populated duplicate info from node DB
    cards.clear();
 }

@@ -41,7 +41,6 @@ void InkHUD::HeardApplet::handleParsed(CardInfo c)

    cards.push_front(c);                                  // Insert into base class' card collection
    cards.resize(min(maxCards(), (uint8_t)cards.size())); // Don't keep more cards than we could *ever* fit on screen
-    cards.shrink_to_fit();

    // Our rendered image needs to change if:
    if (previous.nodeNum != c.nodeNum                  // Different node
@@ -55,7 +54,7 @@ void InkHUD::HeardApplet::handleParsed(CardInfo c)
 }

 // When applet is activated, pre-fill with stale data from NodeDB
-// We're sorting using the last_heard value. Susceptible to weirdness if node's RTC changes.
+// We're sorting using the last_heard value. Succeptible to weirdness if node's RTC changes.
 // No SNR is available in node db, so we can't calculate signal either
 // These initial cards from node db will be gradually pushed out by new packets which originate from out base applet instead
 void InkHUD::HeardApplet::populateFromNodeDB()
@@ -73,7 +72,7 @@ void InkHUD::HeardApplet::populateFromNodeDB()
        return (top->last_heard > bottom->last_heard);
    });

-    // Keep the most recent entries only
+    // Keep the most recent entries onlyt
    // Just enough to fill the screen
    if (ordered.size() > maxCards())
        ordered.resize(maxCards());
--- a/src/graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.cpp
@@ -53,7 +53,6 @@ void InkHUD::RecentsListApplet::handleParsed(CardInfo c)

    cards.push_front(c);                                  // Store this CardInfo
    cards.resize(min(maxCards(), (uint8_t)cards.size())); // Don't keep more cards than we could *ever* fit on screen
-    cards.shrink_to_fit();

    // Record the time of this observation
    // Used to count active nodes, and to know when to prune inactive nodes
@@ -100,12 +99,10 @@ void InkHUD::RecentsListApplet::prune()
        if (!isActive(ages.at(i).seenAtMs)) {
            // Drop this item, and all others behind it
            ages.resize(i);
-            ages.shrink_to_fit();
            cards.resize(i);
-            cards.shrink_to_fit();

            // Request an update, if pruning did modify our data
-            // Required if pruning was scheduled. Redundant if pruning was prior to rendering.
+            // Required if pruning was scheduled. Redundent if pruning was prior to rendering.
            requestAutoshow();
            requestUpdate();

--- a/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.cpp
@@ -71,28 +71,27 @@ void InkHUD::ThreadedMessageApplet::onRender()
        MessageStore::Message &m = store->messages.at(i);
        bool outgoing = (m.sender == 0);
        meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(m.sender);
-        std::string bodyText = parse(m.text); // Parse any non-ascii chars in the message

        // Cache bottom Y of message text
        // - Used when drawing vertical line alongside
        const int16_t dotsB = msgB;

        // Get dimensions for message text
-        uint16_t bodyH = getWrappedTextHeight(msgL, msgW, bodyText);
+        uint16_t bodyH = getWrappedTextHeight(msgL, msgW, m.text);
        int16_t bodyT = msgB - bodyH;

        // Print message
        // - if incoming
        if (!outgoing)
-            printWrapped(msgL, bodyT, msgW, bodyText);
+            printWrapped(msgL, bodyT, msgW, m.text);

        // Print message
        // - if outgoing
        else {
-            if (getTextWidth(bodyText) < width())          // If short,
-                printAt(msgR, bodyT, bodyText, RIGHT);     // print right align
-            else                                           // If long,
-                printWrapped(msgL, bodyT, msgW, bodyText); // need printWrapped(), which doesn't support right align
+            if (getTextWidth(m.text) < width())          // If short,
+                printAt(msgR, bodyT, m.text, RIGHT);     // print right align
+            else                                         // If long,
+                printWrapped(msgL, bodyT, msgW, m.text); // need printWrapped(), which doesn't support right align
        }

        // Move cursor up
@@ -104,16 +103,12 @@ void InkHUD::ThreadedMessageApplet::onRender()
        // - shortname, if possible, or "me"
        // - time received, if possible
        std::string info;
-        if (outgoing)
+        if (sender && sender->has_user)
+            info += sender->user.short_name;
+        else if (outgoing)
            info += "Me";
-        else {
-            // Check if sender is node db
-            meshtastic_NodeInfoLite *sender = nodeDB->getMeshNode(m.sender);
-            if (sender)
-                info += parseShortName(sender); // Handle any unprintable chars in short name
-            else
-                info += hexifyNodeNum(m.sender); // No node info at all. Print the node num
-        }
+        else
+            info += hexifyNodeNum(m.sender);

        std::string timeString = getTimeString(m.timestamp);
        if (timeString.length() > 0) {
@@ -200,6 +195,11 @@ int InkHUD::ThreadedMessageApplet::onReceiveTextMessage(const meshtastic_MeshPac
    if (p->to != NODENUM_BROADCAST)
        return 0;

+    // Abort if messages was an "emoji reaction"
+    // Possibly some implemetation of this in future?
+    if (p->decoded.emoji)
+        return 0;
+
    // Extract info into our slimmed-down "StoredMessage" type
    MessageStore::Message newMessage;
    newMessage.timestamp = getValidTime(RTCQuality::RTCQualityDevice, true); // Current RTC time
--- a/src/graphics/niche/InkHUD/Events.cpp
+++ b/src/graphics/niche/InkHUD/Events.cpp
@@ -146,6 +146,11 @@ int InkHUD::Events::onReceiveTextMessage(const meshtastic_MeshPacket *packet)
    if (getFrom(packet) == nodeDB->getNodeNum())
        return 0;

+    // Short circuit: don't store "emoji reactions"
+    // Possibly some implementation of this in future?
+    if (packet->decoded.emoji)
+        return 0;
+
    // Determine whether the message is broadcast or a DM
    // Store this info to prevent confusion after a reboot
    // Avoids need to compare timestamps, because of situation where "future" messages block newly received, if time not set
--- a/src/graphics/niche/InkHUD/docs/README.md
+++ b/src/graphics/niche/InkHUD/docs/README.md
@@ -13,7 +13,7 @@ This document is intended as a reference for maintainers. A haphazard collection
  - [Non-interactive](#non-interactive)
  - [Customizable](#customizable)
  - [Event-Driven Rendering](#event-driven-rendering)
-  - [Avoid the Preprocessor](#avoid-the-preprocessor)
+  - [No `#ifdef` spaghetti](#no-ifdef-spaghetti)
 - [The Implementation](#the-implementation)
 - [The Rendering Process](#the-rendering-process)
 - [Concepts](#concepts)
@@ -23,10 +23,6 @@ This document is intended as a reference for maintainers. A haphazard collection
 - [Adding a Variant](#adding-a-variant)
  - [platformio.ini](#platformioini)
  - [nicheGraphics.h](#nichegraphicsh)
- [Fonts](#fonts)
-  - [Parsing Unicode Text](#parsing-unicode-text)
-  - [Localization](#localization)
-  - [Creating / Modifying](#creating--modifying)
 - [Class Notes](#class-notes)
  - [`InkHUD::InkHUD`](#inkhudinkhud)
  - [`InkHUD::Persistence`](#inkhudpersistence)
@@ -77,11 +73,9 @@ The user should be given the choice to decide which information they would like

 The display image does not update "automatically". Individual applets are responsible for deciding when they have new information to show, and then requesting a display update.

-### Avoid the Preprocessor
+### No `#ifdef` spaghetti

-**Don't** use preprocessor macros to write code which targets individual devices.
-
-**Do** configure InkHUD to suit each device in [`nicheGraphics.h`](#nichegraphicsh).
+**Don't** use preprocessor macros for device-specific configuration. This should be achieved with config methods, in [`nicheGraphics.h`](#nichegraphicsh).

 **Do** use preprocessor macros to guard all files

@@ -109,7 +103,7 @@ The display image does not update "automatically". Individual applets are respon

 (animated diagram)

-<img src="rendering.gif" alt="animated process diagram of InkHUD rendering" height="480" width="auto" />
+<img src="rendering.gif" alt="animated process diagram of InkHUD rendering" height="480"/>

 An overview:

@@ -287,14 +281,11 @@ ${esp32s3_base.lib_deps}

 ### nicheGraphics.h

-Should contain a `setupNicheGraphics` method, which creates and configures the various components for InkHUD.
+⚠ Wrap this file in `#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS`

-For well commented examples, see:
+`nicheGraphics.h` should be placed in the same folder as your variant's `platformio.ini`. If this is not possible, modify `build_src_filter`.

- `/variants/heltec_vision_master_e290/nicheGraphics.h` (ESP32)
- `/variants/ELECROW-ThinkNode-M1/nicheGraphics.h` (NRF52)
-
-As a general overview:
+`nicheGraphics.h` should contain a `setupNicheGraphics` method, which creates and configures the various components for InkHUD.

 - Display
  - Start SPI
@@ -310,80 +301,10 @@ As a general overview:
  - Setup `TwoButton` driver (user button, optional "auxiliary" button)
  - Connect to InkHUD handlers (use lambdas)

-## Fonts
+For well commented examples, see:

-InkHUD uses AdafruitGFX fonts. The large and small font which are shared by all applets are set in nicheGraphics.h.
-
-```cpp
-// Prepare fonts
-InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
-InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
-
-// Using a generic AdafruitGFX font instead:
-// InkHUD::Applet::fontLarge = FreeSerif9pt7b;
-```
-
-Any generic AdafruitGFX font may be used, but the fonts which are bundled with InkHUD have been customized with extended-ASCII character sets.
-
-### Parsing Unicode Text
-
-Text received by the firmware is encoded as UTF-8.
-
-Applets must manually parse any text which may contain non-ASCII characters. Strings like text-messages and node names should be parsed.
-
-```cpp
-std::string greeting = "Góðan daginn!";
-std::string parsed = parse(greeting);
-```
-
-This will re-encode the characters to match whichever extended-ASCII font InkHUD has been built with.
-
-### Localization
-
-InkHUD is bundled with extended-ASCII fonts for:
-
- Windows-1250 (Central European)
- Windows-1251 (Cyrillic)
- Windows-1252 (Western European)
-
-The default builds use Windows-1252 encoding. This can be changed in nicheGraphics.h.
-
-```cpp
-InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1250;
-InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1250;
-
-InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1251;
-InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1251;
-```
-
-### Creating / Modifying
-
-For basic conversion and editing, online tools might be sufficient:
-
- [https://rop.nl/truetype2gfx/](https://rop.nl/truetype2gfx/) - converting from ttf
- [https://tchapi.github.io/Adafruit-GFX-Font-Customiser/](https://tchapi.github.io/Adafruit-GFX-Font-Customiser/) - editing glyphs
-
-For heavy editing, this offline workflow is suggested:
-
- [FontForge](https://fontforge.org/en-US/)
-  - re-ordering glyphs
-    - Encoding > Load Encoding
-    - Encoding > Reencode
-  - .ttf to .bdf conversion
-    - Element > Bitmap Strikes Available..
-    - File > Generate Fonts
- [GFXFontEditor](https://github.com/ScottFerg56/GFXFontEditor)
-  - manual glyph correction
-  - .bdf to AdafruitGFX .h conversion
-    - File > Edit Font Properties
-    - right-click glyph list, flatten font
-    - File > Save As
-    - manually edit exported .h
-      - remove `#include <AdafruitGFX.h>`
-
-If possible, custom Extended-ASCII fonts should use one of the encodings which InkHUD already supports. If this is not possible, a mapping for the new encoding will need to be added.
-
-See [Encoding](#encoding) for details on using an extended-ASCII font.
+- `variants/heltec_vision_master_e290/nicheGraphics.h` (ESP32)
+- `variants/t-echo/nicheGraphics.h` (NRF52)

 ## Class Notes

@@ -707,30 +628,17 @@ The default AdafruitGFX text handling places characters "upon a line", as if han

 The height of this box is `AppletFont::lineHeight`, which is the height of the tallest character in the font. This gives us a fixed-height for text, which is much tighter than with AdafruitGFX's default line spacing.

-#### Encoding
+#### UTF-8 Substitutions

-An AppletFont may be constructed from a standard 7bit ASCII AdafruitGFX font, however InkHUD also supports 8bit extended-ASCII fonts.
-
-For this, the encoding must be specified when instantiating the AppletFont.
+To enable non-English text, the `AppletFont` class includes a mechanism to detect specific UTF-8 characters, and replace them with alternative glyphs from the AdafruitGFX font. This can be used to remap characters for a custom font, or to offer a suitable ASCII replacement.

 ```cpp
-InkHUD::AppletFont(FreeSans9pt_Win1250, InkHUD::AppletFont::WINDOWS_1250);
+// With a custom font
+// ї is ASCII 0xBF, in Windows-1251 encoding
+addSubstitution("ї", "\xBF");
+
+// Substitution (with a default font)
+addSubstitution("ö", "oe");
 ```

-Currently supported encodings are:
-
- ASCII
- Windows-1250 (Central European)
- Windows-1251 (Cyrillic)
- Windows-1252 (Western European)
-
-To add support for additional encodings, add to the `AppletFont::Encodings` enum, and then define the mapping from unicode in `AppletFont::applyEncoding`.
-
-#### Custom Line Height
-
-Some fonts may have a handful of especially tall characters, especially extended-ASCII fonts with diacritcs. Ideally, the font should be modified to help resolve this, but if the problem remains, manual offsets to the automatically determined line height can be specified in the constructor.
-
-```cpp
-// -2 px of padding above, +1 px of padding below
-InkHUD::AppletFont(FreeSans9pt7b, ASCII, -2, 1);
-```
+These substitutions should be performed in a variant's `setupNicheGraphics` method. For convenience, some common ASCII encodings have ready-to-go sets of substitutions you can apply, for example `AppletFont::addSubstitutionsWin1251`
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -732,7 +732,6 @@ void setup()
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::DFROBOT_RAIN, meshtastic_TelemetrySensorType_DFROBOT_RAIN);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::LTR390UV, meshtastic_TelemetrySensorType_LTR390UV);
    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::DPS310, meshtastic_TelemetrySensorType_DPS310);
-    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::PCT2075, meshtastic_TelemetrySensorType_PCT2075);

    i2cScanner.reset();
 #endif
@@ -1301,6 +1300,10 @@ void setup()
    LOG_DEBUG("Free heap  : %7d bytes", ESP.getFreeHeap());
    LOG_DEBUG("Free PSRAM : %7d bytes", ESP.getFreePsram());
 #endif
+#if !defined(ARCH_STM32WL)
+    if (accelerometerThread)
+        accelerometerThread->calibrate(30);
+#endif
 }

 #endif
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -347,7 +347,7 @@ bool Channels::anyMqttEnabled()
 {
 #if USERPREFS_EVENT_MODE && !MESHTASTIC_EXCLUDE_MQTT
    // Don't publish messages on the public MQTT broker if we are in event mode
-    if (mqtt && mqtt->isUsingDefaultServer() && mqtt->isUsingDefaultRootTopic()) {
+    if (mqtt && mqtt->isUsingDefaultServer()) {
        return false;
    }
 #endif
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -21,14 +21,11 @@
 #define default_neighbor_info_broadcast_secs 6 * 60 * 60
 #define min_node_info_broadcast_secs 60 * 60 // No regular broadcasts of more than once an hour
 #define min_neighbor_info_broadcast_secs 4 * 60 * 60
-#define default_map_publish_interval_secs 60 * 60

 #define default_mqtt_address "mqtt.meshtastic.org"
 #define default_mqtt_username "meshdev"
 #define default_mqtt_password "large4cats"
 #define default_mqtt_root "msh"
-#define default_mqtt_encryption_enabled true
-#define default_mqtt_tls_enabled false

 #define IF_ROUTER(routerVal, normalVal)                                                                                          \
    ((config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER) ? (routerVal) : (normalVal))
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -71,8 +71,6 @@ template <typename T> bool LR11x0Interface<T>::init()

    RadioLibInterface::init();

-    limitPower();
-
    if (power > LR1110_MAX_POWER) // Clamp power to maximum defined level
        power = LR1110_MAX_POWER;

@@ -82,6 +80,8 @@ template <typename T> bool LR11x0Interface<T>::init()
        preambleLength = 12; // 12 is the default for operation above 2GHz
    }

+    limitPower();
+
 #ifdef LR11X0_RF_SWITCH_SUBGHZ
    pinMode(LR11X0_RF_SWITCH_SUBGHZ, OUTPUT);
    digitalWrite(LR11X0_RF_SWITCH_SUBGHZ, getFreq() < 1e9 ? HIGH : LOW);
--- a/src/mesh/NextHopRouter.cpp
+++ b/src/mesh/NextHopRouter.cpp
@@ -165,15 +165,10 @@ bool NextHopRouter::stopRetransmission(GlobalPacketId key)
        /* Only when we already transmitted a packet via LoRa, we will cancel the packet in the Tx queue
          to avoid canceling a transmission if it was ACKed super fast via MQTT */
        if (old->numRetransmissions < NUM_RELIABLE_RETX - 1) {
-            // We only cancel it if we are the original sender or if we're not a router(_late)/repeater
-            if (isFromUs(p) || (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER &&
-                                config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER &&
-                                config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER_LATE)) {
-                // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
-                cancelSending(getFrom(p), p->id);
-                // now free the pooled copy for retransmission too
-                packetPool.release(p);
-            }
+            // remove the 'original' (identified by originator and packet->id) from the txqueue and free it
+            cancelSending(getFrom(p), p->id);
+            // now free the pooled copy for retransmission too
+            packetPool.release(p);
        }
        auto numErased = pending.erase(key);
        assert(numErased == 1);
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -328,11 +328,6 @@ NodeDB::NodeDB()
        moduleConfig.telemetry.health_update_interval = Default::getConfiguredOrMinimumValue(
            moduleConfig.telemetry.health_update_interval, min_default_telemetry_interval_secs);
    }
-    if (moduleConfig.mqtt.has_map_report_settings &&
-        moduleConfig.mqtt.map_report_settings.publish_interval_secs < default_map_publish_interval_secs) {
-        moduleConfig.mqtt.map_report_settings.publish_interval_secs = default_map_publish_interval_secs;
-    }
-
    // Ensure that the neighbor info update interval is coerced to the minimum
    moduleConfig.neighbor_info.update_interval =
        Default::getConfiguredOrMinimumValue(moduleConfig.neighbor_info.update_interval, min_neighbor_info_broadcast_secs);
@@ -589,7 +584,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
-     defined(ELECROW_PANEL)) &&                                                                                                  \
+     defined(ELECROW)) &&                                                                                                        \
    HAS_TFT
    // switch BT off by default; use TFT programming mode or hotkey to enable
    config.bluetooth.enabled = false;
@@ -694,7 +689,7 @@ void NodeDB::initConfigIntervals()

    config.display.screen_on_secs = default_screen_on_secs;

-#if defined(USE_POWERSAVE)
+#if defined(T_WATCH_S3) || defined(T_DECK) || defined(UNPHONE) || defined(MESH_TAB) || defined(RAK14014) || defined(ELECROW)
    config.power.is_power_saving = true;
    config.display.screen_on_secs = 30;
    config.power.wait_bluetooth_secs = 30;
@@ -766,39 +761,11 @@ void NodeDB::installDefaultModuleConfig()

    moduleConfig.has_canned_message = true;

-#if USERPREFS_MQTT_ENABLED && !MESHTASTIC_EXCLUDE_MQTT
-    moduleConfig.mqtt.enabled = true;
-#endif
-#ifdef USERPREFS_MQTT_ADDRESS
-    strncpy(moduleConfig.mqtt.address, USERPREFS_MQTT_ADDRESS, sizeof(moduleConfig.mqtt.address));
-#else
    strncpy(moduleConfig.mqtt.address, default_mqtt_address, sizeof(moduleConfig.mqtt.address));
-#endif
-#ifdef USERPREFS_MQTT_USERNAME
-    strncpy(moduleConfig.mqtt.username, USERPREFS_MQTT_USERNAME, sizeof(moduleConfig.mqtt.username));
-#else
    strncpy(moduleConfig.mqtt.username, default_mqtt_username, sizeof(moduleConfig.mqtt.username));
-#endif
-#ifdef USERPREFS_MQTT_PASSWORD
-    strncpy(moduleConfig.mqtt.password, USERPREFS_MQTT_PASSWORD, sizeof(moduleConfig.mqtt.password));
-#else
    strncpy(moduleConfig.mqtt.password, default_mqtt_password, sizeof(moduleConfig.mqtt.password));
-#endif
-#ifdef USERPREFS_MQTT_ROOT_TOPIC
-    strncpy(moduleConfig.mqtt.root, USERPREFS_MQTT_ROOT_TOPIC, sizeof(moduleConfig.mqtt.root));
-#else
    strncpy(moduleConfig.mqtt.root, default_mqtt_root, sizeof(moduleConfig.mqtt.root));
-#endif
-#ifdef USERPREFS_MQTT_ENCRYPTION_ENABLED
-    moduleConfig.mqtt.encryption_enabled = USERPREFS_MQTT_ENCRYPTION_ENABLED;
-#else
-    moduleConfig.mqtt.encryption_enabled = default_mqtt_encryption_enabled;
-#endif
-#ifdef USERPREFS_MQTT_TLS_ENABLED
-    moduleConfig.mqtt.tls_enabled = USERPREFS_MQTT_TLS_ENABLED;
-#else
-    moduleConfig.mqtt.tls_enabled = default_mqtt_tls_enabled;
-#endif
+    moduleConfig.mqtt.encryption_enabled = true;

    moduleConfig.has_neighbor_info = true;
    moduleConfig.neighbor_info.enabled = false;
@@ -824,19 +791,10 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
        initConfigIntervals();
        initModuleConfigIntervals();
        config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_CORE_PORTNUMS_ONLY;
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
-    } else if (role == meshtastic_Config_DeviceConfig_Role_ROUTER_LATE) {
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
    } else if (role == meshtastic_Config_DeviceConfig_Role_REPEATER) {
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
        config.display.screen_on_secs = 1;
        config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_CORE_PORTNUMS_ONLY;
    } else if (role == meshtastic_Config_DeviceConfig_Role_SENSOR) {
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
        moduleConfig.telemetry.environment_measurement_enabled = true;
        moduleConfig.telemetry.environment_update_interval = 300;
    } else if (role == meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND) {
@@ -851,12 +809,7 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
            (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_SPEED |
             meshtastic_Config_PositionConfig_PositionFlags_HEADING | meshtastic_Config_PositionConfig_PositionFlags_DOP);
        moduleConfig.telemetry.device_update_interval = ONE_DAY;
-    } else if (role == meshtastic_Config_DeviceConfig_Role_TRACKER) {
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
    } else if (role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) {
-        owner.has_is_unmessagable = true;
-        owner.is_unmessagable = true;
        config.device.node_info_broadcast_secs = ONE_DAY;
        config.position.position_broadcast_smart_enabled = true;
        config.position.position_broadcast_secs = 3 * 60; // Every 3 minutes
@@ -989,8 +942,6 @@ void NodeDB::installDefaultDeviceState()
 #endif
    snprintf(owner.id, sizeof(owner.id), "!%08x", getNodeNum()); // Default node ID now based on nodenum
    memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
-    owner.has_is_unmessagable = true;
-    owner.is_unmessagable = false;
 }

 // We reserve a few nodenums for future use
@@ -1504,28 +1455,6 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxS
    notifyObservers(true); // Force an update whether or not our node counts have changed
 }

-/**
- * Update the node database with a new contact
- */
-void NodeDB::addFromContact(meshtastic_SharedContact contact)
-{
-    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(contact.node_num);
-    if (!info) {
-        return;
-    }
-    info->num = contact.node_num;
-    info->last_heard = getValidTime(RTCQualityNTP);
-    info->has_user = true;
-    info->user = TypeConversions::ConvertToUserLite(contact.user);
-    info->is_favorite = true;
-    // Mark the node's key as manually verified to indicate trustworthiness.
-    info->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
-    updateGUIforNode = info;
-    powerFSM.trigger(EVENT_NODEDB_UPDATED);
-    notifyObservers(true); // Force an update whether or not our node counts have changed
-    saveNodeDatabaseToDisk();
-}
-
 /** Update user info and channel for this node based on received user data
 */
 bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelIndex)
@@ -1655,10 +1584,8 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
            int oldestIndex = -1;
            int oldestBoringIndex = -1;
            for (int i = 1; i < numMeshNodes; i++) {
-                // Simply the oldest non-favorite, non-ignored, non-verified node
-                if (!meshNodes->at(i).is_favorite && !meshNodes->at(i).is_ignored &&
-                    !(meshNodes->at(i).bitfield & NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK) &&
-                    meshNodes->at(i).last_heard < oldest) {
+                // Simply the oldest non-favorite node
+                if (!meshNodes->at(i).is_favorite && !meshNodes->at(i).is_ignored && meshNodes->at(i).last_heard < oldest) {
                    oldest = meshNodes->at(i).last_heard;
                    oldestIndex = i;
                }
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -110,8 +110,6 @@ class NodeDB
    /// we updateGUI and updateGUIforNode if we think our this change is big enough for a redraw
    void updateFrom(const meshtastic_MeshPacket &p);

-    void addFromContact(const meshtastic_SharedContact);
-
    /** Update position info for this node based on received position data
     */
    void updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSource src = RX_SRC_RADIO);
@@ -274,8 +272,6 @@ extern meshtastic_CriticalErrorCode error_code;
 * A numeric error address (nonzero if available)
 */
 extern uint32_t error_address;
-#define NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_SHIFT 0
-#define NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK (1 << NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_SHIFT)

 #define Module_Config_size                                                                                                       \
    (ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size +       \
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -54,13 +54,7 @@ void PhoneAPI::handleStartConfig()
    }

    // even if we were already connected - restart our state machine
-    if (config_nonce == SPECIAL_NONCE_ONLY_NODES) {
-        // If client only wants node info, jump directly to sending nodes
-        state = STATE_SEND_OWN_NODEINFO;
-        LOG_INFO("Client only wants node info, skipping other config");
-    } else {
-        state = STATE_SEND_MY_INFO;
-    }
+    state = STATE_SEND_MY_INFO;
    pauseBluetoothLogging = true;
    spiLock->lock();
    filesManifest = getFiles("/", 10);
@@ -230,12 +224,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            // Should allow us to resume sending NodeInfo in STATE_SEND_OTHER_NODEINFOS
            nodeInfoForPhone.num = 0;
        }
-        if (config_nonce == SPECIAL_NONCE_ONLY_NODES) {
-            // If client only wants node info, jump directly to sending nodes
-            state = STATE_SEND_OTHER_NODEINFOS;
-        } else {
-            state = STATE_SEND_METADATA;
-        }
+        state = STATE_SEND_METADATA;
        break;
    }

@@ -399,14 +388,8 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        config_state++;
        // Advance when we have sent all of our ModuleConfig objects
        if (config_state > (_meshtastic_AdminMessage_ModuleConfigType_MAX + 1)) {
-            // Handle special nonce behaviors:
-            // - SPECIAL_NONCE_ONLY_CONFIG: Skip node info, go directly to file manifest
-            // - SPECIAL_NONCE_ONLY_NODES: After sending nodes, skip to complete
-            if (config_nonce == SPECIAL_NONCE_ONLY_CONFIG) {
-                state = STATE_SEND_FILEMANIFEST;
-            } else {
-                state = STATE_SEND_OTHER_NODEINFOS;
-            }
+            // Clients sending special nonce don't want to see other nodeinfos
+            state = config_nonce == SPECIAL_NONCE ? STATE_SEND_FILEMANIFEST : STATE_SEND_OTHER_NODEINFOS;
            config_state = 0;
        }
        break;
@@ -432,8 +415,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    case STATE_SEND_FILEMANIFEST: {
        LOG_DEBUG("FromRadio=STATE_SEND_FILEMANIFEST");
        // last element
-        if (config_state == filesManifest.size() ||
-            config_nonce == SPECIAL_NONCE_ONLY_NODES) { // also handles an empty filesManifest
+        if (config_state == filesManifest.size()) { // also handles an empty filesManifest
            config_state = 0;
            filesManifest.clear();
            // Skip to complete packet
@@ -565,12 +547,9 @@ bool PhoneAPI::available()
            auto nextNode = nodeDB->readNextMeshNode(readIndex);
            if (nextNode) {
                nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(nextNode);
-                bool isUs = nodeInfoForPhone.num == nodeDB->getNodeNum();
-                nodeInfoForPhone.hops_away = isUs ? 0 : nodeInfoForPhone.hops_away;
-                nodeInfoForPhone.last_heard = isUs ? getValidTime(RTCQualityFromNet) : nodeInfoForPhone.last_heard;
-                nodeInfoForPhone.snr = isUs ? 0 : nodeInfoForPhone.snr;
-                nodeInfoForPhone.via_mqtt = isUs ? false : nodeInfoForPhone.via_mqtt;
-                nodeInfoForPhone.is_favorite = nodeInfoForPhone.is_favorite || isUs; // Our node is always a favorite
+                nodeInfoForPhone.hops_away = nodeInfoForPhone.num == nodeDB->getNodeNum() ? 0 : nodeInfoForPhone.hops_away;
+                nodeInfoForPhone.is_favorite =
+                    nodeInfoForPhone.is_favorite || nodeInfoForPhone.num == nodeDB->getNodeNum(); // Our node is always a favorite
            }
        }
        return true; // Always say we have something, because we might need to advance our state machine
--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -18,8 +18,7 @@
 #error "meshtastic_ToRadio_size is too large for our BLE packets"
 #endif

-#define SPECIAL_NONCE_ONLY_CONFIG 69420
-#define SPECIAL_NONCE_ONLY_NODES 69421 // ( ͡° ͜ʖ ͡°)
+#define SPECIAL_NONCE 69420

 /**
 * Provides our protobuf based API which phone/PC clients can use to talk to our device
--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -122,11 +122,11 @@ bool RF95Interface::init()
    power = dacDbValues.db;
 #endif

-    limitPower();
-
    if (power > RF95_MAX_POWER) // This chip has lower power limits than some
        power = RF95_MAX_POWER;

+    limitPower();
+
    iface = lora = new RadioLibRF95(&module);

 #ifdef RF95_TCXO
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -528,8 +528,8 @@ void RadioInterface::applyModemConfig()

    power = loraConfig.tx_power;

-    if ((power == 0) || ((power > myRegion->powerLimit) && !devicestate.owner.is_licensed))
-        power = myRegion->powerLimit;
+    if ((power == 0) || ((power + REGULATORY_GAIN_LORA > myRegion->powerLimit) && !devicestate.owner.is_licensed))
+        power = myRegion->powerLimit - REGULATORY_GAIN_LORA;

    if (power == 0)
        power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of myRegion defaults
@@ -616,12 +616,7 @@ void RadioInterface::limitPower()
        power = maxPower;
    }

-    if (TX_GAIN_LORA > 0) {
-        LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, TX_GAIN_LORA);
-        power -= TX_GAIN_LORA;
-    }
-
-    LOG_INFO("Final Tx power: %d dBm", power);
+    LOG_INFO("Set radio: final power level=%d", power);
 }

 void RadioInterface::deliverToReceiver(meshtastic_MeshPacket *p)
--- a/src/mesh/STM32WLE5JCInterface.cpp
+++ b/src/mesh/STM32WLE5JCInterface.cpp
@@ -25,11 +25,11 @@ bool STM32WLE5JCInterface::init()

    lora.setRfSwitchTable(rfswitch_pins, rfswitch_table);

-    limitPower();
-
    if (power > STM32WLx_MAX_POWER) // This chip has lower power limits than some
        power = STM32WLx_MAX_POWER;

+    limitPower();
+
    int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage);

    LOG_INFO("STM32WLx init result %d", res);
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -69,11 +69,11 @@ template <typename T> bool SX126xInterface<T>::init()

    RadioLibInterface::init();

-    limitPower();
-
    if (power > SX126X_MAX_POWER) // Clamp power to maximum defined level
        power = SX126X_MAX_POWER;

+    limitPower();
+
    int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage, useRegulatorLDO);
    // \todo Display actual typename of the adapter, not just `SX126x`
    LOG_INFO("SX126x init result %d", res);
--- a/src/mesh/SX128xInterface.cpp
+++ b/src/mesh/SX128xInterface.cpp
@@ -62,11 +62,11 @@ template <typename T> bool SX128xInterface<T>::init()

    RadioLibInterface::init();

-    limitPower();
-
    if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
        power = SX128X_MAX_POWER;

+    limitPower();
+
    preambleLength = 12; // 12 is the default for this chip, 32 does not RX at all

    int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
--- a/src/mesh/TypeConversions.cpp
+++ b/src/mesh/TypeConversions.cpp
@@ -13,7 +13,6 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
    info.via_mqtt = lite->via_mqtt;
    info.is_favorite = lite->is_favorite;
    info.is_ignored = lite->is_ignored;
-    info.is_key_manually_verified = lite->bitfield & NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;

    if (lite->has_hops_away) {
        info.has_hops_away = true;
@@ -87,8 +86,6 @@ meshtastic_UserLite TypeConversions::ConvertToUserLite(meshtastic_User user)
    memcpy(lite.macaddr, user.macaddr, sizeof(lite.macaddr));
    memcpy(lite.public_key.bytes, user.public_key.bytes, sizeof(lite.public_key.bytes));
    lite.public_key.size = user.public_key.size;
-    lite.has_is_unmessagable = user.has_is_unmessagable;
-    lite.is_unmessagable = user.is_unmessagable;
    return lite;
 }

@@ -105,8 +102,6 @@ meshtastic_User TypeConversions::ConvertToUser(uint32_t nodeNum, meshtastic_User
    memcpy(user.macaddr, lite.macaddr, sizeof(user.macaddr));
    memcpy(user.public_key.bytes, lite.public_key.bytes, sizeof(user.public_key.bytes));
    user.public_key.size = lite.public_key.size;
-    user.has_is_unmessagable = lite.has_is_unmessagable;
-    user.is_unmessagable = lite.is_unmessagable;

    return user;
 }
--- a/src/mesh/generated/meshtastic/admin.pb.cpp
+++ b/src/mesh/generated/meshtastic/admin.pb.cpp
@@ -15,14 +15,6 @@ PB_BIND(meshtastic_HamParameters, meshtastic_HamParameters, AUTO)
 PB_BIND(meshtastic_NodeRemoteHardwarePinsResponse, meshtastic_NodeRemoteHardwarePinsResponse, 2)


-PB_BIND(meshtastic_SharedContact, meshtastic_SharedContact, AUTO)
-
-
-PB_BIND(meshtastic_KeyVerificationAdmin, meshtastic_KeyVerificationAdmin, AUTO)
-
-
-
-



--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -77,19 +77,6 @@ typedef enum _meshtastic_AdminMessage_BackupLocation {
    meshtastic_AdminMessage_BackupLocation_SD = 1
 } meshtastic_AdminMessage_BackupLocation;

-/* Three stages of this request. */
-typedef enum _meshtastic_KeyVerificationAdmin_MessageType {
-    /* This is the first stage, where a client initiates */
-    meshtastic_KeyVerificationAdmin_MessageType_INITIATE_VERIFICATION = 0,
-    /* After the nonce has been returned over the mesh, the client prompts for the security number
- And uses this message to provide it to the node. */
-    meshtastic_KeyVerificationAdmin_MessageType_PROVIDE_SECURITY_NUMBER = 1,
-    /* Once the user has compared the verification message, this message notifies the node. */
-    meshtastic_KeyVerificationAdmin_MessageType_DO_VERIFY = 2,
-    /* This is the cancel path, can be taken at any point */
-    meshtastic_KeyVerificationAdmin_MessageType_DO_NOT_VERIFY = 3
-} meshtastic_KeyVerificationAdmin_MessageType;
-
 /* Struct definitions */
 /* Parameters for setting up Meshtastic for ameteur radio usage */
 typedef struct _meshtastic_HamParameters {
@@ -112,26 +99,6 @@ typedef struct _meshtastic_NodeRemoteHardwarePinsResponse {
    meshtastic_NodeRemoteHardwarePin node_remote_hardware_pins[16];
 } meshtastic_NodeRemoteHardwarePinsResponse;

-typedef struct _meshtastic_SharedContact {
-    /* The node number of the contact */
-    uint32_t node_num;
-    /* The User of the contact */
-    bool has_user;
-    meshtastic_User user;
-} meshtastic_SharedContact;
-
-/* This message is used by a client to initiate or complete a key verification */
-typedef struct _meshtastic_KeyVerificationAdmin {
-    meshtastic_KeyVerificationAdmin_MessageType message_type;
-    /* The nodenum we're requesting */
-    uint32_t remote_nodenum;
-    /* The nonce is used to track the connection */
-    uint64_t nonce;
-    /* The 4 digit code generated by the remote node, and communicated outside the mesh */
-    bool has_security_number;
-    uint32_t security_number;
-} meshtastic_KeyVerificationAdmin;
-
 typedef PB_BYTES_ARRAY_T(8) meshtastic_AdminMessage_session_passkey_t;
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
 This message is used to do settings operations to both remote AND local nodes.
@@ -235,10 +202,6 @@ typedef struct _meshtastic_AdminMessage {
        bool begin_edit_settings;
        /* Commits an open transaction for any edits made to config, module config, owner, and channel settings */
        bool commit_edit_settings;
-        /* Add a contact (User) to the nodedb */
-        meshtastic_SharedContact add_contact;
-        /* Initiate or respond to a key verification request */
-        meshtastic_KeyVerificationAdmin key_verification;
        /* Tell the node to factory reset config everything; all device state and configuration will be returned to factory defaults and BLE bonds will be cleared. */
        int32_t factory_reset_device;
        /* Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
@@ -280,10 +243,6 @@ extern "C" {
 #define _meshtastic_AdminMessage_BackupLocation_MAX meshtastic_AdminMessage_BackupLocation_SD
 #define _meshtastic_AdminMessage_BackupLocation_ARRAYSIZE ((meshtastic_AdminMessage_BackupLocation)(meshtastic_AdminMessage_BackupLocation_SD+1))

-#define _meshtastic_KeyVerificationAdmin_MessageType_MIN meshtastic_KeyVerificationAdmin_MessageType_INITIATE_VERIFICATION
-#define _meshtastic_KeyVerificationAdmin_MessageType_MAX meshtastic_KeyVerificationAdmin_MessageType_DO_NOT_VERIFY
-#define _meshtastic_KeyVerificationAdmin_MessageType_ARRAYSIZE ((meshtastic_KeyVerificationAdmin_MessageType)(meshtastic_KeyVerificationAdmin_MessageType_DO_NOT_VERIFY+1))
-
 #define meshtastic_AdminMessage_payload_variant_get_config_request_ENUMTYPE meshtastic_AdminMessage_ConfigType
 #define meshtastic_AdminMessage_payload_variant_get_module_config_request_ENUMTYPE meshtastic_AdminMessage_ModuleConfigType
 #define meshtastic_AdminMessage_payload_variant_backup_preferences_ENUMTYPE meshtastic_AdminMessage_BackupLocation
@@ -293,20 +252,13 @@ extern "C" {



-#define meshtastic_KeyVerificationAdmin_message_type_ENUMTYPE meshtastic_KeyVerificationAdmin_MessageType
-
-
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
 #define meshtastic_HamParameters_init_default    {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
-#define meshtastic_SharedContact_init_default    {0, false, meshtastic_User_init_default}
-#define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
 #define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
 #define meshtastic_HamParameters_init_zero       {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
-#define meshtastic_SharedContact_init_zero       {0, false, meshtastic_User_init_zero}
-#define meshtastic_KeyVerificationAdmin_init_zero {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_HamParameters_call_sign_tag   1
@@ -314,12 +266,6 @@ extern "C" {
 #define meshtastic_HamParameters_frequency_tag   3
 #define meshtastic_HamParameters_short_name_tag  4
 #define meshtastic_NodeRemoteHardwarePinsResponse_node_remote_hardware_pins_tag 1
-#define meshtastic_SharedContact_node_num_tag    1
-#define meshtastic_SharedContact_user_tag        2
-#define meshtastic_KeyVerificationAdmin_message_type_tag 1
-#define meshtastic_KeyVerificationAdmin_remote_nodenum_tag 2
-#define meshtastic_KeyVerificationAdmin_nonce_tag 3
-#define meshtastic_KeyVerificationAdmin_security_number_tag 4
 #define meshtastic_AdminMessage_get_channel_request_tag 1
 #define meshtastic_AdminMessage_get_channel_response_tag 2
 #define meshtastic_AdminMessage_get_owner_request_tag 3
@@ -364,8 +310,6 @@ extern "C" {
 #define meshtastic_AdminMessage_remove_ignored_node_tag 48
 #define meshtastic_AdminMessage_begin_edit_settings_tag 64
 #define meshtastic_AdminMessage_commit_edit_settings_tag 65
-#define meshtastic_AdminMessage_add_contact_tag  66
-#define meshtastic_AdminMessage_key_verification_tag 67
 #define meshtastic_AdminMessage_factory_reset_device_tag 94
 #define meshtastic_AdminMessage_reboot_ota_seconds_tag 95
 #define meshtastic_AdminMessage_exit_simulator_tag 96
@@ -421,8 +365,6 @@ X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,set_ignored_node,set_ignored
 X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,remove_ignored_node,remove_ignored_node),  48) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,begin_edit_settings,begin_edit_settings),  64) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,commit_edit_settings,commit_edit_settings),  65) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,add_contact,add_contact),  66) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,key_verification,key_verification),  67) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_device,factory_reset_device),  94) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_ota_seconds,reboot_ota_seconds),  95) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,exit_simulator,exit_simulator),  96) \
@@ -448,8 +390,6 @@ X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101)
 #define meshtastic_AdminMessage_payload_variant_set_fixed_position_MSGTYPE meshtastic_Position
 #define meshtastic_AdminMessage_payload_variant_get_ui_config_response_MSGTYPE meshtastic_DeviceUIConfig
 #define meshtastic_AdminMessage_payload_variant_store_ui_config_MSGTYPE meshtastic_DeviceUIConfig
-#define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
-#define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin

 #define meshtastic_HamParameters_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   call_sign,         1) \
@@ -465,41 +405,20 @@ X(a, STATIC,   REPEATED, MESSAGE,  node_remote_hardware_pins,   1)
 #define meshtastic_NodeRemoteHardwarePinsResponse_DEFAULT NULL
 #define meshtastic_NodeRemoteHardwarePinsResponse_node_remote_hardware_pins_MSGTYPE meshtastic_NodeRemoteHardwarePin

-#define meshtastic_SharedContact_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   node_num,          1) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  user,              2)
-#define meshtastic_SharedContact_CALLBACK NULL
-#define meshtastic_SharedContact_DEFAULT NULL
-#define meshtastic_SharedContact_user_MSGTYPE meshtastic_User
-
-#define meshtastic_KeyVerificationAdmin_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    message_type,      1) \
-X(a, STATIC,   SINGULAR, UINT32,   remote_nodenum,    2) \
-X(a, STATIC,   SINGULAR, UINT64,   nonce,             3) \
-X(a, STATIC,   OPTIONAL, UINT32,   security_number,   4)
-#define meshtastic_KeyVerificationAdmin_CALLBACK NULL
-#define meshtastic_KeyVerificationAdmin_DEFAULT NULL
-
 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_HamParameters_msg;
 extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
-extern const pb_msgdesc_t meshtastic_SharedContact_msg;
-extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
 #define meshtastic_HamParameters_fields &meshtastic_HamParameters_msg
 #define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
-#define meshtastic_SharedContact_fields &meshtastic_SharedContact_msg
-#define meshtastic_KeyVerificationAdmin_fields &meshtastic_KeyVerificationAdmin_msg

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
 #define meshtastic_AdminMessage_size             511
 #define meshtastic_HamParameters_size            31
-#define meshtastic_KeyVerificationAdmin_size     25
 #define meshtastic_NodeRemoteHardwarePinsResponse_size 496
-#define meshtastic_SharedContact_size            123

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -441,8 +441,6 @@ typedef struct _meshtastic_Config_NetworkConfig {
    char rsyslog_server[33];
    /* Flags for enabling/disabling network protocols */
    uint32_t enabled_protocols;
-    /* Enable/Disable ipv6 support */
-    bool ipv6_enabled;
 } meshtastic_Config_NetworkConfig;

 /* Display Config */
@@ -695,7 +693,7 @@ extern "C" {
 #define meshtastic_Config_DeviceConfig_init_default {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0, "", 0}
 #define meshtastic_Config_PositionConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _meshtastic_Config_PositionConfig_GpsMode_MIN}
 #define meshtastic_Config_PowerConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, "", 0, 0}
+#define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, "", 0}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
 #define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0}
 #define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
@@ -706,7 +704,7 @@ extern "C" {
 #define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0, "", 0}
 #define meshtastic_Config_PositionConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _meshtastic_Config_PositionConfig_GpsMode_MIN}
 #define meshtastic_Config_PowerConfig_init_zero  {0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, "", 0, 0}
+#define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, "", 0}
 #define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
 #define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN, 0}
 #define meshtastic_Config_LoRaConfig_init_zero   {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
@@ -761,7 +759,6 @@ extern "C" {
 #define meshtastic_Config_NetworkConfig_ipv4_config_tag 8
 #define meshtastic_Config_NetworkConfig_rsyslog_server_tag 9
 #define meshtastic_Config_NetworkConfig_enabled_protocols_tag 10
-#define meshtastic_Config_NetworkConfig_ipv6_enabled_tag 11
 #define meshtastic_Config_DisplayConfig_screen_on_secs_tag 1
 #define meshtastic_Config_DisplayConfig_gps_format_tag 2
 #define meshtastic_Config_DisplayConfig_auto_screen_carousel_secs_tag 3
@@ -892,8 +889,7 @@ X(a, STATIC,   SINGULAR, BOOL,     eth_enabled,       6) \
 X(a, STATIC,   SINGULAR, UENUM,    address_mode,      7) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  ipv4_config,       8) \
 X(a, STATIC,   SINGULAR, STRING,   rsyslog_server,    9) \
-X(a, STATIC,   SINGULAR, UINT32,   enabled_protocols,  10) \
-X(a, STATIC,   SINGULAR, BOOL,     ipv6_enabled,     11)
+X(a, STATIC,   SINGULAR, UINT32,   enabled_protocols,  10)
 #define meshtastic_Config_NetworkConfig_CALLBACK NULL
 #define meshtastic_Config_NetworkConfig_DEFAULT NULL
 #define meshtastic_Config_NetworkConfig_ipv4_config_MSGTYPE meshtastic_Config_NetworkConfig_IpV4Config
@@ -999,12 +995,12 @@ extern const pb_msgdesc_t meshtastic_Config_SessionkeyConfig_msg;
 #define meshtastic_Config_DisplayConfig_size     32
 #define meshtastic_Config_LoRaConfig_size        85
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20
-#define meshtastic_Config_NetworkConfig_size     204
+#define meshtastic_Config_NetworkConfig_size     202
 #define meshtastic_Config_PositionConfig_size    62
 #define meshtastic_Config_PowerConfig_size       52
 #define meshtastic_Config_SecurityConfig_size    178
 #define meshtastic_Config_SessionkeyConfig_size  0
-#define meshtastic_Config_size                   207
+#define meshtastic_Config_size                   205

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -58,9 +58,6 @@ typedef struct _meshtastic_UserLite {
    /* The public key of the user's device.
 This is sent out to other nodes on the mesh to allow them to compute a shared secret key. */
    meshtastic_UserLite_public_key_t public_key;
-    /* Whether or not the node can be messaged */
-    bool has_is_unmessagable;
-    bool is_unmessagable;
 } meshtastic_UserLite;

 typedef struct _meshtastic_NodeInfoLite {
@@ -96,9 +93,6 @@ typedef struct _meshtastic_NodeInfoLite {
    bool is_ignored;
    /* Last byte of the node number of the node that should be used as the next hop to reach this node. */
    uint8_t next_hop;
-    /* Bitfield for storing booleans.
- LSB 0 is_key_manually_verified */
-    uint32_t bitfield;
 } meshtastic_NodeInfoLite;

 /* This message is never sent over the wire, but it is used for serializing DB
@@ -189,15 +183,15 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_PositionLite_init_default     {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
-#define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}, false, 0}
-#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0, 0}
+#define meshtastic_UserLite_init_default         {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
+#define meshtastic_NodeInfoLite_init_default     {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0}
 #define meshtastic_DeviceState_init_default      {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_NodeDatabase_init_default     {0, {0}}
 #define meshtastic_ChannelFile_init_default      {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
 #define meshtastic_BackupPreferences_init_default {0, 0, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default, false, meshtastic_ChannelFile_init_default, false, meshtastic_User_init_default}
 #define meshtastic_PositionLite_init_zero        {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
-#define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}, false, 0}
-#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0, 0}
+#define meshtastic_UserLite_init_zero            {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
+#define meshtastic_NodeInfoLite_init_zero        {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0}
 #define meshtastic_DeviceState_init_zero         {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 #define meshtastic_NodeDatabase_init_zero        {0, {0}}
 #define meshtastic_ChannelFile_init_zero         {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
@@ -216,7 +210,6 @@ extern "C" {
 #define meshtastic_UserLite_is_licensed_tag      5
 #define meshtastic_UserLite_role_tag             6
 #define meshtastic_UserLite_public_key_tag       7
-#define meshtastic_UserLite_is_unmessagable_tag  9
 #define meshtastic_NodeInfoLite_num_tag          1
 #define meshtastic_NodeInfoLite_user_tag         2
 #define meshtastic_NodeInfoLite_position_tag     3
@@ -229,7 +222,6 @@ extern "C" {
 #define meshtastic_NodeInfoLite_is_favorite_tag  10
 #define meshtastic_NodeInfoLite_is_ignored_tag   11
 #define meshtastic_NodeInfoLite_next_hop_tag     12
-#define meshtastic_NodeInfoLite_bitfield_tag     13
 #define meshtastic_DeviceState_my_node_tag       2
 #define meshtastic_DeviceState_owner_tag         3
 #define meshtastic_DeviceState_receive_queue_tag 5
@@ -267,8 +259,7 @@ X(a, STATIC,   SINGULAR, STRING,   short_name,        3) \
 X(a, STATIC,   SINGULAR, UENUM,    hw_model,          4) \
 X(a, STATIC,   SINGULAR, BOOL,     is_licensed,       5) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              6) \
-X(a, STATIC,   SINGULAR, BYTES,    public_key,        7) \
-X(a, STATIC,   OPTIONAL, BOOL,     is_unmessagable,   9)
+X(a, STATIC,   SINGULAR, BYTES,    public_key,        7)
 #define meshtastic_UserLite_CALLBACK NULL
 #define meshtastic_UserLite_DEFAULT NULL

@@ -284,8 +275,7 @@ X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,          8) \
 X(a, STATIC,   OPTIONAL, UINT32,   hops_away,         9) \
 X(a, STATIC,   SINGULAR, BOOL,     is_favorite,      10) \
 X(a, STATIC,   SINGULAR, BOOL,     is_ignored,       11) \
-X(a, STATIC,   SINGULAR, UINT32,   next_hop,         12) \
-X(a, STATIC,   SINGULAR, UINT32,   bitfield,         13)
+X(a, STATIC,   SINGULAR, UINT32,   next_hop,         12)
 #define meshtastic_NodeInfoLite_CALLBACK NULL
 #define meshtastic_NodeInfoLite_DEFAULT NULL
 #define meshtastic_NodeInfoLite_user_MSGTYPE meshtastic_UserLite
@@ -360,12 +350,12 @@ extern const pb_msgdesc_t meshtastic_BackupPreferences_msg;
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_NodeDatabase_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_BackupPreferences_size
-#define meshtastic_BackupPreferences_size        2269
+#define meshtastic_BackupPreferences_size        2263
 #define meshtastic_ChannelFile_size              718
-#define meshtastic_DeviceState_size              1722
-#define meshtastic_NodeInfoLite_size             196
+#define meshtastic_DeviceState_size              1720
+#define meshtastic_NodeInfoLite_size             188
 #define meshtastic_PositionLite_size             28
-#define meshtastic_UserLite_size                 98
+#define meshtastic_UserLite_size                 96

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -187,8 +187,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;

 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalConfig_size
-#define meshtastic_LocalConfig_size              745
-#define meshtastic_LocalModuleConfig_size        669
+#define meshtastic_LocalConfig_size              743
+#define meshtastic_LocalModuleConfig_size        667

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/mesh.pb.cpp
+++ b/src/mesh/generated/meshtastic/mesh.pb.cpp
@@ -21,9 +21,6 @@ PB_BIND(meshtastic_Routing, meshtastic_Routing, AUTO)
 PB_BIND(meshtastic_Data, meshtastic_Data, 2)


-PB_BIND(meshtastic_KeyVerification, meshtastic_KeyVerification, AUTO)
-
-
 PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO)


@@ -51,15 +48,6 @@ PB_BIND(meshtastic_FromRadio, meshtastic_FromRadio, 2)
 PB_BIND(meshtastic_ClientNotification, meshtastic_ClientNotification, 2)


-PB_BIND(meshtastic_KeyVerificationNumberInform, meshtastic_KeyVerificationNumberInform, AUTO)
-
-
-PB_BIND(meshtastic_KeyVerificationNumberRequest, meshtastic_KeyVerificationNumberRequest, AUTO)
-
-
-PB_BIND(meshtastic_KeyVerificationFinal, meshtastic_KeyVerificationFinal, AUTO)
-
-
 PB_BIND(meshtastic_FileInfo, meshtastic_FileInfo, AUTO)


--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -247,17 +247,6 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO = 96,
    /* Elecrow CrowPanel Advance models, ESP32-S3 and TFT with SX1262 radio plugin */
    meshtastic_HardwareModel_CROWPANEL = 97,
-    /* *
- Lilygo LINK32 board with sensors */
-    meshtastic_HardwareModel_LINK_32 = 98,
-    /* *
- Seeed Tracker L1 */
-    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
-    /* *
- Seeed Tracker L1 EINK driver */
-    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
-    /* Reserved ID for future and past use */
-    meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -620,9 +609,6 @@ typedef struct _meshtastic_User {
    /* The public key of the user's device.
 This is sent out to other nodes on the mesh to allow them to compute a shared secret key. */
    meshtastic_User_public_key_t public_key;
-    /* Whether or not the node can be messaged */
-    bool has_is_unmessagable;
-    bool is_unmessagable;
 } meshtastic_User;

 /* A message used in a traceroute */
@@ -691,19 +677,6 @@ typedef struct _meshtastic_Data {
    uint8_t bitfield;
 } meshtastic_Data;

-typedef PB_BYTES_ARRAY_T(32) meshtastic_KeyVerification_hash1_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_KeyVerification_hash2_t;
-/* The actual over-the-mesh message doing KeyVerification */
-typedef struct _meshtastic_KeyVerification {
-    /* random value Selected by the requesting node */
-    uint64_t nonce;
-    /* The final authoritative hash, only to be sent by NodeA at the end of the handshake */
-    meshtastic_KeyVerification_hash1_t hash1;
-    /* The intermediary hash (actually derived from hash1),
- sent from NodeB to NodeA in response to the initial message. */
-    meshtastic_KeyVerification_hash2_t hash2;
-} meshtastic_KeyVerification;
-
 /* Waypoint message, used to share arbitrary locations across the mesh */
 typedef struct _meshtastic_Waypoint {
    /* Id of the waypoint */
@@ -878,10 +851,6 @@ typedef struct _meshtastic_NodeInfo {
    /* True if node is in our ignored list
 Persists between NodeDB internal clean ups */
    bool is_ignored;
-    /* True if node public key has been verified.
- Persists between NodeDB internal clean ups
- LSB 0 of the bitfield */
-    bool is_key_manually_verified;
 } meshtastic_NodeInfo;

 typedef PB_BYTES_ARRAY_T(16) meshtastic_MyNodeInfo_device_id_t;
@@ -931,24 +900,6 @@ typedef struct _meshtastic_QueueStatus {
    uint32_t mesh_packet_id;
 } meshtastic_QueueStatus;

-typedef struct _meshtastic_KeyVerificationNumberInform {
-    uint64_t nonce;
-    char remote_longname[40];
-    uint32_t security_number;
-} meshtastic_KeyVerificationNumberInform;
-
-typedef struct _meshtastic_KeyVerificationNumberRequest {
-    uint64_t nonce;
-    char remote_longname[40];
-} meshtastic_KeyVerificationNumberRequest;
-
-typedef struct _meshtastic_KeyVerificationFinal {
-    uint64_t nonce;
-    char remote_longname[40];
-    bool isSender;
-    char verification_characters[10];
-} meshtastic_KeyVerificationFinal;
-
 /* A notification message from the device to the client
 To be used for important messages that should to be displayed to the user
 in the form of push notifications or validation messages when saving
@@ -963,12 +914,6 @@ typedef struct _meshtastic_ClientNotification {
    meshtastic_LogRecord_Level level;
    /* The message body of the notification */
    char message[400];
-    pb_size_t which_payload_variant;
-    union {
-        meshtastic_KeyVerificationNumberInform key_verification_number_inform;
-        meshtastic_KeyVerificationNumberRequest key_verification_number_request;
-        meshtastic_KeyVerificationFinal key_verification_final;
-    } payload_variant;
 } meshtastic_ClientNotification;

 /* Individual File info for the device */
@@ -1231,7 +1176,6 @@ extern "C" {



-
 #define meshtastic_MeshPacket_priority_ENUMTYPE meshtastic_MeshPacket_Priority
 #define meshtastic_MeshPacket_delayed_ENUMTYPE meshtastic_MeshPacket_Delayed

@@ -1245,9 +1189,6 @@ extern "C" {



-
-
-
 #define meshtastic_Compressed_portnum_ENUMTYPE meshtastic_PortNum


@@ -1263,23 +1204,19 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_Position_init_default         {false, 0, false, 0, false, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, false, 0, false, 0, 0, 0, 0, 0, false, 0, false, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_User_init_default             {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}, false, 0}
+#define meshtastic_User_init_default             {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_RouteDiscovery_init_default   {0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define meshtastic_Routing_init_default          {0, {meshtastic_RouteDiscovery_init_default}}
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
-#define meshtastic_KeyVerification_init_default  {0, {0, {0}}, {0, {0}}}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0}
-#define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_default       {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_default      {0, 0, 0, 0}
 #define meshtastic_FromRadio_init_default        {0, 0, {meshtastic_MeshPacket_init_default}}
-#define meshtastic_ClientNotification_init_default {false, 0, 0, _meshtastic_LogRecord_Level_MIN, "", 0, {meshtastic_KeyVerificationNumberInform_init_default}}
-#define meshtastic_KeyVerificationNumberInform_init_default {0, "", 0}
-#define meshtastic_KeyVerificationNumberRequest_init_default {0, ""}
-#define meshtastic_KeyVerificationFinal_init_default {0, "", 0, ""}
+#define meshtastic_ClientNotification_init_default {false, 0, 0, _meshtastic_LogRecord_Level_MIN, ""}
 #define meshtastic_FileInfo_init_default         {"", 0}
 #define meshtastic_ToRadio_init_default          {0, {meshtastic_MeshPacket_init_default}}
 #define meshtastic_Compressed_init_default       {_meshtastic_PortNum_MIN, {0, {0}}}
@@ -1292,23 +1229,19 @@ extern "C" {
 #define meshtastic_resend_chunks_init_default    {{{NULL}, NULL}}
 #define meshtastic_ChunkedPayloadResponse_init_default {0, 0, {0}}
 #define meshtastic_Position_init_zero            {false, 0, false, 0, false, 0, 0, _meshtastic_Position_LocSource_MIN, _meshtastic_Position_AltSource_MIN, 0, 0, false, 0, false, 0, 0, 0, 0, 0, false, 0, false, 0, 0, 0, 0, 0, 0, 0, 0}
-#define meshtastic_User_init_zero                {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}, false, 0}
+#define meshtastic_User_init_zero                {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
 #define meshtastic_RouteDiscovery_init_zero      {0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define meshtastic_Routing_init_zero             {0, {meshtastic_RouteDiscovery_init_zero}}
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
-#define meshtastic_KeyVerification_init_zero     {0, {0, {0}}, {0, {0}}}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0}
-#define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_zero          {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_zero         {0, 0, 0, 0}
 #define meshtastic_FromRadio_init_zero           {0, 0, {meshtastic_MeshPacket_init_zero}}
-#define meshtastic_ClientNotification_init_zero  {false, 0, 0, _meshtastic_LogRecord_Level_MIN, "", 0, {meshtastic_KeyVerificationNumberInform_init_zero}}
-#define meshtastic_KeyVerificationNumberInform_init_zero {0, "", 0}
-#define meshtastic_KeyVerificationNumberRequest_init_zero {0, ""}
-#define meshtastic_KeyVerificationFinal_init_zero {0, "", 0, ""}
+#define meshtastic_ClientNotification_init_zero  {false, 0, 0, _meshtastic_LogRecord_Level_MIN, ""}
 #define meshtastic_FileInfo_init_zero            {"", 0}
 #define meshtastic_ToRadio_init_zero             {0, {meshtastic_MeshPacket_init_zero}}
 #define meshtastic_Compressed_init_zero          {_meshtastic_PortNum_MIN, {0, {0}}}
@@ -1353,7 +1286,6 @@ extern "C" {
 #define meshtastic_User_is_licensed_tag          6
 #define meshtastic_User_role_tag                 7
 #define meshtastic_User_public_key_tag           8
-#define meshtastic_User_is_unmessagable_tag      9
 #define meshtastic_RouteDiscovery_route_tag      1
 #define meshtastic_RouteDiscovery_snr_towards_tag 2
 #define meshtastic_RouteDiscovery_route_back_tag 3
@@ -1370,9 +1302,6 @@ extern "C" {
 #define meshtastic_Data_reply_id_tag             7
 #define meshtastic_Data_emoji_tag                8
 #define meshtastic_Data_bitfield_tag             9
-#define meshtastic_KeyVerification_nonce_tag     1
-#define meshtastic_KeyVerification_hash1_tag     2
-#define meshtastic_KeyVerification_hash2_tag     3
 #define meshtastic_Waypoint_id_tag               1
 #define meshtastic_Waypoint_latitude_i_tag       2
 #define meshtastic_Waypoint_longitude_i_tag      3
@@ -1416,7 +1345,6 @@ extern "C" {
 #define meshtastic_NodeInfo_hops_away_tag        9
 #define meshtastic_NodeInfo_is_favorite_tag      10
 #define meshtastic_NodeInfo_is_ignored_tag       11
-#define meshtastic_NodeInfo_is_key_manually_verified_tag 12
 #define meshtastic_MyNodeInfo_my_node_num_tag    1
 #define meshtastic_MyNodeInfo_reboot_count_tag   8
 #define meshtastic_MyNodeInfo_min_app_version_tag 11
@@ -1430,22 +1358,10 @@ extern "C" {
 #define meshtastic_QueueStatus_free_tag          2
 #define meshtastic_QueueStatus_maxlen_tag        3
 #define meshtastic_QueueStatus_mesh_packet_id_tag 4
-#define meshtastic_KeyVerificationNumberInform_nonce_tag 1
-#define meshtastic_KeyVerificationNumberInform_remote_longname_tag 2
-#define meshtastic_KeyVerificationNumberInform_security_number_tag 3
-#define meshtastic_KeyVerificationNumberRequest_nonce_tag 1
-#define meshtastic_KeyVerificationNumberRequest_remote_longname_tag 2
-#define meshtastic_KeyVerificationFinal_nonce_tag 1
-#define meshtastic_KeyVerificationFinal_remote_longname_tag 2
-#define meshtastic_KeyVerificationFinal_isSender_tag 3
-#define meshtastic_KeyVerificationFinal_verification_characters_tag 4
 #define meshtastic_ClientNotification_reply_id_tag 1
 #define meshtastic_ClientNotification_time_tag   2
 #define meshtastic_ClientNotification_level_tag  3
 #define meshtastic_ClientNotification_message_tag 4
-#define meshtastic_ClientNotification_key_verification_number_inform_tag 11
-#define meshtastic_ClientNotification_key_verification_number_request_tag 12
-#define meshtastic_ClientNotification_key_verification_final_tag 13
 #define meshtastic_FileInfo_file_name_tag        1
 #define meshtastic_FileInfo_size_bytes_tag       2
 #define meshtastic_Compressed_portnum_tag        1
@@ -1541,8 +1457,7 @@ X(a, STATIC,   SINGULAR, FIXED_LENGTH_BYTES, macaddr,           4) \
 X(a, STATIC,   SINGULAR, UENUM,    hw_model,          5) \
 X(a, STATIC,   SINGULAR, BOOL,     is_licensed,       6) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              7) \
-X(a, STATIC,   SINGULAR, BYTES,    public_key,        8) \
-X(a, STATIC,   OPTIONAL, BOOL,     is_unmessagable,   9)
+X(a, STATIC,   SINGULAR, BYTES,    public_key,        8)
 #define meshtastic_User_CALLBACK NULL
 #define meshtastic_User_DEFAULT NULL

@@ -1576,13 +1491,6 @@ X(a, STATIC,   OPTIONAL, UINT32,   bitfield,          9)
 #define meshtastic_Data_CALLBACK NULL
 #define meshtastic_Data_DEFAULT NULL

-#define meshtastic_KeyVerification_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT64,   nonce,             1) \
-X(a, STATIC,   SINGULAR, BYTES,    hash1,             2) \
-X(a, STATIC,   SINGULAR, BYTES,    hash2,             3)
-#define meshtastic_KeyVerification_CALLBACK NULL
-#define meshtastic_KeyVerification_DEFAULT NULL
-
 #define meshtastic_Waypoint_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   OPTIONAL, SFIXED32, latitude_i,        2) \
@@ -1639,8 +1547,7 @@ X(a, STATIC,   SINGULAR, UINT32,   channel,           7) \
 X(a, STATIC,   SINGULAR, BOOL,     via_mqtt,          8) \
 X(a, STATIC,   OPTIONAL, UINT32,   hops_away,         9) \
 X(a, STATIC,   SINGULAR, BOOL,     is_favorite,      10) \
-X(a, STATIC,   SINGULAR, BOOL,     is_ignored,       11) \
-X(a, STATIC,   SINGULAR, BOOL,     is_key_manually_verified,  12)
+X(a, STATIC,   SINGULAR, BOOL,     is_ignored,       11)
 #define meshtastic_NodeInfo_CALLBACK NULL
 #define meshtastic_NodeInfo_DEFAULT NULL
 #define meshtastic_NodeInfo_user_MSGTYPE meshtastic_User
@@ -1711,36 +1618,9 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,deviceuiConfig,deviceuiConfi
 X(a, STATIC,   OPTIONAL, UINT32,   reply_id,          1) \
 X(a, STATIC,   SINGULAR, FIXED32,  time,              2) \
 X(a, STATIC,   SINGULAR, UENUM,    level,             3) \
-X(a, STATIC,   SINGULAR, STRING,   message,           4) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,key_verification_number_inform,payload_variant.key_verification_number_inform),  11) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,key_verification_number_request,payload_variant.key_verification_number_request),  12) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,key_verification_final,payload_variant.key_verification_final),  13)
+X(a, STATIC,   SINGULAR, STRING,   message,           4)
 #define meshtastic_ClientNotification_CALLBACK NULL
 #define meshtastic_ClientNotification_DEFAULT NULL
-#define meshtastic_ClientNotification_payload_variant_key_verification_number_inform_MSGTYPE meshtastic_KeyVerificationNumberInform
-#define meshtastic_ClientNotification_payload_variant_key_verification_number_request_MSGTYPE meshtastic_KeyVerificationNumberRequest
-#define meshtastic_ClientNotification_payload_variant_key_verification_final_MSGTYPE meshtastic_KeyVerificationFinal
-
-#define meshtastic_KeyVerificationNumberInform_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT64,   nonce,             1) \
-X(a, STATIC,   SINGULAR, STRING,   remote_longname,   2) \
-X(a, STATIC,   SINGULAR, UINT32,   security_number,   3)
-#define meshtastic_KeyVerificationNumberInform_CALLBACK NULL
-#define meshtastic_KeyVerificationNumberInform_DEFAULT NULL
-
-#define meshtastic_KeyVerificationNumberRequest_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT64,   nonce,             1) \
-X(a, STATIC,   SINGULAR, STRING,   remote_longname,   2)
-#define meshtastic_KeyVerificationNumberRequest_CALLBACK NULL
-#define meshtastic_KeyVerificationNumberRequest_DEFAULT NULL
-
-#define meshtastic_KeyVerificationFinal_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT64,   nonce,             1) \
-X(a, STATIC,   SINGULAR, STRING,   remote_longname,   2) \
-X(a, STATIC,   SINGULAR, BOOL,     isSender,          3) \
-X(a, STATIC,   SINGULAR, STRING,   verification_characters,   4)
-#define meshtastic_KeyVerificationFinal_CALLBACK NULL
-#define meshtastic_KeyVerificationFinal_DEFAULT NULL

 #define meshtastic_FileInfo_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   file_name,         1) \
@@ -1840,7 +1720,6 @@ extern const pb_msgdesc_t meshtastic_User_msg;
 extern const pb_msgdesc_t meshtastic_RouteDiscovery_msg;
 extern const pb_msgdesc_t meshtastic_Routing_msg;
 extern const pb_msgdesc_t meshtastic_Data_msg;
-extern const pb_msgdesc_t meshtastic_KeyVerification_msg;
 extern const pb_msgdesc_t meshtastic_Waypoint_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
 extern const pb_msgdesc_t meshtastic_MeshPacket_msg;
@@ -1850,9 +1729,6 @@ extern const pb_msgdesc_t meshtastic_LogRecord_msg;
 extern const pb_msgdesc_t meshtastic_QueueStatus_msg;
 extern const pb_msgdesc_t meshtastic_FromRadio_msg;
 extern const pb_msgdesc_t meshtastic_ClientNotification_msg;
-extern const pb_msgdesc_t meshtastic_KeyVerificationNumberInform_msg;
-extern const pb_msgdesc_t meshtastic_KeyVerificationNumberRequest_msg;
-extern const pb_msgdesc_t meshtastic_KeyVerificationFinal_msg;
 extern const pb_msgdesc_t meshtastic_FileInfo_msg;
 extern const pb_msgdesc_t meshtastic_ToRadio_msg;
 extern const pb_msgdesc_t meshtastic_Compressed_msg;
@@ -1871,7 +1747,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_RouteDiscovery_fields &meshtastic_RouteDiscovery_msg
 #define meshtastic_Routing_fields &meshtastic_Routing_msg
 #define meshtastic_Data_fields &meshtastic_Data_msg
-#define meshtastic_KeyVerification_fields &meshtastic_KeyVerification_msg
 #define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
 #define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg
@@ -1881,9 +1756,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_QueueStatus_fields &meshtastic_QueueStatus_msg
 #define meshtastic_FromRadio_fields &meshtastic_FromRadio_msg
 #define meshtastic_ClientNotification_fields &meshtastic_ClientNotification_msg
-#define meshtastic_KeyVerificationNumberInform_fields &meshtastic_KeyVerificationNumberInform_msg
-#define meshtastic_KeyVerificationNumberRequest_fields &meshtastic_KeyVerificationNumberRequest_msg
-#define meshtastic_KeyVerificationFinal_fields &meshtastic_KeyVerificationFinal_msg
 #define meshtastic_FileInfo_fields &meshtastic_FileInfo_msg
 #define meshtastic_ToRadio_fields &meshtastic_ToRadio_msg
 #define meshtastic_Compressed_fields &meshtastic_Compressed_msg
@@ -1901,31 +1773,27 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 /* meshtastic_ChunkedPayloadResponse_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_MESH_PB_H_MAX_SIZE meshtastic_FromRadio_size
 #define meshtastic_ChunkedPayload_size           245
-#define meshtastic_ClientNotification_size       482
+#define meshtastic_ClientNotification_size       415
 #define meshtastic_Compressed_size               239
 #define meshtastic_Data_size                     269
 #define meshtastic_DeviceMetadata_size           54
 #define meshtastic_FileInfo_size                 236
 #define meshtastic_FromRadio_size                510
 #define meshtastic_Heartbeat_size                0
-#define meshtastic_KeyVerificationFinal_size     65
-#define meshtastic_KeyVerificationNumberInform_size 58
-#define meshtastic_KeyVerificationNumberRequest_size 52
-#define meshtastic_KeyVerification_size          79
 #define meshtastic_LogRecord_size                426
 #define meshtastic_MeshPacket_size               378
 #define meshtastic_MqttClientProxyMessage_size   501
 #define meshtastic_MyNodeInfo_size               77
 #define meshtastic_NeighborInfo_size             258
 #define meshtastic_Neighbor_size                 22
-#define meshtastic_NodeInfo_size                 323
+#define meshtastic_NodeInfo_size                 319
 #define meshtastic_NodeRemoteHardwarePin_size    29
 #define meshtastic_Position_size                 144
 #define meshtastic_QueueStatus_size              23
 #define meshtastic_RouteDiscovery_size           256
 #define meshtastic_Routing_size                  259
 #define meshtastic_ToRadio_size                  504
-#define meshtastic_User_size                     115
+#define meshtastic_User_size                     113
 #define meshtastic_Waypoint_size                 165

 #ifdef __cplusplus
--- a/src/mesh/generated/meshtastic/module_config.pb.h
+++ b/src/mesh/generated/meshtastic/module_config.pb.h
@@ -112,8 +112,6 @@ typedef struct _meshtastic_ModuleConfig_MapReportSettings {
    uint32_t publish_interval_secs;
    /* Bits of precision for the location sent (default of 32 is full precision). */
    uint32_t position_precision;
-    /* Whether we have opted-in to report our location to the map */
-    bool should_report_location;
 } meshtastic_ModuleConfig_MapReportSettings;

 /* MQTT Client Config */
@@ -507,7 +505,7 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_ModuleConfig_init_default     {0, {meshtastic_ModuleConfig_MQTTConfig_init_default}}
 #define meshtastic_ModuleConfig_MQTTConfig_init_default {0, "", "", "", 0, 0, 0, "", 0, 0, false, meshtastic_ModuleConfig_MapReportSettings_init_default}
-#define meshtastic_ModuleConfig_MapReportSettings_init_default {0, 0, 0}
+#define meshtastic_ModuleConfig_MapReportSettings_init_default {0, 0}
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_init_default {0, 0, 0, {meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default}}
 #define meshtastic_ModuleConfig_NeighborInfoConfig_init_default {0, 0, 0}
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_default {0, 0, 0, 0, "", 0, _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MIN, 0}
@@ -523,7 +521,7 @@ extern "C" {
 #define meshtastic_RemoteHardwarePin_init_default {0, "", _meshtastic_RemoteHardwarePinType_MIN}
 #define meshtastic_ModuleConfig_init_zero        {0, {meshtastic_ModuleConfig_MQTTConfig_init_zero}}
 #define meshtastic_ModuleConfig_MQTTConfig_init_zero {0, "", "", "", 0, 0, 0, "", 0, 0, false, meshtastic_ModuleConfig_MapReportSettings_init_zero}
-#define meshtastic_ModuleConfig_MapReportSettings_init_zero {0, 0, 0}
+#define meshtastic_ModuleConfig_MapReportSettings_init_zero {0, 0}
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero {0, 0, 0, {meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero}}
 #define meshtastic_ModuleConfig_NeighborInfoConfig_init_zero {0, 0, 0}
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_zero {0, 0, 0, 0, "", 0, _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MIN, 0}
@@ -541,7 +539,6 @@ extern "C" {
 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_ModuleConfig_MapReportSettings_publish_interval_secs_tag 1
 #define meshtastic_ModuleConfig_MapReportSettings_position_precision_tag 2
-#define meshtastic_ModuleConfig_MapReportSettings_should_report_location_tag 3
 #define meshtastic_ModuleConfig_MQTTConfig_enabled_tag 1
 #define meshtastic_ModuleConfig_MQTTConfig_address_tag 2
 #define meshtastic_ModuleConfig_MQTTConfig_username_tag 3
@@ -705,8 +702,7 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  map_report_settings,  11)

 #define meshtastic_ModuleConfig_MapReportSettings_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   publish_interval_secs,   1) \
-X(a, STATIC,   SINGULAR, UINT32,   position_precision,   2) \
-X(a, STATIC,   SINGULAR, BOOL,     should_report_location,   3)
+X(a, STATIC,   SINGULAR, UINT32,   position_precision,   2)
 #define meshtastic_ModuleConfig_MapReportSettings_CALLBACK NULL
 #define meshtastic_ModuleConfig_MapReportSettings_DEFAULT NULL

@@ -894,8 +890,8 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_CannedMessageConfig_size 49
 #define meshtastic_ModuleConfig_DetectionSensorConfig_size 44
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_size 42
-#define meshtastic_ModuleConfig_MQTTConfig_size  224
-#define meshtastic_ModuleConfig_MapReportSettings_size 14
+#define meshtastic_ModuleConfig_MQTTConfig_size  222
+#define meshtastic_ModuleConfig_MapReportSettings_size 12
 #define meshtastic_ModuleConfig_NeighborInfoConfig_size 10
 #define meshtastic_ModuleConfig_PaxcounterConfig_size 30
 #define meshtastic_ModuleConfig_RangeTestConfig_size 10
@@ -903,7 +899,7 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_SerialConfig_size 28
 #define meshtastic_ModuleConfig_StoreForwardConfig_size 24
 #define meshtastic_ModuleConfig_TelemetryConfig_size 46
-#define meshtastic_ModuleConfig_size             227
+#define meshtastic_ModuleConfig_size             225
 #define meshtastic_RemoteHardwarePin_size        21

 #ifdef __cplusplus
--- a/src/mesh/generated/meshtastic/mqtt.pb.h
+++ b/src/mesh/generated/meshtastic/mqtt.pb.h
@@ -54,9 +54,6 @@ typedef struct _meshtastic_MapReport {
    uint32_t position_precision;
    /* Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT) */
    uint16_t num_online_local_nodes;
-    /* User has opted in to share their location (map report) with the mqtt server
- Controlled by map_report.should_report_location */
-    bool has_opted_report_location;
 } meshtastic_MapReport;


@@ -66,9 +63,9 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_ServiceEnvelope_init_default  {NULL, NULL, NULL}
-#define meshtastic_MapReport_init_default        {"", "", _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_HardwareModel_MIN, "", _meshtastic_Config_LoRaConfig_RegionCode_MIN, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_MapReport_init_default        {"", "", _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_HardwareModel_MIN, "", _meshtastic_Config_LoRaConfig_RegionCode_MIN, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ServiceEnvelope_init_zero     {NULL, NULL, NULL}
-#define meshtastic_MapReport_init_zero           {"", "", _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_HardwareModel_MIN, "", _meshtastic_Config_LoRaConfig_RegionCode_MIN, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_MapReport_init_zero           {"", "", _meshtastic_Config_DeviceConfig_Role_MIN, _meshtastic_HardwareModel_MIN, "", _meshtastic_Config_LoRaConfig_RegionCode_MIN, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, 0, 0}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_ServiceEnvelope_packet_tag    1
@@ -87,7 +84,6 @@ extern "C" {
 #define meshtastic_MapReport_altitude_tag        11
 #define meshtastic_MapReport_position_precision_tag 12
 #define meshtastic_MapReport_num_online_local_nodes_tag 13
-#define meshtastic_MapReport_has_opted_report_location_tag 14

 /* Struct field encoding specification for nanopb */
 #define meshtastic_ServiceEnvelope_FIELDLIST(X, a) \
@@ -111,8 +107,7 @@ X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        9) \
 X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,      10) \
 X(a, STATIC,   SINGULAR, INT32,    altitude,         11) \
 X(a, STATIC,   SINGULAR, UINT32,   position_precision,  12) \
-X(a, STATIC,   SINGULAR, UINT32,   num_online_local_nodes,  13) \
-X(a, STATIC,   SINGULAR, BOOL,     has_opted_report_location,  14)
+X(a, STATIC,   SINGULAR, UINT32,   num_online_local_nodes,  13)
 #define meshtastic_MapReport_CALLBACK NULL
 #define meshtastic_MapReport_DEFAULT NULL

@@ -126,7 +121,7 @@ extern const pb_msgdesc_t meshtastic_MapReport_msg;
 /* Maximum encoded size of messages (where known) */
 /* meshtastic_ServiceEnvelope_size depends on runtime parameters */
 #define MESHTASTIC_MESHTASTIC_MQTT_PB_H_MAX_SIZE meshtastic_MapReport_size
-#define meshtastic_MapReport_size                110
+#define meshtastic_MapReport_size                108

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/meshtastic/portnums.pb.h
+++ b/src/mesh/generated/meshtastic/portnums.pb.h
@@ -74,8 +74,6 @@ typedef enum _meshtastic_PortNum {
    meshtastic_PortNum_DETECTION_SENSOR_APP = 10,
    /* Same as Text Message but used for critical alerts. */
    meshtastic_PortNum_ALERT_APP = 11,
-    /* Module/port for handling key verification requests. */
-    meshtastic_PortNum_KEY_VERIFICATION_APP = 12,
    /* Provides a 'ping' service that replies to any packet it receives.
 Also serves as a small example module.
 ENCODING: ASCII Plaintext */
--- a/src/mesh/generated/meshtastic/telemetry.pb.cpp
+++ b/src/mesh/generated/meshtastic/telemetry.pb.cpp
@@ -24,10 +24,7 @@ PB_BIND(meshtastic_LocalStats, meshtastic_LocalStats, AUTO)
 PB_BIND(meshtastic_HealthMetrics, meshtastic_HealthMetrics, AUTO)


-PB_BIND(meshtastic_HostMetrics, meshtastic_HostMetrics, 2)
-
-
-PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, 2)
+PB_BIND(meshtastic_Telemetry, meshtastic_Telemetry, AUTO)


 PB_BIND(meshtastic_Nau7802Config, meshtastic_Nau7802Config, AUTO)
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -87,11 +87,7 @@ typedef enum _meshtastic_TelemetrySensorType {
    /* Infineon DPS310 High accuracy pressure and temperature */
    meshtastic_TelemetrySensorType_DPS310 = 36,
    /* RAKWireless RAK12035 Soil Moisture Sensor Module */
-    meshtastic_TelemetrySensorType_RAK12035 = 37,
-    /* MAX17261 lipo battery gauge */
-    meshtastic_TelemetrySensorType_MAX17261 = 38,
-    /* PCT2075 Temperature Sensor */
-    meshtastic_TelemetrySensorType_PCT2075 = 39
+    meshtastic_TelemetrySensorType_RAK12035 = 37
 } meshtastic_TelemetrySensorType;

 /* Struct definitions */
@@ -277,10 +273,6 @@ typedef struct _meshtastic_LocalStats {
    /* Number of times we canceled a packet to be relayed, because someone else did it before us.
 This will always be zero for ROUTERs/REPEATERs. If this number is high, some other node(s) is/are relaying faster than you. */
    uint32_t num_tx_relay_canceled;
-    /* Number of bytes used in the heap */
-    uint32_t heap_total_bytes;
-    /* Number of bytes free in the heap */
-    uint32_t heap_free_bytes;
 } meshtastic_LocalStats;

 /* Health telemetry metrics */
@@ -296,32 +288,6 @@ typedef struct _meshtastic_HealthMetrics {
    float temperature;
 } meshtastic_HealthMetrics;

-/* Linux host metrics */
-typedef struct _meshtastic_HostMetrics {
-    /* Host system uptime */
-    uint32_t uptime_seconds;
-    /* Host system free memory */
-    uint64_t freemem_bytes;
-    /* Host system disk space free for / */
-    uint64_t diskfree1_bytes;
-    /* Secondary system disk space free */
-    bool has_diskfree2_bytes;
-    uint64_t diskfree2_bytes;
-    /* Tertiary disk space free */
-    bool has_diskfree3_bytes;
-    uint64_t diskfree3_bytes;
-    /* Host system one minute load in 1/100ths */
-    uint16_t load1;
-    /* Host system five minute load  in 1/100ths */
-    uint16_t load5;
-    /* Host system fifteen minute load  in 1/100ths */
-    uint16_t load15;
-    /* Optional User-provided string for arbitrary host system information
- that doesn't make sense as a dedicated entry. */
-    bool has_user_string;
-    char user_string[200];
-} meshtastic_HostMetrics;
-
 /* Types of Measurements the telemetry module is equipped to handle */
 typedef struct _meshtastic_Telemetry {
    /* Seconds since 1970 - or 0 for unknown/unset */
@@ -340,8 +306,6 @@ typedef struct _meshtastic_Telemetry {
        meshtastic_LocalStats local_stats;
        /* Health telemetry metrics */
        meshtastic_HealthMetrics health_metrics;
-        /* Linux host metrics */
-        meshtastic_HostMetrics host_metrics;
    } variant;
 } meshtastic_Telemetry;

@@ -360,9 +324,8 @@ extern "C" {

 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_PCT2075
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_PCT2075+1))
-
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_RAK12035
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_RAK12035+1))



@@ -378,18 +341,16 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_default    {false, 0, false, 0, false, 0}
-#define meshtastic_HostMetrics_init_default      {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_Nau7802Config_init_default    {0, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_HealthMetrics_init_zero       {false, 0, false, 0, false, 0}
-#define meshtastic_HostMetrics_init_zero         {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
 #define meshtastic_Telemetry_init_zero           {0, 0, {meshtastic_DeviceMetrics_init_zero}}
 #define meshtastic_Nau7802Config_init_zero       {0, 0}

@@ -451,20 +412,9 @@ extern "C" {
 #define meshtastic_LocalStats_num_rx_dupe_tag    9
 #define meshtastic_LocalStats_num_tx_relay_tag   10
 #define meshtastic_LocalStats_num_tx_relay_canceled_tag 11
-#define meshtastic_LocalStats_heap_total_bytes_tag 12
-#define meshtastic_LocalStats_heap_free_bytes_tag 13
 #define meshtastic_HealthMetrics_heart_bpm_tag   1
 #define meshtastic_HealthMetrics_spO2_tag        2
 #define meshtastic_HealthMetrics_temperature_tag 3
-#define meshtastic_HostMetrics_uptime_seconds_tag 1
-#define meshtastic_HostMetrics_freemem_bytes_tag 2
-#define meshtastic_HostMetrics_diskfree1_bytes_tag 3
-#define meshtastic_HostMetrics_diskfree2_bytes_tag 4
-#define meshtastic_HostMetrics_diskfree3_bytes_tag 5
-#define meshtastic_HostMetrics_load1_tag         6
-#define meshtastic_HostMetrics_load5_tag         7
-#define meshtastic_HostMetrics_load15_tag        8
-#define meshtastic_HostMetrics_user_string_tag   9
 #define meshtastic_Telemetry_time_tag            1
 #define meshtastic_Telemetry_device_metrics_tag  2
 #define meshtastic_Telemetry_environment_metrics_tag 3
@@ -472,7 +422,6 @@ extern "C" {
 #define meshtastic_Telemetry_power_metrics_tag   5
 #define meshtastic_Telemetry_local_stats_tag     6
 #define meshtastic_Telemetry_health_metrics_tag  7
-#define meshtastic_Telemetry_host_metrics_tag    8
 #define meshtastic_Nau7802Config_zeroOffset_tag  1
 #define meshtastic_Nau7802Config_calibrationFactor_tag 2

@@ -550,9 +499,7 @@ X(a, STATIC,   SINGULAR, UINT32,   num_online_nodes,   7) \
 X(a, STATIC,   SINGULAR, UINT32,   num_total_nodes,   8) \
 X(a, STATIC,   SINGULAR, UINT32,   num_rx_dupe,       9) \
 X(a, STATIC,   SINGULAR, UINT32,   num_tx_relay,     10) \
-X(a, STATIC,   SINGULAR, UINT32,   num_tx_relay_canceled,  11) \
-X(a, STATIC,   SINGULAR, UINT32,   heap_total_bytes,  12) \
-X(a, STATIC,   SINGULAR, UINT32,   heap_free_bytes,  13)
+X(a, STATIC,   SINGULAR, UINT32,   num_tx_relay_canceled,  11)
 #define meshtastic_LocalStats_CALLBACK NULL
 #define meshtastic_LocalStats_DEFAULT NULL

@@ -563,19 +510,6 @@ X(a, STATIC,   OPTIONAL, FLOAT,    temperature,       3)
 #define meshtastic_HealthMetrics_CALLBACK NULL
 #define meshtastic_HealthMetrics_DEFAULT NULL

-#define meshtastic_HostMetrics_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   uptime_seconds,    1) \
-X(a, STATIC,   SINGULAR, UINT64,   freemem_bytes,     2) \
-X(a, STATIC,   SINGULAR, UINT64,   diskfree1_bytes,   3) \
-X(a, STATIC,   OPTIONAL, UINT64,   diskfree2_bytes,   4) \
-X(a, STATIC,   OPTIONAL, UINT64,   diskfree3_bytes,   5) \
-X(a, STATIC,   SINGULAR, UINT32,   load1,             6) \
-X(a, STATIC,   SINGULAR, UINT32,   load5,             7) \
-X(a, STATIC,   SINGULAR, UINT32,   load15,            8) \
-X(a, STATIC,   OPTIONAL, STRING,   user_string,       9)
-#define meshtastic_HostMetrics_CALLBACK NULL
-#define meshtastic_HostMetrics_DEFAULT NULL
-
 #define meshtastic_Telemetry_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, FIXED32,  time,              1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,device_metrics,variant.device_metrics),   2) \
@@ -583,8 +517,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (variant,environment_metrics,variant.environm
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,air_quality_metrics,variant.air_quality_metrics),   4) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,power_metrics,variant.power_metrics),   5) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,local_stats,variant.local_stats),   6) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (variant,health_metrics,variant.health_metrics),   7) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (variant,host_metrics,variant.host_metrics),   8)
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,health_metrics,variant.health_metrics),   7)
 #define meshtastic_Telemetry_CALLBACK NULL
 #define meshtastic_Telemetry_DEFAULT NULL
 #define meshtastic_Telemetry_variant_device_metrics_MSGTYPE meshtastic_DeviceMetrics
@@ -593,7 +526,6 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (variant,host_metrics,variant.host_metrics),
 #define meshtastic_Telemetry_variant_power_metrics_MSGTYPE meshtastic_PowerMetrics
 #define meshtastic_Telemetry_variant_local_stats_MSGTYPE meshtastic_LocalStats
 #define meshtastic_Telemetry_variant_health_metrics_MSGTYPE meshtastic_HealthMetrics
-#define meshtastic_Telemetry_variant_host_metrics_MSGTYPE meshtastic_HostMetrics

 #define meshtastic_Nau7802Config_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, INT32,    zeroOffset,        1) \
@@ -607,7 +539,6 @@ extern const pb_msgdesc_t meshtastic_PowerMetrics_msg;
 extern const pb_msgdesc_t meshtastic_AirQualityMetrics_msg;
 extern const pb_msgdesc_t meshtastic_LocalStats_msg;
 extern const pb_msgdesc_t meshtastic_HealthMetrics_msg;
-extern const pb_msgdesc_t meshtastic_HostMetrics_msg;
 extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;

@@ -618,7 +549,6 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 #define meshtastic_AirQualityMetrics_fields &meshtastic_AirQualityMetrics_msg
 #define meshtastic_LocalStats_fields &meshtastic_LocalStats_msg
 #define meshtastic_HealthMetrics_fields &meshtastic_HealthMetrics_msg
-#define meshtastic_HostMetrics_fields &meshtastic_HostMetrics_msg
 #define meshtastic_Telemetry_fields &meshtastic_Telemetry_msg
 #define meshtastic_Nau7802Config_fields &meshtastic_Nau7802Config_msg

@@ -628,11 +558,10 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 #define meshtastic_DeviceMetrics_size            27
 #define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11
-#define meshtastic_HostMetrics_size              264
-#define meshtastic_LocalStats_size               72
+#define meshtastic_LocalStats_size               60
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             30
-#define meshtastic_Telemetry_size                272
+#define meshtastic_Telemetry_size                120

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/mesh-pb-constants.h
+++ b/src/mesh/mesh-pb-constants.h
@@ -20,7 +20,7 @@

 /// Verify baseline assumption of node size. If it increases, we need to reevaluate
 /// the impact of its memory footprint, notably on MAX_NUM_NODES.
-static_assert(sizeof(meshtastic_NodeInfoLite) <= 200, "NodeInfoLite size increased. Reconsider impact on MAX_NUM_NODES.");
+static_assert(sizeof(meshtastic_NodeInfoLite) <= 192, "NodeInfoLite size increased. Reconsider impact on MAX_NUM_NODES.");

 /// max number of nodes allowed in the nodeDB
 #ifndef MAX_NUM_NODES
--- a/src/mesh/raspihttp/PiWebServer.cpp
+++ b/src/mesh/raspihttp/PiWebServer.cpp
@@ -462,8 +462,8 @@ PiWebServerThread::PiWebServerThread()
        webservport = settingsMap[webserverport];
        LOG_INFO("Use webserver port from yaml config %i ", webservport);
    } else {
-        LOG_INFO("Webserver port in yaml config set to 0, defaulting to port 9443");
-        webservport = 9443;
+        LOG_INFO("Webserver port in yaml config set to 0, defaulting to port 443");
+        webservport = 443;
    }

    // Web Content Service Instance
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -286,11 +286,6 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        nodeDB->removeNodeByNum(r->remove_by_nodenum);
        break;
    }
-    case meshtastic_AdminMessage_add_contact_tag: {
-        LOG_INFO("Client received add_contact command");
-        nodeDB->addFromContact(r->add_contact);
-        break;
-    }
    case meshtastic_AdminMessage_set_favorite_node_tag: {
        LOG_INFO("Client received set_favorite_node command");
        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(r->set_favorite_node);
@@ -504,12 +499,6 @@ void AdminModule::handleSetOwner(const meshtastic_User &o)
            sendWarning(licensedModeMessage);
        }
    }
-    if (owner.has_is_unmessagable != o.has_is_unmessagable ||
-        (o.has_is_unmessagable && owner.is_unmessagable != o.is_unmessagable)) {
-        changed = 1;
-        owner.has_is_unmessagable = o.has_is_unmessagable || o.has_is_unmessagable;
-        owner.is_unmessagable = o.is_unmessagable;
-    }

    if (changed) { // If nothing really changed, don't broadcast on the network or write to flash
        service->reloadOwner(!hasOpenEditTransaction);
@@ -559,10 +548,8 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
            sendWarning(warning);
        }
        // If we're setting router role for the first time, install its intervals
-        if (existingRole != c.payload_variant.device.role) {
+        if (existingRole != c.payload_variant.device.role)
            nodeDB->installRoleDefaults(c.payload_variant.device.role);
-            changes |= SEGMENT_NODEDATABASE | SEGMENT_DEVICESTATE; // Some role defaults affect owner
-        }
        if (config.device.node_info_broadcast_secs < min_node_info_broadcast_secs) {
            LOG_DEBUG("Tried to set node_info_broadcast_secs too low, setting to %d", min_node_info_broadcast_secs);
            config.device.node_info_broadcast_secs = min_node_info_broadcast_secs;
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -49,7 +49,6 @@
 #endif
 #if ARCH_PORTDUINO
 #include "input/LinuxInputImpl.h"
-#include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
 #endif
@@ -197,9 +196,6 @@ void setupModules()
 #if HAS_SCREEN && !MESHTASTIC_EXCLUDE_CANNEDMESSAGES
        cannedMessageModule = new CannedMessageModule();
 #endif
-#if ARCH_PORTDUINO
-        new HostMetricsModule();
-#endif
 #if HAS_TELEMETRY
        new DeviceTelemetryModule();
 #endif
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -14,9 +14,6 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 {
    auto p = *pptr;

-    // Coerce user.id to be derived from the node number
-    snprintf(p.id, sizeof(p.id), "!%08x", getFrom(&mp));
-
    bool hasChanged = nodeDB->updateUser(getFrom(&mp), p, mp.channel);

    bool wasBroadcast = isBroadcast(mp.to);
@@ -89,11 +86,6 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
            u.public_key.bytes[0] = 0;
            u.public_key.size = 0;
        }
-        // Coerce unmessagable for Repeater role
-        if (u.role == meshtastic_Config_DeviceConfig_Role_REPEATER) {
-            u.has_is_unmessagable = true;
-            u.is_unmessagable = true;
-        }

        LOG_INFO("Send owner %s/%s/%s", u.id, u.long_name, u.short_name);
        lastSentToMesh = millis();
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -9,7 +9,6 @@
 #include "Router.h"
 #include "configuration.h"
 #include "main.h"
-#include "memGet.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 #include <meshUtils.h>
@@ -134,9 +133,6 @@ meshtastic_Telemetry DeviceTelemetryModule::getLocalStatsTelemetry()
        telemetry.variant.local_stats.num_packets_rx_bad = SimRadio::instance->rxBad;
        telemetry.variant.local_stats.num_tx_relay = SimRadio::instance->txRelay;
    }
-#else
-    telemetry.variant.local_stats.heap_total_bytes = memGet.getHeapSize();
-    telemetry.variant.local_stats.heap_free_bytes = memGet.getFreeHeap();
 #endif
    if (router) {
        telemetry.variant.local_stats.num_rx_dupe = router->rxDupe;
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -52,13 +52,6 @@ BMP280Sensor bmp280Sensor;
 NullSensor bme280Sensor;
 #endif

-#if __has_include(<Adafruit_LTR390.h>)
-#include "Sensor/LTR390UVSensor.h"
-LTR390UVSensor ltr390uvSensor;
-#else
-NullSensor ltr390uvSensor;
-#endif
-
 #if __has_include(<bsec2.h>)
 #include "Sensor/BME680Sensor.h"
 BME680Sensor bme680Sensor;
@@ -164,13 +157,6 @@ BMP3XXSensor bmp3xxSensor;
 NullSensor bmp3xxSensor;
 #endif

-#if __has_include(<Adafruit_PCT2075.h>)
-#include "Sensor/PCT2075Sensor.h"
-PCT2075Sensor pct2075Sensor;
-#else
-NullSensor pct2075Sensor;
-#endif
-
 RCWL9620Sensor rcwl9620Sensor;
 CGRadSensSensor cgRadSens;
 #endif
@@ -238,8 +224,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
 #endif
            if (bme280Sensor.hasSensor())
                result = bme280Sensor.runOnce();
-            if (ltr390uvSensor.hasSensor())
-                result = ltr390uvSensor.runOnce();
            if (bmp3xxSensor.hasSensor())
                result = bmp3xxSensor.runOnce();
            if (bme680Sensor.hasSensor())
@@ -280,8 +264,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
                result = max17048Sensor.runOnce();
            if (cgRadSens.hasSensor())
                result = cgRadSens.runOnce();
-            if (pct2075Sensor.hasSensor())
-                result = pct2075Sensor.runOnce();
                // this only works on the wismesh hub with the solar option. This is not an I2C sensor, so we don't need the
                // sensormap here.
 #ifdef HAS_RAKPROT
@@ -533,10 +515,6 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
        valid = valid && bme280Sensor.getMetrics(m);
        hasSensor = true;
    }
-    if (ltr390uvSensor.hasSensor()) {
-        valid = valid && ltr390uvSensor.getMetrics(m);
-        hasSensor = true;
-    }
    if (bmp3xxSensor.hasSensor()) {
        valid = valid && bmp3xxSensor.getMetrics(m);
        hasSensor = true;
@@ -617,10 +595,6 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
        valid = valid && cgRadSens.getMetrics(m);
        hasSensor = true;
    }
-    if (pct2075Sensor.hasSensor()) {
-        valid = valid && pct2075Sensor.getMetrics(m);
-        hasSensor = true;
-    }
 #ifdef HAS_RAKPROT
    valid = valid && rak9154Sensor.getMetrics(m);
    hasSensor = true;
@@ -765,11 +739,6 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
        if (result != AdminMessageHandleResult::NOT_HANDLED)
            return result;
    }
-    if (ltr390uvSensor.hasSensor()) {
-        result = ltr390uvSensor.handleAdminMessage(mp, request, response);
-        if (result != AdminMessageHandleResult::NOT_HANDLED)
-            return result;
-    }
    if (bmp3xxSensor.hasSensor()) {
        result = bmp3xxSensor.handleAdminMessage(mp, request, response);
        if (result != AdminMessageHandleResult::NOT_HANDLED)
--- a/src/modules/Telemetry/HostMetrics.cpp
+++ b/src/modules/Telemetry/HostMetrics.cpp
@@ -1,140 +0,0 @@
-#include "HostMetrics.h"
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "MeshService.h"
-#if ARCH_PORTDUINO
-#include "PortduinoGlue.h"
-#include <filesystem>
-#endif
-
-int32_t HostMetricsModule::runOnce()
-{
-#if ARCH_PORTDUINO
-    if (settingsMap[hostMetrics_interval] == 0) {
-        return disable();
-    } else {
-        sendMetrics();
-        return 60 * 1000 * settingsMap[hostMetrics_interval];
-    }
-#else
-    return disable();
-#endif
-}
-
-bool HostMetricsModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
-{
-    // Don't worry about storing telemetry in NodeDB if we're a repeater
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER)
-        return false;
-
-    if (t->which_variant == meshtastic_Telemetry_host_metrics_tag) {
-#ifdef DEBUG_PORT
-        const char *sender = getSenderShortName(mp);
-
-        LOG_INFO("(Received Host Metrics from %s): uptime=%u, diskfree=%lu, memory free=%lu, load=%04.2f, %04.2f, %04.2f, %s",
-                 sender, t->variant.host_metrics.uptime_seconds, t->variant.host_metrics.diskfree1_bytes,
-                 t->variant.host_metrics.freemem_bytes, static_cast<float>(t->variant.host_metrics.load1) / 100,
-                 static_cast<float>(t->variant.host_metrics.load5) / 100,
-                 static_cast<float>(t->variant.host_metrics.load15) / 100,
-                 t->variant.host_metrics.has_user_string ? t->variant.host_metrics.user_string : "");
-#endif
-    }
-    return false; // Let others look at this message also if they want
-}
-
-/*
-meshtastic_MeshPacket *HostMetricsModule::allocReply()
-{
-    if (currentRequest) {
-        auto req = *currentRequest;
-        const auto &p = req.decoded;
-        meshtastic_Telemetry scratch;
-        meshtastic_Telemetry *decoded = NULL;
-        memset(&scratch, 0, sizeof(scratch));
-        if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_HostMetrics_msg, &scratch)) {
-            decoded = &scratch;
-        } else {
-            LOG_ERROR("Error decoding HostMetrics module!");
-            return NULL;
-        }
-        // Check for a request for device metrics
-        if (decoded->which_variant == meshtastic_Telemetry_host_metrics_tag) {
-            LOG_INFO("Device telemetry reply to request");
-            return allocDataProtobuf(getHostMetrics());
-        }
-    }
-    return NULL;
-}
-    */
-
-#if ARCH_PORTDUINO
-meshtastic_Telemetry HostMetricsModule::getHostMetrics()
-{
-    std::string file_line;
-    meshtastic_Telemetry t = meshtastic_Telemetry_init_zero;
-    t.which_variant = meshtastic_Telemetry_host_metrics_tag;
-    t.variant.host_metrics = meshtastic_HostMetrics_init_zero;
-
-    if (access("/proc/uptime", R_OK) == 0) {
-        std::ifstream proc_uptime("/proc/uptime");
-        if (proc_uptime.is_open()) {
-            std::getline(proc_uptime, file_line, ' ');
-            proc_uptime.close();
-            t.variant.host_metrics.uptime_seconds = stoul(file_line);
-        }
-    }
-
-    std::filesystem::space_info root = std::filesystem::space("/");
-    t.variant.host_metrics.diskfree1_bytes = root.available;
-
-    if (access("/proc/meminfo", R_OK) == 0) {
-        std::ifstream proc_meminfo("/proc/meminfo");
-        if (proc_meminfo.is_open()) {
-            do {
-                std::getline(proc_meminfo, file_line);
-            } while (file_line.find("MemAvailable") == std::string::npos);
-            proc_meminfo.close();
-            t.variant.host_metrics.freemem_bytes = stoull(file_line.substr(file_line.find_first_of("0123456789"))) * 1024;
-        }
-    }
-    if (access("/proc/loadavg", R_OK) == 0) {
-        std::ifstream proc_loadavg("/proc/loadavg");
-        if (proc_loadavg.is_open()) {
-            std::getline(proc_loadavg, file_line, ' ');
-            t.variant.host_metrics.load1 = stof(file_line) * 100;
-            std::getline(proc_loadavg, file_line, ' ');
-            t.variant.host_metrics.load5 = stof(file_line) * 100;
-            std::getline(proc_loadavg, file_line, ' ');
-            t.variant.host_metrics.load15 = stof(file_line) * 100;
-            proc_loadavg.close();
-        }
-    }
-    if (settingsStrings[hostMetrics_user_command] != "") {
-        std::string userCommandResult = exec(settingsStrings[hostMetrics_user_command].c_str());
-        if (userCommandResult.length() > 1) {
-            strncpy(t.variant.host_metrics.user_string, userCommandResult.c_str(), 200);
-            t.variant.host_metrics.has_user_string = true;
-        }
-    }
-    return t;
-}
-
-bool HostMetricsModule::sendMetrics()
-{
-    meshtastic_Telemetry telemetry = getHostMetrics();
-    LOG_INFO("Send: uptime=%u, diskfree=%lu, memory free=%lu, load=%04.2f, %04.2f, %04.2f %s",
-             telemetry.variant.host_metrics.uptime_seconds, telemetry.variant.host_metrics.diskfree1_bytes,
-             telemetry.variant.host_metrics.freemem_bytes, static_cast<float>(telemetry.variant.host_metrics.load1) / 100,
-             static_cast<float>(telemetry.variant.host_metrics.load5) / 100,
-             static_cast<float>(telemetry.variant.host_metrics.load15) / 100,
-             telemetry.variant.host_metrics.has_user_string ? telemetry.variant.host_metrics.user_string : "");
-
-    meshtastic_MeshPacket *p = allocDataProtobuf(telemetry);
-    p->to = NODENUM_BROADCAST;
-    p->decoded.want_response = false;
-    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-    p->channel = settingsMap[hostMetrics_channel];
-    LOG_INFO("Send packet to mesh");
-    service->sendToMesh(p, RX_SRC_LOCAL, true);
-    return true;
-}
-#endif
--- a/src/modules/Telemetry/HostMetrics.h
+++ b/src/modules/Telemetry/HostMetrics.h
@@ -1,40 +0,0 @@
-#pragma once
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "ProtobufModule.h"
-
-class HostMetricsModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
-{
-    CallbackObserver<HostMetricsModule, const meshtastic::Status *> nodeStatusObserver =
-        CallbackObserver<HostMetricsModule, const meshtastic::Status *>(this, &HostMetricsModule::handleStatusUpdate);
-
-  public:
-    HostMetricsModule()
-        : concurrency::OSThread("HostMetrics"),
-          ProtobufModule("HostMetrics", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
-    {
-        uptimeWrapCount = 0;
-        uptimeLastMs = millis();
-        nodeStatusObserver.observe(&nodeStatus->onNewStatus);
-        setIntervalFromNow(setStartDelay()); // Wait until NodeInfo is sent
-    }
-    virtual bool wantUIFrame() { return false; }
-
-  protected:
-    /** Called to handle a particular incoming message
-    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
-    */
-    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
-    // virtual meshtastic_MeshPacket *allocReply() override;
-    virtual int32_t runOnce() override;
-    /**
-     * Send our Telemetry into the mesh
-     */
-    bool sendMetrics();
-
-  private:
-    meshtastic_Telemetry getHostMetrics();
-
-    uint32_t lastSentToMesh = 0;
-    uint32_t uptimeWrapCount;
-    uint32_t uptimeLastMs;
-};
--- a/src/modules/Telemetry/Sensor/AHT10.cpp
+++ b/src/modules/Telemetry/Sensor/AHT10.cpp
@@ -1,7 +1,3 @@
-/*
- *  Worth noting that both the AHT10 and AHT20 are supported without alteration.
- */
-
 #include "configuration.h"

 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_AHTX0.h>)
@@ -45,4 +41,4 @@ bool AHT10Sensor::getMetrics(meshtastic_Telemetry *measurement)
    return true;
 }

-#endif
+#endif
--- a/Show More
+++ b/Show More