Update version.txt

Update past_version.txt
Enable exFAT feature (#2437 )
2026-08-22 07:29:03 +00:00 · 2024-12-20 20:05:01 +13:00 · 2024-12-20 20:04:46 +13:00 · 2024-12-20 07:55:39 +01:00 · 2024-12-20 07:53:15 +01:00 · 2024-12-18 23:44:35 +01:00
658 changed files with 66556 additions and 9994 deletions
@@ -54,19 +54,22 @@ jobs:
        run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
      - name: Create Small SD Card ZIP - No World Map
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
      - name: Download world map
        run: |
          wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
      - name: Unzip world map
        run: |
          unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
      - name: Create Firmware ZIP
        run: |
-          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+          zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
      - name: Create SD Card ZIP
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version_date.outputs.date }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_nightly_${{ steps.version_date.outputs.date }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
      - name: Create changelog
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -38,19 +38,22 @@ jobs:
        run: docker run -e VERSION_STRING=${{ steps.version.outputs.version }} -i -v ${{ github.workspace }}:/havoc portapack-dev
      - name: Create Small SD Card ZIP - No World Map
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard-no-map.zip . && cd ..
      - name: Download world map
        run: |
          wget https://github.com/portapack-mayhem/mayhem-firmware/releases/download/world_map/world_map.zip
      - name: Unzip world map
        run: |
          unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
      - name: Create Firmware ZIP
        run: |
-          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
+          zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
      - name: Create SD Card ZIP
        run: |
-          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-h1_h2-mayhem.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
+          mkdir -p sdcard/FIRMWARE && cp build/firmware/portapack-mayhem-firmware.bin sdcard/FIRMWARE/portapack-mayhem_${{ steps.version.outputs.version }}.bin && cp build/firmware/portapack-mayhem_OCI.ppfw.tar sdcard/FIRMWARE/mayhem_${{ steps.version.outputs.version }}_OCI.ppfw.tar && mkdir -p sdcard/APPS && cp build/firmware/application/*.ppma sdcard/APPS && cp build/firmware/standalone/*/*.ppmp sdcard/APPS && cd sdcard && zip -r ../sdcard.zip . && cd ..
      - name: Create changelog
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1 +1 @@
-v2.0.0
+v2.0.2
@@ -1 +1 @@
-v2.0.1
+v2.1.0
@@ -1,3 +1,3 @@
 [submodule "hackrf"]
 	path = hackrf
-	url = https://github.com/mossmann/hackrf.git
+	url = https://github.com/portapack-mayhem/hackrf.git
@@ -23,6 +23,12 @@ cmake_policy(SET CMP0005 NEW)

 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex-m.cmake)

+set(CMAKE_COLOR_MAKEFILE ON)
+
+add_compile_options(-fdiagnostics-color=always)
+
+option(USE_CCACHE "Enable ccache, please keep an eye on this because sometimes it's not quite stable and generated unusable binary" OFF)
+
 project(portapack-h1)

 set(EXPECTED_GCC_VERSION "9.2.1")
@@ -59,10 +65,11 @@ message("Building version: ${VERSION} MD5: ${VERSION_MD5}")
 set(LICENSE_PATH ${CMAKE_CURRENT_LIST_DIR}/LICENSE)
 set(HARDWARE_PATH ${CMAKE_CURRENT_LIST_DIR}/hardware)

-add_subdirectory(hackrf-portapack)
+add_subdirectory(hackrf/firmware)

 set(HACKRF_FIRMWARE_DFU_FILENAME hackrf_usb.dfu)
 set(HACKRF_FIRMWARE_BIN_FILENAME hackrf_usb_ram.bin)
+set(HACKRF_FIRMWARE_FILENAME hackrf_usb.bin)
 set(HACKRF_CPLD_XSVF_FILENAME default.xsvf)

 set(HACKRF_PATH ${CMAKE_CURRENT_LIST_DIR}/hackrf)
@@ -72,12 +79,24 @@ set(HACKRF_CPLD_XSVF_PATH ${HACKRF_PATH}/firmware/cpld/sgpio_if/${HACKRF_CPLD_XS
 set(HACKRF_FIRMWARE_DFU_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_DFU_FILENAME})
 set(HACKRF_FIRMWARE_BIN_IMAGE ${hackrf_usb_BINARY_DIR}/${HACKRF_FIRMWARE_BIN_FILENAME})

-find_program(CCACHE "ccache")
-if(CCACHE)
-    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
-    set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
-endif(CCACHE)
+# this seems causing some issues (ref. in discord discussions), but it sometimes do helps, so you have your choice to use. it's default disabled,  unless you use such command:
+# cmake -DUSE_CCACHE=ON ..
+# `make` or `make -j` or `make -j10` etc
+# the default behavior `cmake ..` isn't changed (aka don't use ccache)
+message(STATUS "-------v ccache info--------")
+if(USE_CCACHE)
+	find_program(CCACHE_FOUND ccache)
+	if(CCACHE_FOUND)
+		set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_FOUND})
+		set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_FOUND})
+		message(STATUS "Using ccache, please keep an eye on this because sometimes it's not quite stable and generated unusable binary.\n-- use `cmake -DUSE_CCACHE=OFF ..` (pure cmake) or `cmake -G Ninja -DUSE_CCACHE=OFF .. ` (cmake with Ninja) to turn off ccache")
+	else()
+		message(WARNING "ccache is enabled but not found on the system.")
+	endif()
+else()
+	message(STATUS "Not using ccache, use `cmake -DUSE_CCACHE=ON ..` (pure cmake) or `cmake -G Ninja -DUSE_CCACHE=ON ..` (cmake with Ninja) to turn on ccache")
+endif()
+message(STATUS "-------^ ccache info--------")

 enable_testing()
 add_subdirectory(firmware)
@@ -1,24 +1,23 @@
+<!---
 > [!WARNING]
-> __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED PACKAGES, YOU'RE BEING SCAMMED.__ 
-> The only legitimate link leading to our repositories is the organization [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware).
-
+> __IF YOU'VE PAID FOR MAYHEM OR ANY PREPACKAGED VERSIONS, YOU'RE BEING SCAMMED.__ 
+>
+> The only legitimate link to our repositories is the [portapack-mayhem](https://github.com/portapack-mayhem/mayhem-firmware) organization on GitHub.--->
 # PortaPack Mayhem

 [![Nightly Release](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml/badge.svg?branch=next)](https://github.com/portapack-mayhem/mayhem-firmware/actions/workflows/create_nightly_release.yml) [![CodeScene Code Health](https://codescene.io/projects/8381/status-badges/code-health)](https://codescene.io/projects/8381) [![GitHub All Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases) [![GitHub Releases](https://img.shields.io/github/downloads/portapack-mayhem/mayhem-firmware/latest/total)](https://github.com/portapack-mayhem/mayhem-firmware/releases/latest) [![Docker Hub Pulls](https://img.shields.io/docker/pulls/eried/portapack.svg)](https://hub.docker.com/r/eried/portapack) [![Discord Chat](https://dcbadge.vercel.app/api/server/tuwVMv3?style=flat)](https://discord.gg/tuwVMv3)

 This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). A fork is a derivate, in this case one that has extra features and fixes when compared to the older versions.

-[<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_front.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_inside.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview#portapack-internals)
-
-*[PortaPack H2+HackRF+battery](https://grabify.link/7T28JP) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure)*
+[<img src="https://github.com/user-attachments/assets/dea337ab-fb64-4a2a-b419-69afd272e815" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#new-h4m-mayhem-edition) [<img src="https://camo.githubusercontent.com/5c1f1da0688240ac7b2ccca0c8dbfd1d73f2540741ad8b1828ba4d5ea68af248/68747470733a2f2f6769746875622d70726f64756374696f6e2d757365722d61737365742d3632313064662e73332e616d617a6f6e6177732e636f6d2f343339333937392f3239353533323731382d38653562363631632d663934362d346365652d386232642d3061363135663737313566342e706e67" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)

 # What is this?

 If you are new to *HackRF+PortaPack+Mayhem*, check these:

-[<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="512">](https://grabify.link/C0J6ZR)
+[<img alt="The Latest HackRF & Portapak Combo - H4M The Flipper Zero Killer?" src="https://img.youtube.com/vi/Ew2qDgm2hf0/maxresdefault.jpg" width="701">](https://share.hackrf.app/6HKX9A)

-[<img alt="Beginner's Guide To The HackRF & Portapak With Mayhem" src="https://img.youtube.com/vi/H-bqdWfbhpg/maxresdefault.jpg" width="254">](https://grabify.link/5MU2VH) [<img alt="What is the HackRF One Portapack H2+?" src="https://img.youtube.com/vi/alrFbY5vxt4/maxresdefault.jpg" width="254">](https://grabify.link/9UZGEW)
+[<img alt="It’s TOO Easy to Accidentally Do Illegal Stuff with This" src="https://img.youtube.com/vi/OPckpjBSAOw/maxresdefault.jpg" width="172">](https://share.hackrf.app/X4D5TF) [<img alt="HackRF Portapack H4M - Getting Started Guide" src="https://img.youtube.com/vi/wzP0zWi85SI/maxresdefault.jpg" width="172">](https://share.hackrf.app/F9MPOO) [<img alt="The new HackRF Portapack H4M" src="https://img.youtube.com/vi/onQRdCITmuk/maxresdefault.jpg" width="172">](https://share.hackrf.app/0JUHZ6) [<img alt="HackRF 101 : Everything You Need to Know to Get Started!" src="https://img.youtube.com/vi/xGR_PMD9LeU/maxresdefault.jpg" width="172">](https://share.hackrf.app/C0J6ZR)

 # Frequently Asked Questions

@@ -26,11 +25,12 @@ This repository expands upon the previous work by many people and aims to consta

 ## What to buy?

-:heavy_check_mark: A recommended one is this [PortaPack H2](https://grabify.link/7T28JP), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/H2-Enclosure).
+<!---not direct to h4m but to opensourcesdrlab https://share.hackrf.app/TUOLYI---> 
+:heavy_check_mark: ![Static Badge](https://img.shields.io/badge/NEW-yellow) The fabulous H4M [complete](https://share.hackrf.app/TUOLYI) or [upgrade](https://share.hackrf.app/FPLM1H), featuring numerous improvements and accessories. Sold by our friends at [OpenSourceSDRLab](https://share.hackrf.app/99SAMT). Join their giveaways on discord (check the badge on top).

-:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://grabify.link/HTDXG5), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 
+:heavy_check_mark: A recommended one is this [PortaPack H2](https://www.ebay.com/itm/116382397447), that includes everything you need with the plastic case "inspired" on [this](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure).

-:heavy_check_mark: Our friends at OpenSourceSDRLab give away five units every three months in our discord (check the badge on top) of their [PortaPack H2](https://grabify.link/LG0OUY), you can support them too by ordering.
+:heavy_check_mark: Some individuals lean towards the [H2 with a metal enclosure](https://share.hackrf.app/LZPBH9), but its advantages remain debated. Share your insights on our [wiki](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview). 

 :warning: Be cautious , *ask* the seller about compatibility with the latest releases. Look out for the description of the item, if they provide the firmware files for an older version or they have custom setup instructions, this means it might be **NOT compatible**, for example:

@@ -54,13 +54,7 @@ Consider that the hardware and firmware has been created and maintain by a [lot]
 To support the people behind the hardware, please buy a genuine [HackRF](https://greatscottgadgets.com/hackrf/) and [PortaPack](https://store.sharebrained.com/products/portapack-for-hackrf-one-kit).

 ## What if I really want something specific?
-If what you need can be relevant in general, you can [request a feature](https://github.com/portapack-mayhem/mayhem-firmware/issues/new?labels=enhancement&template=feature_request.md).
-
-<del>You can create a bounty and invite people to your own bounty. This will incentivize coders to work on a new feature, solving a bug or even writting documentation. Start a bounty by [creating](https://github.com/portapack-mayhem/mayhem-firmware/issues/new/choose) or [choosing](https://github.com/portapack-mayhem/mayhem-firmware/issues/) an existing issue. Then, go to [Bountysource](https://www.bountysource.com/) and post a bounty using the link to that specific [issue](https://www.bountysource.com/teams/portapack-mayhem/issues).</del>
-
-<del>Promote your bounty over our Discord by clicking the chat badge on [top](#portapack-mayhem).</del>
-
-Bountysource has not been reliable lately, so until this changes, please **DO NOT** post a bounty there. Go to our Discord by clicking the chat badge on [top](#portapack-mayhem) and discuss there.
+If what you need can be relevant in general, you can [request a feature](https://github.com/portapack-mayhem/mayhem-firmware/issues/new?assignees=&labels=enhancement&projects=&template=02_feature_request.yml). Alternatively, go to our Discord by clicking the chat badge on [top](#portapack-mayhem) and discuss there.

 ## What if I need help?
 First, check the [documentation](https://github.com/portapack-mayhem/mayhem-firmware/wiki). If you find a bug or you think the problem is related to the current repository, please open an [issue](https://github.com/portapack-mayhem/mayhem-firmware/issues/new/choose).
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:noble

 # Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -11,19 +11,10 @@ WORKDIR /havoc/firmware

 # Fetch dependencies from APT
 RUN apt-get update \
- && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \
 && apt-get -qy autoremove \
 && rm -rf /var/lib/apt/lists/*

-#Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
-	python3 get-pip.py
-
-#Fetch additional dependencies from Python 3.x pip
-RUN pip install pyyaml \
- && ln -s /usr/bin/python3 /usr/bin/python \
- && ln -s /usr/bin/pip3 /usr/bin/pip
-
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:noble

 # Set location to download ARM toolkit from.
 # This will need to be changed over time or replaced with a static link to the latest release.
@@ -11,19 +11,10 @@ WORKDIR /havoc/firmware

 # Fetch dependencies from APT
 RUN apt-get update \
- && apt-get install -y git tar wget dfu-util cmake python3 ccache bzip2 liblz4-tool curl ninja-build \
+ && apt-get install -y git tar wget dfu-util cmake python3 python3-pip python3-yaml ccache bzip2 liblz4-tool curl ninja-build \
 && apt-get -qy autoremove \
 && rm -rf /var/lib/apt/lists/*

-#Install current pip from PyPa
-RUN curl https://bootstrap.pypa.io/pip/3.4/get-pip.py -o get-pip.py && \
-	python3 get-pip.py
-
-#Fetch additional dependencies from Python 3.x pip
-RUN pip install pyyaml \
- && ln -s /usr/bin/python3 /usr/bin/python \
- && ln -s /usr/bin/pip3 /usr/bin/pip
-
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

@@ -33,7 +33,7 @@ set(MAKE_SPI_IMAGE ${PROJECT_SOURCE_DIR}/tools/make_spi_image.py)
 set(MAKE_IMAGE_CHUNK ${PROJECT_SOURCE_DIR}/tools/make_image_chunk.py)
 set(LZ4 lz4)

-set(FIRMWARE_NAME portapack-h1_h2-mayhem)
+set(FIRMWARE_NAME portapack-mayhem-firmware)
 set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin)
 set(PPFW_FILENAME "portapack-mayhem_OCI.ppfw.tar")

@@ -50,6 +50,7 @@ endif()

 add_subdirectory(application)
 add_subdirectory(baseband)
+add_subdirectory(standalone)
 add_subdirectory(test)

 # NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
@@ -63,7 +64,7 @@ add_custom_command(

 add_custom_target(
 	firmware
-	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME}
+	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME} ${HACKRF_FIRMWARE_FILENAME}
 )

 if(${GCC_VERSION_MISMATCH})
@@ -88,7 +89,7 @@ add_custom_target(
 	program-external-apps
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	COMMAND ${PROJECT_SOURCE_DIR}/tools/copy_external_apps.sh
-	DEPENDS program
+	DEPENDS program standalone_apps
 )

 add_custom_command(
@@ -100,8 +101,9 @@ add_custom_command(
 	COMMAND cp ${FIRMWARE_FILENAME} firmware_tar/FIRMWARE/portapack-mayhem_${VERSION_NOHASH}.bin
 	COMMAND mkdir -p firmware_tar/APPS
 	COMMAND cp application/*.ppma firmware_tar/APPS
+	COMMAND cp standalone/*/*.ppmp firmware_tar/APPS
 	COMMAND cd firmware_tar && tar -cvaf ../${PPFW_FILENAME} *
-	DEPENDS firmware ${FIRMWARE_FILENAME}
+	DEPENDS firmware ${FIRMWARE_FILENAME} standalone_apps
 	# Dont use VERBATIM here as it prevents usage of globbing (*)
 	# There shouldnt be any funny business in the filenames above :)
 )
@@ -117,6 +117,7 @@ set(CSRC
 	usb_serial_descriptor.c
 	usb_serial_endpoints.c
 	usb_serial_device_to_host.c
+	i2c_device_to_host.c
 	${HACKRF_PATH}/firmware/common/usb.c
 	${HACKRF_PATH}/firmware/common/usb_queue.c
 	${HACKRF_PATH}/firmware/hackrf_usb/usb_device.c
@@ -125,12 +126,14 @@ set(CSRC
 	${CHIBIOS}/os/various/chprintf.c
 )

+#look for all i2cdev_ files
+file(GLOB I2CDEV_SOURCES ${COMMON}/i2cdev_*.cpp)
+
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 set(CPPSRC
 	main.cpp
 	shell.cpp
-	${COMMON}/acars_packet.cpp
 	${COMMON}/adsb.cpp
 	${COMMON}/adsb_frame.cpp
 	${COMMON}/ais_baseband.cpp
@@ -176,7 +179,8 @@ set(CPPSRC
 	${COMMON}/ui_language.cpp
 	${COMMON}/utility.cpp
 	${COMMON}/wm8731.cpp
-	${COMMON}/ads1110.cpp
+	${COMMON}/i2cdevmanager.cpp
+	${I2CDEV_SOURCES}
 	${COMMON}/battery.cpp
 	${COMMON}/performance_counter.cpp
 	${COMMON}/bmpfile.cpp
@@ -188,7 +192,6 @@ set(CPPSRC
 	core_control.cpp
 	database.cpp
 	de_bruijn.cpp
-	#emu_cc1101.cpp
 	rfm69.cpp
 	event_m0.cpp
 	file_reader.cpp
@@ -205,6 +208,7 @@ set(CPPSRC
 	irq_rtc.cpp
 	log_file.cpp
 	metadata_file.cpp
+	flipper_subfile.cpp
 	portapack.cpp
 	usb_serial_shell.cpp
 	usb_serial_shell_filesystem.cpp
@@ -225,6 +229,7 @@ set(CPPSRC
 	spectrum_color_lut.cpp
 	string_format.cpp
 	temperature_logger.cpp
+	theme.cpp
 	touch.cpp
 	tone_key.cpp
 	transmitter_model.cpp
@@ -239,9 +244,9 @@ set(CPPSRC
 	hw/si5351.cpp
 	hw/spi_pp.cpp
 	hw/touch_adc.cpp
+	ook_file.cpp
 	ui_baseband_stats_view.cpp
 	ui_navigation.cpp
-	ui_playdead.cpp
 	ui_record_view.cpp
 	ui_sd_card_status_view.cpp
 	ui/ui_alphanum.cpp
@@ -258,61 +263,46 @@ set(CPPSRC
 	ui/ui_freqlist.cpp
 	ui/ui_tv.cpp
 	ui/ui_spectrum.cpp
-	ui/ui_styles.cpp
 	ui/ui_tabview.cpp
 	ui/ui_textentry.cpp
 	ui/ui_tone_key.cpp
 	ui/ui_transmitter.cpp
 	ui/ui_bmpview.cpp
-	apps/acars_app.cpp
 	apps/ais_app.cpp
 	apps/analog_audio_app.cpp
-	# apps/analog_tv_app.cpp
 	apps/ble_comm_app.cpp
 	apps/ble_rx_app.cpp
 	apps/ble_tx_app.cpp
 	apps/capture_app.cpp
 	apps/ert_app.cpp
-	# apps/gps_sim_app.cpp
-	# apps/lge_app.cpp
 	apps/pocsag_app.cpp
-	# apps/replay_app.cpp
 	apps/soundboard_app.cpp
-	# apps/tpms_app.cpp
 	apps/ui_about_simple.cpp
 	apps/ui_adsb_rx.cpp
-	apps/ui_adsb_tx.cpp
 	apps/ui_aprs_rx.cpp
 	apps/ui_aprs_tx.cpp
 	apps/ui_battinfo.cpp
 	apps/ui_bht_tx.cpp
 	apps/ui_bmp_file_viewer.cpp
 	apps/ui_btle_rx.cpp
-	# apps/ui_coasterp.cpp
 	apps/ui_debug.cpp
+	apps/ui_debug_max17055.cpp
 	apps/ui_dfu_menu.cpp
 	apps/ui_encoders.cpp
+	apps/ui_external_module_view.cpp
 	apps/ui_fileman.cpp
 	apps/ui_flash_utility.cpp
 	apps/ui_freqman.cpp
-	apps/ui_fsk_rx.cpp
 	apps/ui_iq_trim.cpp
-	# apps/ui_jammer.cpp
-    # apps/ui_keyfob.cpp
-	# apps/ui_lcr.cpp
 	apps/ui_level.cpp
 	apps/ui_looking_glass_app.cpp
 	apps/ui_mictx.cpp
 	apps/ui_modemsetup.cpp
-	apps/ui_morse.cpp
-	# apps/ui_nrf_rx.cpp
-	# apps/ui_nuoptix.cpp
 	apps/ui_playlist.cpp
 	apps/ui_pocsag_tx.cpp
 	apps/ui_rds.cpp
 	apps/ui_recon_settings.cpp
 	apps/ui_recon.cpp
-	apps/ui_remote.cpp
 	apps/ui_scanner.cpp
 	apps/ui_sd_over_usb.cpp
 	apps/ui_sd_wipe.cpp
@@ -320,15 +310,11 @@ set(CPPSRC
 	apps/ui_settings.cpp
 	apps/ui_siggen.cpp
 	apps/ui_sonde.cpp
-	# apps/ui_spectrum_painter_image.cpp
-	# apps/ui_spectrum_painter_text.cpp
-	# apps/ui_spectrum_painter.cpp
 	apps/ui_ss_viewer.cpp
-	apps/ui_sstvtx.cpp
+	apps/ui_standalone_view.cpp
 	apps/ui_subghzd.cpp
 	# apps/ui_test.cpp
 	apps/ui_text_editor.cpp
-	apps/ui_tone_search.cpp
 	apps/ui_touch_calibration.cpp
 	apps/ui_touchtunes.cpp
 	apps/ui_view_wav.cpp
@@ -339,14 +325,8 @@ set(CPPSRC
 	protocols/bht.cpp
 	protocols/dcs.cpp
 	protocols/encoders.cpp
-	# protocols/lcr.cpp
 	protocols/modems.cpp
 	protocols/rds.cpp
-	# ui_handwrite.cpp
-	# ui_loadmodule.cpp
-	# ui_numbers.cpp
-	# ui_replay_view.cpp
-	# ui_script.cpp
 	ui_sd_card_debug.cpp
 	config_mode.cpp
 	${CPLD_20150901_DATA_CPP}
@@ -507,6 +487,7 @@ include_directories(. ${INCDIR})
 link_directories(${LLIBDIR})
 target_link_libraries(${PROJECT_NAME}.elf ${LIBS} "-L${CMAKE_CURRENT_LIST_DIR}/external")
 target_link_libraries(${PROJECT_NAME}.elf -Wl,-Map=${PROJECT_NAME}.map)
+target_link_libraries(${PROJECT_NAME}.elf -Wl,--print-memory-usage)

 add_custom_command(
 	OUTPUT ${PROJECT_NAME}.bin
@@ -39,8 +39,6 @@ namespace ui {

 /* AMOptionsView *********************************************************/

-static const Style& style_options_group = Styles::bg_blue;
-
 AMOptionsView::AMOptionsView(
    Rect parent_rect,
    const Style* style)
@@ -297,13 +295,13 @@ void AnalogAudioView::set_options_widget(std::unique_ptr<Widget> new_widget) {
        options_widget = std::move(new_widget);
    } else {
        // TODO: Lame hack to hide options view due to my bad paint/damage algorithm.
-        options_widget = std::make_unique<Rectangle>(options_view_rect, style_options_group.background);
+        options_widget = std::make_unique<Rectangle>(options_view_rect, Theme::getInstance()->option_active->background);
    }
    add_child(options_widget.get());
 }

 void AnalogAudioView::on_show_options_frequency() {
-    auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, &style_options_group);
+    auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, Theme::getInstance()->option_active);

    widget->set_step(receiver_model.frequency_step());
    widget->on_change_step = [this](rf::Frequency f) {
@@ -315,14 +313,14 @@ void AnalogAudioView::on_show_options_frequency() {
    };

    set_options_widget(std::move(widget));
-    field_frequency.set_style(&style_options_group);
+    field_frequency.set_style(Theme::getInstance()->option_active);
 }

 void AnalogAudioView::on_show_options_rf_gain() {
-    auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, &style_options_group);
+    auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, Theme::getInstance()->option_active);

    set_options_widget(std::move(widget));
-    field_lna.set_style(&style_options_group);
+    field_lna.set_style(Theme::getInstance()->option_active);
 }

 void AnalogAudioView::on_show_options_modulation() {
@@ -331,25 +329,25 @@ void AnalogAudioView::on_show_options_modulation() {
    const auto modulation = receiver_model.modulation();
    switch (modulation) {
        case ReceiverModel::Mode::AMAudio:
-            widget = std::make_unique<AMOptionsView>(options_view_rect, &style_options_group);
+            widget = std::make_unique<AMOptionsView>(options_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(false);
            text_ctcss.hidden(true);
            break;

        case ReceiverModel::Mode::NarrowbandFMAudio:
-            widget = std::make_unique<NBFMOptionsView>(nbfm_view_rect, &style_options_group);
+            widget = std::make_unique<NBFMOptionsView>(nbfm_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(false);
            text_ctcss.hidden(false);
            break;

        case ReceiverModel::Mode::WidebandFMAudio:
-            widget = std::make_unique<WFMOptionsView>(options_view_rect, &style_options_group);
+            widget = std::make_unique<WFMOptionsView>(options_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(true);
            text_ctcss.hidden(true);
            break;

        case ReceiverModel::Mode::SpectrumAnalysis:
-            widget = std::make_unique<SPECOptionsView>(this, nbfm_view_rect, &style_options_group);
+            widget = std::make_unique<SPECOptionsView>(this, nbfm_view_rect, Theme::getInstance()->option_active);
            waterfall.show_audio_spectrum_view(false);
            text_ctcss.hidden(true);
            break;
@@ -360,7 +358,7 @@ void AnalogAudioView::on_show_options_modulation() {
    }

    set_options_widget(std::move(widget));
-    options_modulation.set_style(&style_options_group);
+    options_modulation.set_style(Theme::getInstance()->option_active);
 }

 void AnalogAudioView::on_frequency_step_changed(rf::Frequency f) {
@@ -437,4 +435,7 @@ void AnalogAudioView::handle_coded_squelch(uint32_t value) {
    text_ctcss.set(tone_key_string_by_value(value, text_ctcss.parent_rect().width() / 8));
 }

+void AnalogAudioView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
 } /* namespace ui */
@@ -29,7 +29,6 @@
 #include "ui_freq_field.hpp"
 #include "ui_spectrum.hpp"
 #include "ui_record_view.hpp"
-#include "ui_styles.hpp"
 #include "app_settings.hpp"
 #include "radio_state.hpp"
 #include "tone_key.hpp"
@@ -248,12 +247,21 @@ class AnalogAudioView : public View {

    void handle_coded_squelch(uint32_t value);

+    void on_freqchg(int64_t freq);
+
    MessageHandlerRegistration message_handler_coded_squelch{
        Message::ID::CodedSquelch,
        [this](const Message* p) {
            const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
            this->handle_coded_squelch(message.value);
        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
 };

 } /* namespace ui */
@@ -148,13 +148,13 @@ class BLECommView : public View {
        {24 * 8, 5, 6 * 8, 4}};

    Labels label_send_adv{
-        {{0 * 8, 2 * 8}, "Send Advertisement:", Color::light_grey()}};
+        {{0 * 8, 2 * 8}, "Send Advertisement:", Theme::getInstance()->fg_light->foreground}};

    ImageButton button_send_adv{
        {21 * 8, 1 * 16, 10 * 8, 2 * 16},
        &bitmap_play,
-        Color::green(),
-        Color::black()};
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};

    Checkbox check_log{
        {24 * 8, 2 * 8},
@@ -163,7 +163,7 @@ class BLECommView : public View {
        true};

    Labels label_packets_sent{
-        {{0 * 8, 4 * 8}, "Packets Left:", Color::light_grey()}};
+        {{0 * 8, 4 * 8}, "Packets Left:", Theme::getInstance()->fg_light->foreground}};

    Text text_packets_sent{
        {13 * 8, 2 * 16, 12 * 8, 16},
@@ -428,6 +428,7 @@ BLERxView::BLERxView(NavigationView& nav)
                  &text_found_count,
                  &check_serial_log,
                  &button_filter,
+                  &options_filter,
                  &button_save_list,
                  &button_clear_list,
                  &button_switch,
@@ -499,6 +500,7 @@ BLERxView::BLERxView(NavigationView& nav)

    check_name.on_select = [this](Checkbox&, bool v) {
        name_enable = v;
+        // update the include_name instance variable value of each entry in recent entries
        setAllMembersToValue(recent, &BleRecentEntry::include_name, v);
        recent_entries_view.set_dirty();
    };
@@ -525,8 +527,14 @@ BLERxView::BLERxView(NavigationView& nav)
        handle_entries_sort(v);
    };

+    options_filter.on_change = [this](size_t index, int32_t v) {
+        filter_index = (uint8_t)index;
+        handle_filter_options(v);
+    };
+
    options_channel.set_selected_index(channel_index, true);
    options_sort.set_selected_index(sort_index, true);
+    options_filter.set_selected_index(filter_index, true);

    button_find.on_select = [this](Button&) {
        auto open_view = nav_.push<FileLoadView>(".TXT");
@@ -716,10 +724,11 @@ void BLERxView::on_data(BlePacketData* packet) {
    updateEntry(packet, entry, (ADV_PDU_TYPE)packet->type);

    // Add entries if they meet the criteria.
-    auto value = filter;
-    resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-        return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
-    });
+    // auto value = filter;
+    // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+    //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+    // });
+    handle_filter_options(options_filter.selected_index());

    handle_entries_sort(options_sort.selected_index());

@@ -756,12 +765,13 @@ void BLERxView::on_data(BlePacketData* packet) {
 void BLERxView::on_filter_change(std::string value) {
    // New filter? Reset list from recent entries.
    if (filter != value) {
-        resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
-            return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
-        });
+        // resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+        //     // return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+        //     return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos) && (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
+        // });
+        filter = value;
+        handle_filter_options(options_filter.selected_index());
    }
-
-    filter = value;
 }

 void BLERxView::on_file_changed(const std::filesystem::path& new_file_path) {
@@ -852,6 +862,24 @@ void BLERxView::handle_entries_sort(uint8_t index) {
    recent_entries_view.set_dirty();
 }

+void BLERxView::handle_filter_options(uint8_t index) {
+    auto value = filter;
+    switch (index) {
+        case 0:  // filter by Data
+            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+                return (entry.dataString.find(value) == std::string::npos) && (entry.nameString.find(value) == std::string::npos);
+            });
+            break;
+        case 1:  // filter by MAC address (All caps: e.g. AA:BB:CC:DD:EE:FF)
+            resetFilteredEntries(recent, [&value](const BleRecentEntry& entry) {
+                return (to_string_mac_address(entry.packetData.macAddress, 6, false).find(value) == std::string::npos);
+            });
+            break;
+        default:
+            break;
+    }
+}
+
 void BLERxView::set_parent_rect(const Rect new_parent_rect) {
    View::set_parent_rect(new_parent_rect);
    const Rect content_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height - switch_button_height};
@@ -914,6 +942,7 @@ void BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,

            // Subtract 1 because type is part of the length.
            for (int i = 0; i < length - 1; i++) {
+                // parse the name of bluetooth device: 0x08->Shortened Local Name; 0x09->Complete Local Name
                if (type == 0x08 || type == 0x09) {
                    decoded_data += (char)advertiseData->Data[currentByte];
                }
@@ -139,23 +139,23 @@ class BleRecentEntryDetailView : public View {
    static constexpr uint8_t total_data_lines{5};

    Labels label_mac_address{
-        {{0 * 8, 0 * 16}, "Mac Address:", Color::light_grey()}};
+        {{0 * 8, 0 * 16}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};

    Text text_mac_address{
        {12 * 8, 0 * 16, 17 * 8, 16},
        "-"};

    Labels label_pdu_type{
-        {{0 * 8, 1 * 16}, "PDU Type:", Color::light_grey()}};
+        {{0 * 8, 1 * 16}, "PDU Type:", Theme::getInstance()->fg_light->foreground}};

    Text text_pdu_type{
        {9 * 8, 1 * 16, 17 * 8, 16},
        "-"};

    Labels labels{
-        {{0 * 8, 3 * 16}, "Len", Color::light_grey()},
-        {{5 * 8, 3 * 16}, "Type", Color::light_grey()},
-        {{10 * 8, 3 * 16}, "Value", Color::light_grey()},
+        {{0 * 8, 3 * 16}, "Len", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, 3 * 16}, "Type", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, 3 * 16}, "Value", Theme::getInstance()->fg_light->foreground},
    };

    Button button_send{
@@ -203,6 +203,7 @@ class BLERxView : public View {
    void file_error();
    void on_timer();
    void handle_entries_sort(uint8_t index);
+    void handle_filter_options(uint8_t index);
    void updateEntry(const BlePacketData* packet, BleRecentEntry& entry, ADV_PDU_TYPE pdu_type);

    NavigationView& nav_;
@@ -214,6 +215,7 @@ class BLERxView : public View {

    uint8_t channel_index{0};
    uint8_t sort_index{0};
+    uint8_t filter_index{0};
    std::string filter{};
    bool logging{false};
    bool serial_logging{false};
@@ -227,6 +229,7 @@ class BLERxView : public View {
            {"sort_index"sv, &sort_index},
            {"filter"sv, &filter},
            {"log"sv, &logging},
+            {"filter_index"sv, &filter_index},
            // disabled to always start without USB serial activated until we can make it non blocking if not connected
            // {"serial_log"sv, &serial_logging},
            {"name"sv, &name_enable},
@@ -255,13 +258,13 @@ class BLERxView : public View {
    std::filesystem::path log_packets_path{blerx_dir / u"Logs/????.TXT"};
    std::filesystem::path packet_save_path{blerx_dir / u"Lists/????.csv"};

-    static constexpr auto header_height = 4 * 16;
+    static constexpr auto header_height = 9 * 8;
    static constexpr auto switch_button_height = 3 * 16;

    OptionsField options_channel{
        {0 * 8, 0 * 8},
        5,
-        {{"Ch.37 ", 37},
+        {{"Ch.37", 37},
         {"Ch.38", 38},
         {"Ch.39", 39},
         {"Auto", 40}}};
@@ -286,10 +289,10 @@ class BLERxView : public View {
        {24 * 8, 5, 6 * 8, 4}};

    Labels label_sort{
-        {{0 * 8, 3 * 8}, "Sort:", Color::light_grey()}};
+        {{0 * 8, 2 * 8}, "Sort:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_sort{
-        {5 * 8, 3 * 8},
+        {5 * 8, 2 * 8},
        4,
        {{"MAC", 0},
         {"Hits", 1},
@@ -298,40 +301,46 @@ class BLERxView : public View {
         {"Name", 4}}};

    Button button_filter{
-        {11 * 8, 3 * 8, 4 * 8, 16},
-        "Filter"};
+        {11 * 8, 2 * 8, 7 * 8, 16},
+        "Filter:"};
+
+    OptionsField options_filter{
+        {18 * 8 + 2, 2 * 8},
+        4,
+        {{"Data", 0},
+         {"MAC", 1}}};

    Checkbox check_log{
-        {17 * 8, 3 * 8},
+        {10 * 8, 4 * 8 + 2},
        3,
        "Log",
        true};

    Checkbox check_name{
-        {23 * 8, 3 * 8},
+        {0 * 8, 4 * 8 + 2},
        3,
        "Name",
        true};

    Button button_find{
-        {0 * 8, 6 * 8, 4 * 8, 16},
+        {0 * 8, 7 * 8 - 2, 4 * 8, 16},
        "Find"};

    Labels label_found{
-        {{5 * 8, 6 * 8}, "Found:", Color::light_grey()}};
+        {{5 * 8, 7 * 8 - 2}, "Found:", Theme::getInstance()->fg_light->foreground}};

    Text text_found_count{
-        {11 * 8, 3 * 16, 20 * 8, 16},
+        {11 * 8, 7 * 8 - 2, 20 * 8, 16},
        "0/0"};

    Checkbox check_serial_log{
-        {17 * 8, 3 * 16 - 2},
+        {18 * 8 + 2, 4 * 8 + 2},
        7,
        "USB Log",
        true};

-    Console console{
-        {0, 4 * 16, 240, 240}};
+    // Console console{
+    //     {0, 10 * 8, 240, 240}};

    Button button_clear_list{
        {2 * 8, 320 - (16 + 32), 7 * 8, 32},
@@ -371,7 +380,7 @@ class BLERxView : public View {
        [this](const Message* const) {
            this->on_timer();
        }};
-};
+}; /* BLERxView */

 } /* namespace ui */

@@ -218,11 +218,11 @@ class BLETxView : public View {
    ImageButton button_play{
        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
        &bitmap_play,
-        Color::green(),
-        Color::black()};
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};

    Labels label_speed{
-        {{0 * 8, 6 * 8}, "Speed:", Color::light_grey()}};
+        {{0 * 8, 6 * 8}, "Speed:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_speed{
        {7 * 8, 6 * 8},
@@ -254,7 +254,7 @@ class BLETxView : public View {
         {"CONNECT_REQ", PKT_TYPE_CONNECT_REQ}}};

    Labels label_marked_data{
-        {{0 * 8, 4 * 16}, "Marked Data:", Color::light_grey()}};
+        {{0 * 8, 4 * 16}, "Marked Data:", Theme::getInstance()->fg_light->foreground}};

    OptionsField marked_data_sequence{
        {12 * 8, 8 * 8},
@@ -264,28 +264,28 @@ class BLETxView : public View {
         {"Random", 2}}};

    Labels label_packet_index{
-        {{0 * 8, 12 * 8}, "Packet Index:", Color::light_grey()}};
+        {{0 * 8, 12 * 8}, "Packet Index:", Theme::getInstance()->fg_light->foreground}};

    Text text_packet_index{
        {13 * 8, 6 * 16, 12 * 8, 16},
        "-"};

    Labels label_packets_sent{
-        {{0 * 8, 14 * 8}, "Repeat Count:", Color::light_grey()}};
+        {{0 * 8, 14 * 8}, "Repeat Count:", Theme::getInstance()->fg_light->foreground}};

    Text text_packets_sent{
        {13 * 8, 7 * 16, 12 * 8, 16},
        "-"};

    Labels label_mac_address{
-        {{0 * 8, 16 * 8}, "Mac Address:", Color::light_grey()}};
+        {{0 * 8, 16 * 8}, "Mac Address:", Theme::getInstance()->fg_light->foreground}};

    Text text_mac_address{
        {12 * 8, 8 * 16, 20 * 8, 16},
        "-"};

    Labels label_data_packet{
-        {{0 * 8, 9 * 16}, "Packet Data:", Color::light_grey()}};
+        {{0 * 8, 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};

    Console console{
        {0, 9 * 18, 240, 240}};
@@ -87,9 +87,12 @@ CaptureAppView::CaptureAppView(NavigationView& nav)
        auto anti_alias_filter_bandwidth = filter_bandwidth_for_sampling_rate(actual_sample_rate);
        receiver_model.set_baseband_bandwidth(anti_alias_filter_bandwidth);

-        // Automatically switch default capture format to C8 when bandwidth setting is increased to >=1.5MHz
+        // Automatically switch default capture format to C8 when bandwidth setting is increased to >=1.5MHz anb back to C16 for <=1,25Mhz
        if ((bandwidth >= 1500000) && (previous_bandwidth < 1500000)) {
-            option_format.set_selected_index(1);
+            option_format.set_selected_index(1);  // Default C8 format for REC, 1500K ... 5500k
+        }
+        if ((bandwidth <= 1250000) && (previous_bandwidth > 1250000)) {
+            option_format.set_selected_index(0);  // Default C16 format for REC , 12k5 ... 1250K
        }
        previous_bandwidth = bandwidth;

@@ -128,4 +131,8 @@ void CaptureAppView::focus() {
    record_view.focus();
 }

+void CaptureAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
 } /* namespace ui */
@@ -56,8 +56,8 @@ class CaptureAppView : public View {
        "rx_capture", app_settings::Mode::RX};

    Labels labels{
-        {{0 * 8, 1 * 16}, "Rate:", Color::light_grey()},
-        {{11 * 8, 1 * 16}, "Format:", Color::light_grey()},
+        {{0 * 8, 1 * 16}, "Rate:", Theme::getInstance()->fg_light->foreground},
+        {{11 * 8, 1 * 16}, "Format:", Theme::getInstance()->fg_light->foreground},
    };

    RSSI rssi{
@@ -108,6 +108,15 @@ class CaptureAppView : public View {
        3};

    spectrum::WaterfallView waterfall{};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    void on_freqchg(int64_t freq);
 };

 } /* namespace ui */
@@ -178,4 +178,8 @@ void ERTAppView::on_show_list() {
    recent_entries_view.focus();
 }

+void ERTAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
 } /* namespace ui */
@@ -176,6 +176,14 @@ class ERTAppView : public View {
            this->on_packet(packet);
        }};

+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    void on_freqchg(int64_t freq);
    void on_packet(const ert::Packet& packet);
    void on_show_list();
 };
@@ -163,8 +163,8 @@ void POCSAGAppView::refresh_ui() {
    // Set console font style.
    console.set_style(
        settings_.enable_small_font
-            ? &Styles::white_small
-            : &Styles::white);
+            ? Theme::getInstance()->bg_darkest_small
+            : Theme::getInstance()->bg_darkest);

    // Update filter button text.
    std::string btn_text = "Filter Last";
@@ -260,19 +260,19 @@ void POCSAGAppView::handle_decoded(Timestamp timestamp, const std::string& prefi

 static Color get_status_color(const POCSAGState& state) {
    if (state.out_type == IDLE)
-        return Color::white();
+        return Theme::getInstance()->bg_darkest->foreground;

    switch (state.mode) {
        case STATE_CLEAR:
-            return Color::cyan();
+            return Theme::getInstance()->fg_cyan->foreground;
        case STATE_HAVE_ADDRESS:
-            return Color::yellow();
+            return Theme::getInstance()->fg_yellow->foreground;
        case STATE_GETTING_MSG:
-            return Color::green();
+            return Theme::getInstance()->fg_green->foreground;
    }

    // Shouldn't get here...
-    return Color::red();
+    return Theme::getInstance()->fg_red->foreground;
 }

 void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
@@ -294,7 +294,7 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage* message) {
        last_address = 0;
    } else {
        // Set color before to be able to see if decode gets stuck.
-        image_status.set_foreground(Color::magenta());
+        image_status.set_foreground(Theme::getInstance()->fg_magenta->foreground);
        pocsag_state.codeword_index = 0;
        pocsag_state.errors = 0;

@@ -321,6 +321,10 @@ void POCSAGAppView::on_stats(const POCSAGStatsMessage* stats) {
    widget_frames.set_sync(stats->has_sync);
 }

+void POCSAGAppView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
 void BaudIndicator::paint(Painter& painter) {
    auto p = screen_pos();
    char top = '-';
@@ -332,8 +336,8 @@ void BaudIndicator::paint(Painter& painter) {
        bot = (r % 10) + '0';
    }

-    painter.draw_char(p, Styles::white_small, top);
-    painter.draw_char({p.x(), p.y() + 8}, Styles::white_small, bot);
+    painter.draw_char(p, *Theme::getInstance()->bg_darkest_small, top);
+    painter.draw_char({p.x(), p.y() + 8}, *Theme::getInstance()->bg_darkest_small, bot);
 }

 void BitsIndicator::paint(Painter&) {
@@ -343,17 +347,17 @@ void BitsIndicator::paint(Painter&) {

        int x = p.x() + (i / height);
        int y = p.y() + (i % height);
-        display.draw_pixel({x, y}, is_set ? Color::white() : Color::black());
+        display.draw_pixel({x, y}, is_set ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background);
    }
 }

 void FrameIndicator::paint(Painter& painter) {
    auto p = screen_pos();
-    painter.draw_rectangle({p, {2, height}}, has_sync_ ? Color::green() : Color::grey());
+    painter.draw_rectangle({p, {2, height}}, has_sync_ ? Theme::getInstance()->fg_green->foreground : Theme::getInstance()->bg_medium->background);

    for (size_t i = 0; i < height; ++i) {
        auto p2 = p + Point{2, 15 - (int)i};
-        painter.draw_hline(p2, 2, i < frame_count_ ? Color::white() : Color::black());
+        painter.draw_hline(p2, 2, i < frame_count_ ? Theme::getInstance()->bg_darkest->foreground : Theme::getInstance()->bg_darkest->background);
    }
 }

@@ -27,7 +27,6 @@
 #include "ui_freq_field.hpp"
 #include "ui_receiver.hpp"
 #include "ui_rssi.hpp"
-#include "ui_styles.hpp"

 #include "app_settings.hpp"
 #include "log_file.hpp"
@@ -141,8 +140,8 @@ class POCSAGSettingsView : public View {
    POCSAGSettings& settings_;

    Labels labels{
-        {{2 * 8, 12 * 16}, "Filter Mode:", Color::light_grey()},
-        {{2 * 8, 13 * 16}, "Filter Addr:", Color::light_grey()},
+        {{2 * 8, 12 * 16}, "Filter Mode:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 13 * 16}, "Filter Addr:", Theme::getInstance()->fg_light->foreground},
    };

    Checkbox check_log{
@@ -265,8 +264,8 @@ class POCSAGAppView : public View {
    Image image_status{
        {0 * 8 + 4, 1 * 16 + 2, 16, 16},
        &bitmap_icon_pocsag,
-        Color::white(),
-        Color::black()};
+        Theme::getInstance()->bg_darkest->foreground,
+        Theme::getInstance()->bg_darkest->background};

    Text text_packet_count{
        {3 * 8, 1 * 16 + 2, 5 * 8, 16},
@@ -293,6 +292,15 @@ class POCSAGAppView : public View {
    Console console{
        {0, 2 * 16 + 6, screen_width, screen_height - 54}};

+    void on_freqchg(int64_t freq);
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
    MessageHandlerRegistration message_handler_packet{
        Message::ID::POCSAGPacket,
        [this](Message* const p) {
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- * Copyleft  (ↄ) 2022 NotPike
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "replay_app.hpp"
-#include "string_format.hpp"
-
-#include "ui_fileman.hpp"
-#include "io_file.hpp"
-#include "io_convert.hpp"
-
-#include "baseband_api.hpp"
-#include "metadata_file.hpp"
-#include "portapack.hpp"
-#include "portapack_persistent_memory.hpp"
-#include "utility.hpp"
-
-using namespace portapack;
-namespace fs = std::filesystem;
-
-namespace ui {
-
-void ReplayAppView::set_ready() {
-    ready_signal = true;
-}
-
-void ReplayAppView::on_file_changed(const fs::path& new_file_path) {
-    file_path = new_file_path;
-    File::Size file_size{};
-
-    {  // Get the size of the data file.
-        File data_file;
-        auto error = data_file.open(file_path);
-        if (error) {
-            file_error();
-            return;
-        }
-
-        file_size = data_file.size();
-    }
-
-    // Get original record frequency if available.
-    auto metadata_path = get_metadata_path(file_path);
-    auto metadata = read_metadata_file(metadata_path);
-
-    if (metadata) {
-        field_frequency.set_value(metadata->center_frequency);
-        sample_rate = metadata->sample_rate;
-    } else {
-        // TODO: This is interesting because it implies that the
-        // The capture will just be replayed at the freq set on the
-        // FrequencyField. Is that an intentional behavior?
-        sample_rate = 500000;
-    }
-
-    // UI Fixup.
-    text_sample_rate.set(unit_auto_scale(sample_rate, 3, 0) + "Hz");
-    progressbar.set_max(file_size);
-    text_filename.set(truncate(file_path.filename().string(), 12));
-
-    uint8_t sample_size = capture_file_sample_size(current()->path);
-    auto duration = ms_duration(file_size, sample_rate, sample_size);
-    text_duration.set(to_string_time_ms(duration));
-
-    button_play.focus();
-}
-
-void ReplayAppView::on_tx_progress(const uint32_t progress) {
-    progressbar.set_value(progress);
-}
-
-void ReplayAppView::focus() {
-    button_open.focus();
-}
-
-void ReplayAppView::file_error() {
-    nav_.display_modal("Error", "File read error.");
-}
-
-bool ReplayAppView::is_active() const {
-    return (bool)replay_thread;
-}
-
-void ReplayAppView::toggle() {
-    if (is_active()) {
-        stop(false);
-    } else {
-        start();
-    }
-}
-
-void ReplayAppView::start() {
-    stop(false);
-
-    std::unique_ptr<stream::Reader> reader;
-
-    auto p = std::make_unique<FileConvertReader>();
-    auto open_error = p->open(file_path);
-    if (open_error.is_valid()) {
-        file_error();
-        return;  // Fixes TX bug if there's a file error
-    } else {
-        reader = std::move(p);
-    }
-
-    if (reader) {
-        button_play.set_bitmap(&bitmap_stop);
-        baseband::set_sample_rate(sample_rate, OversampleRate::x8);
-
-        replay_thread = std::make_unique<ReplayThread>(
-            std::move(reader),
-            read_size, buffer_count,
-            &ready_signal,
-            [](uint32_t return_code) {
-                ReplayThreadDoneMessage message{return_code};
-                EventDispatcher::send_message(message);
-            });
-    }
-
-    transmitter_model.set_sampling_rate(sample_rate * toUType(OversampleRate::x8));
-    transmitter_model.set_baseband_bandwidth(baseband_bandwidth);
-    transmitter_model.enable();
-
-    if (portapack::persistent_memory::stealth_mode()) {
-        DisplaySleepMessage message;
-        EventDispatcher::send_message(message);
-    }
-}
-
-void ReplayAppView::stop(const bool do_loop) {
-    if (is_active())
-        replay_thread.reset();
-
-    if (do_loop && check_loop.value()) {
-        start();
-    } else {
-        transmitter_model.disable();
-        button_play.set_bitmap(&bitmap_play);
-    }
-
-    ready_signal = false;
-}
-
-void ReplayAppView::handle_replay_thread_done(const uint32_t return_code) {
-    if (return_code == ReplayThread::END_OF_FILE) {
-        stop(true);
-    } else if (return_code == ReplayThread::READ_ERROR) {
-        stop(false);
-        file_error();
-    }
-
-    progressbar.set_value(0);
-}
-
-ReplayAppView::ReplayAppView(
-    NavigationView& nav)
-    : nav_(nav) {
-    baseband::run_image(portapack::spi_flash::image_tag_replay);
-
-    add_children({
-        &button_open,
-        &text_filename,
-        &text_sample_rate,
-        &text_duration,
-        &progressbar,
-        &field_frequency,
-        &tx_view,  // now it handles previous rfgain, rfamp.
-        &check_loop,
-        &button_play,
-        &waterfall,
-    });
-
-    button_play.on_select = [this](ImageButton&) {
-        this->toggle();
-    };
-
-    button_open.on_select = [this, &nav](Button&) {
-        auto open_view = nav.push<FileLoadView>(".C*");
-        open_view->on_changed = [this](fs::path new_file_path) {
-            on_file_changed(new_file_path);
-        };
-    };
-}
-
-ReplayAppView::~ReplayAppView() {
-    transmitter_model.disable();
-    baseband::shutdown();
-}
-
-void ReplayAppView::on_hide() {
-    stop(false);
-    // TODO: Terrible kludge because widget system doesn't notify Waterfall that
-    // it's being shown or hidden.
-    waterfall.on_hide();
-    View::on_hide();
-}
-
-void ReplayAppView::set_parent_rect(const Rect new_parent_rect) {
-    View::set_parent_rect(new_parent_rect);
-
-    const ui::Rect waterfall_rect{0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height};
-    waterfall.set_parent_rect(waterfall_rect);
-}
-
-} /* namespace ui */
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2016 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __REPLAY_APP_HPP__
-#define __REPLAY_APP_HPP__
-
-#include "app_settings.hpp"
-#include "radio_state.hpp"
-#include "ui_widget.hpp"
-#include "ui_navigation.hpp"
-#include "ui_receiver.hpp"
-#include "ui_freq_field.hpp"
-#include "replay_thread.hpp"
-#include "ui_spectrum.hpp"
-#include "ui_transmitter.hpp"
-
-#include <string>
-#include <memory>
-
-namespace ui {
-
-class ReplayAppView : public View {
-   public:
-    ReplayAppView(NavigationView& nav);
-    ~ReplayAppView();
-
-    void on_hide() override;
-    void set_parent_rect(const Rect new_parent_rect) override;
-    void focus() override;
-
-    std::string title() const override { return "Replay"; };
-
-   private:
-    NavigationView& nav_;
-    TxRadioState radio_state_{};
-    app_settings::SettingsManager settings_{
-        "tx_replay", app_settings::Mode::TX};
-
-    static constexpr ui::Dim header_height = 3 * 16;
-
-    uint32_t sample_rate = 0;
-    int32_t tx_gain{47};
-    bool rf_amp{true};  // aux private var to store temporal, Replay App rf_amp user selection.
-    static constexpr uint32_t baseband_bandwidth = 2500000;
-    const size_t read_size{16384};
-    const size_t buffer_count{3};
-
-    void on_file_changed(const std::filesystem::path& new_file_path);
-    void on_tx_progress(const uint32_t progress);
-
-    void toggle();
-    void start();
-    void stop(const bool do_loop);
-    bool is_active() const;
-    void set_ready();
-    void handle_replay_thread_done(const uint32_t return_code);
-    void file_error();
-
-    std::filesystem::path file_path{};
-    std::unique_ptr<ReplayThread> replay_thread{};
-    bool ready_signal{false};
-
-    Button button_open{
-        {0 * 8, 0 * 16, 10 * 8, 2 * 16},
-        "Open file"};
-
-    Text text_filename{
-        {11 * 8, 0 * 16, 12 * 8, 16},
-        "-"};
-    Text text_sample_rate{
-        {24 * 8, 0 * 16, 6 * 8, 16},
-        "-"};
-
-    Text text_duration{
-        {11 * 8, 1 * 16, 6 * 8, 16},
-        "-"};
-    ProgressBar progressbar{
-        {18 * 8, 1 * 16, 12 * 8, 16}};
-
-    TxFrequencyField field_frequency{
-        {0 * 8, 2 * 16},
-        nav_};
-
-    TransmitterView2 tx_view{
-        {11 * 8, 2 * 16},
-        /*short_ui*/ true};
-
-    Checkbox check_loop{
-        {21 * 8, 2 * 16},
-        4,
-        "Loop",
-        true};
-    ImageButton button_play{
-        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
-        &bitmap_play,
-        Color::green(),
-        Color::black()};
-
-    spectrum::WaterfallView waterfall{};
-
-    MessageHandlerRegistration message_handler_replay_thread_error{
-        Message::ID::ReplayThreadDone,
-        [this](const Message* const p) {
-            const auto message = *reinterpret_cast<const ReplayThreadDoneMessage*>(p);
-            this->handle_replay_thread_done(message.return_code);
-        }};
-
-    MessageHandlerRegistration message_handler_fifo_signal{
-        Message::ID::RequestSignal,
-        [this](const Message* const p) {
-            const auto message = static_cast<const RequestSignalMessage*>(p);
-            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
-                this->set_ready();
-            }
-        }};
-
-    MessageHandlerRegistration message_handler_tx_progress{
-        Message::ID::TXProgress,
-        [this](const Message* const p) {
-            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
-            this->on_tx_progress(message.progress);
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__REPLAY_APP_HPP__*/
@@ -35,6 +35,8 @@ using namespace portapack;

 namespace ui {

+#define FILE_PER_PAGE 50
+
 bool SoundBoardView::is_active() const {
    return (bool)replay_thread;
 }
@@ -178,9 +180,9 @@ void SoundBoardView::refresh_list() {
                        if ((reader->channels() == 1) && ((reader->bits_per_sample() == 8) || (reader->bits_per_sample() == 16))) {
                            // sounds[c].ms_duration = reader->ms_duration();
                            // sounds[c].path = u"WAV/" + entry.path().native();
-                            if (count >= (page - 1) * 100 && count < page * 100) {
+                            if (count >= (page - 1) * FILE_PER_PAGE && count < page * FILE_PER_PAGE) {
                                file_list.push_back(entry.path());
-                                if (file_list.size() == 100) {
+                                if (file_list.size() == FILE_PER_PAGE) {
                                    page++;
                                    break;
                                }
@@ -214,7 +216,7 @@ void SoundBoardView::refresh_list() {

        for (size_t n = 0; n < file_list.size(); n++) {
            menu_view.add_item({file_list[n].string().substr(0, 30),
-                                ui::Color::dark_magenta(),
+                                ui::Theme::getInstance()->fg_magenta->foreground,
                                nullptr,
                                [this](KeyEvent) {
                                    on_select_entry();
@@ -225,7 +227,7 @@ void SoundBoardView::refresh_list() {
        menu_view.set_highlighted(0);  // Refresh
    }

-    if (file_list.size() < 100) {
+    if (file_list.size() < FILE_PER_PAGE) {
        page = 1;
    }
 }
@@ -92,8 +92,8 @@ class SoundBoardView : public View {
    void on_select_entry();

    Labels labels{
-        {{24 * 8, 180}, "Vol:", Color::light_grey()},
-        {{0, 180}, "Key:", Color::light_grey()}};
+        {{24 * 8, 180}, "Vol:", Theme::getInstance()->fg_light->foreground},
+        {{0, 180}, "Key:", Theme::getInstance()->fg_light->foreground}};

    Button button_next_page{
        {30 * 7, 25 * 8, 10 * 3, 2 * 14},
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "cpld_update.hpp"
-#include "portapack.hpp"
-#include "event_m0.hpp"
-
-#include "ui_about.hpp"
-
-#include "portapack_shared_memory.hpp"
-#include "portapack_persistent_memory.hpp"
-#include "lpc43xx_cpp.hpp"
-
-#include <math.h>
-#include <cstring>
-
-using namespace lpc43xx;
-using namespace portapack;
-
-namespace ui {
-
-// This is pretty much WaterfallView but in the opposite direction
-CreditsWidget::CreditsWidget(
-    Rect parent_rect)
-    : Widget{parent_rect} {
-}
-
-void CreditsWidget::paint(Painter&) {
-}
-
-void CreditsWidget::on_show() {
-    clear();
-
-    const auto screen_r = screen_rect();
-    display.scroll_set_area(screen_r.top(), screen_r.bottom());
-}
-
-void CreditsWidget::on_hide() {
-    display.scroll_disable();
-}
-
-void CreditsWidget::new_row(
-    const std::array<Color, 240>& pixel_row) {
-    // Glitch be here (see comment in main.cpp)
-    const auto draw_y = display.scroll(-1);
-
-    display.draw_pixels(
-        {{0, draw_y - 1}, {240, 1}},
-        pixel_row);
-}
-
-void CreditsWidget::clear() {
-    display.fill_rectangle(
-        screen_rect(),
-        Color::black());
-}
-
-void AboutView::update() {
-    size_t i = 0;
-    std::array<Color, 240> pixel_row;
-
-    slow_down++;
-    if (slow_down % 3 < 2) return;
-
-    if (!timer) {
-        if (loop) {
-            credits_index = 0;
-            loop = false;
-        }
-
-        text = credits[credits_index].text;
-        timer = credits[credits_index].delay;
-        start_pos = credits[credits_index].start_pos;
-
-        if (timer < 0) {
-            timer = 240;
-            loop = true;
-        } else
-            timer += 16;
-
-        render_line = 0;
-        credits_index++;
-    } else
-        timer--;
-
-    if (render_line < 16) {
-        for (const auto c : text) {
-            const auto glyph = style().font.glyph(c);
-
-            const size_t start = (glyph.size().width() / 8) * render_line;
-            for (Dim c = 0; c < glyph.size().width(); c++) {
-                const auto pixel = glyph.pixels()[start + (c >> 3)] & (1U << (c & 0x7));
-                pixel_row[start_pos + i + c] = pixel ? Color::white() : Color::black();
-            }
-
-            const auto advance = glyph.advance();
-            i += advance.x();
-        }
-        render_line++;
-    }
-
-    credits_display.new_row(pixel_row);
-}
-
-AboutView::AboutView(
-    NavigationView& nav) {
-    add_children({&credits_display,
-                  &button_ok});
-
-    button_ok.on_select = [&nav](Button&) {
-        nav.pop();
-    };
-}
-
-void AboutView::focus() {
-    button_ok.focus();
-}
-
-} /* namespace ui */
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_ABOUT_H__
-#define __UI_ABOUT_H__
-
-#include "ui_widget.hpp"
-#include "ui_navigation.hpp"
-
-#include <cstdint>
-
-namespace ui {
-
-class CreditsWidget : public Widget {
-   public:
-    CreditsWidget(Rect parent_rect);
-
-    void on_show() override;
-    void on_hide() override;
-
-    void paint(Painter&) override;
-
-    void new_row(const std::array<Color, 240>& pixel_row);
-
-   private:
-    void clear();
-};
-
-class AboutView : public View {
-   public:
-    AboutView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "About"; };
-
-   private:
-    void update();
-
-    uint8_t credits_index{0};
-    uint8_t render_line{0};
-    Coord start_pos{0};
-    uint8_t slow_down{0};
-    int32_t timer{0};
-    bool loop{false};
-
-    std::string text{};
-
-    typedef struct credits_t {
-        size_t start_pos;
-        std::string text;
-        int32_t delay;
-    } credits_t;
-
-    // TODO: Make this dinamically centered and parse \n as the delay value so it is easy to maintain
-    const credits_t credits[26] = {
-        // 012345678901234567890123456789
-        {60, "PortaPack Mayhem", 0},
-        {60, "PortaPack|HAVOC", 0},
-        {11 * 8, "Gurus  J. Boone", 0},
-        {18 * 8, "M. Ossmann", 16},
-        {11 * 8, "HAVOC  Furrtek", 16},
-        {7 * 8, "POCSAG rx  T. Sailer", 0},
-        {18 * 8, "E. Oenal", 16},
-        {0 * 8, "Radiosonde infos  F4GMU", 0},
-        {18 * 8, "RS1729", 16},
-        {4 * 8, "RDS waveform  C. Jacquet", 16},
-        {7 * 8, "Xy. infos  cLx", 16},
-        {2 * 8, "OOK scan trick  Samy Kamkar", 16},
-        {7 * 8, "World map  NASA", 16},
-        {0 * 8, "TouchTunes infos  Notpike", 16},
-        {4 * 8, "Subaru infos  Tom", 0},
-        {18 * 8, "Wimmenhove", 16},
-        {1 * 8, "GPS,TV,BTLE,NRF  Shao", 24},
-        {6 * 8, "Thanks & donators", 16},
-        {1 * 8, "Rainer Matla     Keld Norman", 0},
-        {1 * 8, " Giorgio C.         DC1RDB", 0},
-        {1 * 8, " Sigmounte           Waax", 0},
-        {1 * 8, " Windyoona         Channels", 0},
-        {1 * 8, "   F4GEV             Pyr3x", 0},
-        {1 * 8, "  HB3YOE", 24},
-        {11 * 8, "MMXVIII", -1}};
-
-    CreditsWidget credits_display{
-        {0, 16, 240, 240}};
-
-    Button button_ok{
-        {72, 272, 96, 24},
-        "OK"};
-
-    MessageHandlerRegistration message_handler_update{
-        Message::ID::DisplayFrameSync,
-        [this](const Message* const) {
-            this->update();
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__UI_ABOUT_H__*/
@@ -1,413 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <ch.h>
-
-#include "demofont.hpp"
-#include "ymdata.hpp"
-
-#include "cpld_update.hpp"
-#include "portapack.hpp"
-#include "audio.hpp"
-#include "event_m0.hpp"
-
-#include "ui_about.hpp"
-#include "touch.hpp"
-#include "sine_table.hpp"
-
-#include "portapack_shared_memory.hpp"
-#include "portapack_persistent_memory.hpp"
-#include "lpc43xx_cpp.hpp"
-
-#include <math.h>
-#include <cstring>
-
-using namespace lpc43xx;
-using namespace portapack;
-
-namespace ui {
-
-void AboutView::on_show() {
-    transmitter_model.set_target_frequency(1337000000);  // TODO: Change
-    transmitter_model.set_baseband_configuration({
-        .mode = 0,
-        .sampling_rate = 1536000,
-        .decimation_factor = 1,
-    });
-    transmitter_model.set_rf_amp(true);
-    transmitter_model.set_lna(40);
-    transmitter_model.set_vga(40);
-    transmitter_model.enable();
-
-    baseband::set_audiotx_data(32, 50, false, 0);
-
-    // audio::headphone::set_volume(volume_t::decibel(0 - 99) + audio::headphone::volume_range().max);
-}
-
-void AboutView::render_video() {
-    uint8_t p, r, luma, chroma, cy;
-    ui::Color cc;
-    char ch;
-    float s;
-
-    // Send framebuffer to LCD. Gotta go fast !
-    display.render_box({30, 112}, {180, 72}, framebuffer);
-
-    // Clear framebuffer to black
-    memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
-
-    // Drum hit palette animation
-    if (drum > 1) drum--;
-
-    // Render copper bars from Y buffer
-    for (p = 0; p < 72; p++) {
-        luma = copperbuffer[p] & 0x0F;  // 0 is transparent
-        if (luma) {
-            chroma = copperbuffer[p] >> 4;
-            cc = ui::Color(std::min((coppercolor[chroma][0] / luma) * drum, 255), std::min((coppercolor[chroma][1] / luma) * drum, 255), std::min((coppercolor[chroma][2] / luma) * drum, 255));
-            for (r = 0; r < 180; r++)
-                framebuffer[(p * 180) + r] = cc;
-        }
-    }
-
-    // Scroll in/out state machine
-    if (anim_state == 0) {
-        // Scroll in
-        if (ofy < 8) {
-            ofy++;
-            anim_state = 0;
-        } else {
-            anim_state = 1;
-        }
-        if (ofx < (int16_t)(180 - (strlen(credits[credits_index].name) * 16) - 8)) {
-            ofx += 8;
-            anim_state = 0;
-        }
-    } else if (anim_state == 1) {
-        // Just wait
-        if (credits_timer == (30 * 3)) {
-            credits_timer = 0;
-            anim_state = 2;
-        } else {
-            credits_timer++;
-        }
-    } else {
-        // Scroll out
-        if (credits[credits_index].change == true) {
-            if (ofy > -24) {
-                ofy--;
-                anim_state = 2;
-            } else {
-                anim_state = 0;
-            }
-        } else {
-            anim_state = 0;
-        }
-        if (ofx < 180) {
-            ofx += 8;
-            anim_state = 2;
-        }
-
-        // Switch to next text
-        if (anim_state == 0) {
-            if (credits_index == 9)
-                credits_index = 0;
-            else
-                credits_index++;
-            ofx = -(strlen(credits[credits_index].name) * 16) - 16;
-        }
-    }
-
-    // Sine text ("role")
-    p = 0;
-    while ((ch = credits[credits_index].role[p])) {
-        draw_demoglyph({(ui::Coord)(8 + (p * 16)), (ui::Coord)(ofy + (sine_table_f32[((p * 16) + (phase >> 5)) & 0xFF] * 8))}, ch, paletteA);
-        p++;
-    }
-
-    // Scroll text (name)
-    p = 0;
-    while ((ch = credits[credits_index].name[p])) {
-        draw_demoglyph({(ui::Coord)(ofx + (p * 16)), 56}, ch, paletteB);
-        p++;
-    }
-
-    // Clear bars Y buffer
-    memset(copperbuffer, 0, 72);
-
-    // Render bars to Y buffer
-    for (p = 0; p < 5; p++) {
-        cy = copperbars[p];
-        for (r = 0; r < 16; r++)
-            copperbuffer[cy + r] = copperluma[r] + (p << 4);
-    }
-
-    // Animate bars positions
-    for (p = 0; p < 5; p++) {
-        s = sine_table_f32[((p * 32) + (phase / 24)) & 0xFF];
-        s += sine_table_f32[((p * 16) + (phase / 35)) & 0xFF];
-        copperbars[p] = 28 + (uint8_t)(s * 14);
-    }
-
-    phase += 128;
-}
-
-void AboutView::draw_demoglyph(ui::Point p, char ch, ui::Color* pal) {
-    uint8_t x, y, c, cl, cr;
-    uint16_t che;
-    int16_t lbx, il;
-
-    // Map ASCII to font bitmap
-    if ((ch >= 32) && (ch < 96))
-        che = char_map[ch - 32];
-    else
-        che = 0xFF;
-
-    if (che < 0xFF) {
-        che = (che * 128) + 48;  // Start in bitmap
-
-        il = (180 * p.y) + p.x;  // Start il framebuffer
-
-        for (y = 0; y < 16; y++) {
-            if (p.y + y >= 72) break;  // Over bottom of framebuffer, abort
-            if (p.y + y >= 0) {
-                for (x = 0; x < 8; x++) {
-                    c = demofont_bin[x + (y * 8) + che];  // Split byte in 2 4BPP pixels
-                    cl = c >> 4;
-                    cr = c & 0x0F;
-                    lbx = p.x + (x * 2);
-                    if (cl && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cl];
-                    lbx++;
-                    il++;
-                    if (cr && (lbx < 180) && (lbx >= 0)) framebuffer[il] = pal[cr];
-                    il++;
-                }
-                il += 180 - 16;
-            } else {
-                il += 180;
-            }
-        }
-    }
-}
-
-void AboutView::render_audio() {
-    uint8_t i, ymdata;
-    uint16_t ym_render_cnt;
-
-    // This is heavily inspired by MAME's ay8910.cpp and the YM2149's datasheet
-
-    // Render 1024 music samples
-    for (ym_render_cnt = 0; ym_render_cnt < 1024; ym_render_cnt++) {
-        // Update registers at 48000/960 = 50Hz
-        if (ym_sample_cnt == 0) {
-            // "Decompress" on the fly and update YM registers
-            for (i = 0; i < 14; i++) {
-                if (!ym_regs[i].cnt) {
-                    // New run
-                    ymdata = ymdata_bin[ym_regs[i].ptr++];
-                    ym_regs[i].cnt = ymdata & 0x7F;
-                    if (ymdata & 0x80) {
-                        ym_regs[i].same = true;
-                        ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
-                    } else {
-                        ym_regs[i].same = false;
-                    }
-                    // Detect drum on channel B
-                    if (i == 3)
-                        if (ym_regs[3].value > 2) drum = 4;
-                }
-                if (ym_regs[i].same == false) {
-                    ym_regs[i].value = ymdata_bin[ym_regs[i].ptr++];
-                    if (i == 13) {
-                        // Update envelope attributes
-                        ym_env_att = (ym_regs[13].value & 4) ? 0x1F : 0x00;
-                        if (!(ym_regs[13].value & 8)) {
-                            ym_env_hold = 1;
-                            ym_env_alt = ym_env_att;
-                        } else {
-                            ym_env_hold = ym_regs[13].value & 1;
-                            ym_env_alt = ym_regs[13].value & 2;
-                        }
-                        // Reset envelope counter
-                        ym_env_step = 0x1F;
-                        ym_env_holding = 0;
-                        ym_env_vol = (ym_env_step ^ ym_env_att);
-                    }
-                }
-                ym_regs[i].cnt--;
-            }
-            ym_frame++;
-        }
-
-        // Square wave oscillators
-        // 2457600/16/48000 = 3.2, but 4 sounds better than 3...
-        for (i = 0; i < 3; i++) {
-            ym_osc_cnt[i] += 4;
-            if (ym_osc_cnt[i] >= (ym_regs[i * 2].value | ((ym_regs[(i * 2) + 1].value & 0x0f) << 8))) {
-                ym_osc_cnt[i] = 0;
-                ym_osc_out[i] ^= 1;
-            }
-        }
-
-        // Noise generator
-        ym_noise_cnt += 4;
-        if (ym_noise_cnt >= ((ym_regs[6].value & 0x1F) * 2)) {
-            ym_noise_cnt = 0;
-            ym_rng ^= (((ym_rng & 1) ^ ((ym_rng >> 3) & 1)) << 17);
-            ym_rng >>= 1;
-        }
-
-        // Mix tones and noise
-        for (i = 0; i < 3; i++)
-            ym_ch[i] = (ym_osc_out[i] | ((ym_regs[7].value >> i) & 1)) & ((ym_rng & 1) | ((ym_regs[7].value >> (i + 3)) & 1));
-
-        // Envelope generator
-        if (!ym_env_holding) {
-            ym_env_cnt += 8;
-            if (ym_env_cnt >= (ym_regs[11].value | (ym_regs[12].value << 8))) {
-                ym_env_cnt = 0;
-                ym_env_step--;
-                if (ym_env_step < 0) {
-                    if (ym_env_hold) {
-                        if (ym_env_alt)
-                            ym_env_att ^= 0x1F;
-                        ym_env_holding = 1;
-                        ym_env_step = 0;
-                    } else {
-                        if (ym_env_alt && (ym_env_step & 0x20))
-                            ym_env_att ^= 0x1F;
-                        ym_env_step &= 0x1F;
-                    }
-                }
-            }
-        }
-        ym_env_vol = (ym_env_step ^ ym_env_att);
-
-        ym_out = 0;
-        for (i = 0; i < 3; i++) {
-            if (ym_regs[i + 8].value & 0x10) {
-                // Envelope mode
-                ym_out += (ym_ch[i] ? ym_env_vol : 0);
-            } else {
-                // Fixed mode
-                ym_out += (ym_ch[i] ? (ym_regs[i + 8].value & 0x0F) : 0);
-            }
-        }
-
-        ym_buffer[ym_render_cnt] = (ym_out * 2) - 45;
-
-        if (ym_sample_cnt < 960) {
-            ym_sample_cnt++;
-        } else {
-            ym_sample_cnt = 0;
-        }
-
-        // Loop
-        if (ym_frame == ym_frames) ym_init();
-    }
-}
-
-void AboutView::update() {
-    if (framebuffer) {
-        // Update 1 out of 2 frames, 60Hz is very laggy
-        if (refresh_cnt & 1) render_video();
-        refresh_cnt++;
-    }
-
-    // Slowly increase volume to avoid jumpscare
-    if (headphone_vol < (70 << 2)) {
-        audio::headphone::set_volume(volume_t::decibel((headphone_vol / 4) - 99) + audio::headphone::volume_range().max);
-        headphone_vol++;
-    }
-}
-
-void AboutView::ym_init() {
-    uint8_t reg;
-
-    for (reg = 0; reg < 14; reg++) {
-        ym_regs[reg].cnt = 0;
-        // Pick up start pointers for each YM registers RLE blocks
-        ym_regs[reg].ptr = ((uint16_t)(ymdata_bin[(reg * 2) + 3]) << 8) + ymdata_bin[(reg * 2) + 2];
-        ym_regs[reg].same = false;  // Useless ?
-        ym_regs[reg].value = 0;     // Useless ?
-    }
-
-    ym_frame = 0;
-}
-
-AboutView::AboutView(
-    NavigationView& nav) {
-    uint8_t p, c;
-
-    baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
-
-    add_children({{
-        &text_title,
-        &text_firmware,
-        &text_cpld_hackrf,
-        &text_cpld_hackrf_status,
-        &button_ok,
-    }});
-
-    if (cpld_hackrf_verify_eeprom()) {
-        text_cpld_hackrf_status.set(" OK");
-    } else {
-        text_cpld_hackrf_status.set("BAD");
-    }
-
-    // Politely ask for about 26kB
-    framebuffer = (ui::Color*)chHeapAlloc(0x0, 180 * 72 * sizeof(ui::Color));
-
-    if (framebuffer) {
-        memset(framebuffer, 0, 180 * 72 * sizeof(ui::Color));
-
-        // Copy original font palette
-        c = 0;
-        for (p = 0; p < 48; p += 3)
-            paletteA[c++] = ui::Color(demofont_bin[p], demofont_bin[p + 1], demofont_bin[p + 2]);
-
-        // Increase red in another one
-        c = 0;
-        for (p = 0; p < 48; p += 3)
-            paletteB[c++] = ui::Color(std::min(demofont_bin[p] + 64, 255), demofont_bin[p + 1], demofont_bin[p + 2]);
-    }
-
-    // Init YM synth
-    ym_frames = ((uint16_t)(ymdata_bin[1]) << 8) + ymdata_bin[0];
-    ym_init();
-
-    button_ok.on_select = [this, &nav](Button&) {
-        if (framebuffer) chHeapFree(framebuffer);  // Do NOT forget this
-        nav.pop();
-    };
-}
-
-AboutView::~AboutView() {
-    transmitter_model.disable();
-    baseband::shutdown();
-}
-
-void AboutView::focus() {
-    button_ok.focus();
-}
-
-} /* namespace ui */
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_ABOUT_H__
-#define __UI_ABOUT_H__
-
-#include "ui_widget.hpp"
-#include "ui_menu.hpp"
-#include "ui_navigation.hpp"
-#include "transmitter_model.hpp"
-#include "baseband_api.hpp"
-
-#include <cstdint>
-
-namespace ui {
-
-class AboutView : public View {
-   public:
-    AboutView(NavigationView& nav);
-    ~AboutView();
-
-    void on_show() override;
-    void focus() override;
-
-   private:
-    void ym_init();
-    void update();
-    void render_video();
-    void render_audio();
-    void draw_demoglyph(ui::Point p, char ch, ui::Color* pal);
-    uint16_t debug_cnt = 0;
-
-    typedef struct ymreg_t {
-        uint8_t value;
-        uint8_t cnt;
-        uint16_t ptr;
-        bool same;
-    } ymreg_t;
-
-    uint16_t headphone_vol = 5 << 2;
-
-    ymreg_t ym_regs[14];
-    uint16_t ym_frames;
-    uint16_t ym_frame;
-    uint8_t drum = 0;
-    uint16_t ym_osc_cnt[3];
-    uint32_t ym_rng = 1;
-    uint16_t ym_noise_cnt;
-    uint8_t ym_env_att, ym_env_hold, ym_env_alt, ym_env_holding, ym_env_vol;
-    int8_t ym_env_step;
-    uint16_t ym_env_cnt;
-    uint8_t ym_osc_out[3];
-    uint8_t ym_ch[3];
-    uint8_t ym_out;
-    uint16_t ym_sample_cnt = 0;
-
-    int8_t ym_buffer[1024];
-
-    uint8_t refresh_cnt;
-    ui::Color paletteA[16];
-    ui::Color paletteB[16];
-    ui::Color* framebuffer;
-    uint32_t phase = 0;
-    uint8_t copperbars[5] = {0};
-    uint8_t copperbuffer[72] = {0};
-
-    uint8_t anim_state = 0;
-    uint8_t credits_index = 0;
-    uint16_t credits_timer = 0;
-
-    int16_t ofx = -180, ofy = -24;
-
-    const uint8_t char_map[64] = {0xFF, 27, 46, 0xFF, 0xFF, 0xFF, 28, 45,
-                                  58, 59, 0xFF, 43, 40, 57, 26, 42,
-                                  29, 30, 31, 32, 33, 34, 35, 36,
-                                  37, 38, 41, 0xFF, 0xFF, 0xFF, 0xFF, 44,
-                                  0xFF, 0, 1, 2, 3, 4, 5, 6,
-                                  7, 8, 9, 10, 11, 12, 13, 14,
-                                  15, 16, 17, 18, 19, 20, 21, 22,
-                                  23, 24, 25, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-
-    const uint8_t copperluma[16] = {8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 7, 8};
-    const uint8_t coppercolor[5][3] = {{255, 0, 0},
-                                       {0, 255, 0},
-                                       {0, 0, 255},
-                                       {255, 0, 255},
-                                       {255, 255, 0}};
-
-    typedef struct credits_t {
-        char role[12];
-        char name[12];
-        bool change;
-    } credits_t;
-
-    //								  0123456789A		 0123456789A
-    const credits_t credits[10] = {{"GURUS", "J. BOONE", false},
-                                   {"GURUS", "M. OSSMANN", true},
-                                   {"BUGS", "FURRTEK", true},
-                                   {"RDS WAVE", "C. JACQUET", true},
-                                   {"POCSAG RX", "T. SAILER", false},
-                                   {"POCSAG RX", "E. OENAL", true},
-                                   {"XYLOS DATA", "CLX", true},
-                                   {"GREETS TO", "SIGMOUNTE", false},
-                                   {"GREETS TO", "WINDYOONA", true},
-                                   {"THIS MUSIC", "BIG ALEC", true}};
-
-    Text text_title{
-        {100, 32, 40, 16},
-        "About",
-    };
-
-    Text text_firmware{
-        {0, 236, 240, 16},
-        "Version   " VERSION_STRING,
-    };
-
-    Text text_cpld_hackrf{
-        {0, 252, 11 * 8, 16},
-        "HackRF CPLD",
-    };
-
-    Text text_cpld_hackrf_status{
-        {240 - 3 * 8, 252, 3 * 8, 16},
-        "???"};
-
-    Button button_ok{
-        {72, 272, 96, 24},
-        "OK"};
-
-    MessageHandlerRegistration message_handler_update{
-        Message::ID::DisplayFrameSync,
-        [this](const Message* const) {
-            this->update();
-        }};
-
-    MessageHandlerRegistration message_handler_fifo_signal{
-        Message::ID::FIFOSignal,
-        [this](const Message* const p) {
-            const auto message = static_cast<const FIFOSignalMessage*>(p);
-            if (message->signaltype == 1) {
-                this->render_audio();
-                baseband::set_fifo_data(ym_buffer);
-            }
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__UI_ABOUT_H__*/
@@ -1,47 +1,60 @@
 #include "ui_about_simple.hpp"
+#include <string_view>
+
+#define ROLL_SPEED_FRAME_PER_LINE 60
+// cuz frame rate of pp screen is probably 60, scroll per sec

 namespace ui {

-// TODO: Generate this automatically from github
 // Information: a line starting with a '#' will be yellow coloured
-const std::string authors_list[] = {
+constexpr std::string_view authors_list[] = {
    "#   * List of contributors *  ",
    " ",
-    "#Mayhem:",
-    "eried,euquiq,gregoryfenton",
-    "johnelder,jwetzell,nnemanjan00",
-    "N0vaPixel,klockee,gullradriel",
-    "jamesshao8,ITAxReal,rascafr",
-    "mcules,dqs105,strijar",
-    "zhang00963,RedFox-Fr,aldude999",
-    "East2West,fossum,ArjanOnwezen",
-    "vXxOinvizioNxX,teixeluis",
-    "Brumi-2021,texasyojimbo",
-    "heurist1,intoxsick,ckuethe",
-    "notpike,jLynx,zigad",
-    "MichalLeonBorsuk,jimilinuxguy",
-    "kallanreed,bernd-herzog",
-    "NotherNgineer,zxkmm,u-foka",
-    "Netro,HTotoo",
+    "#Mayhem-Firmware:",
+    "jboone,eried,furrtek,",
+    "NotherNgineer,gullradriel,",
+    "jLynx,kallanreed,Brumi-2021,",
+    "htotoo,bernd-herzog,zxkmm,",
+    "ArjanOnwezen,euquiq,u-foka,",
+    "iNetro,heurist1,dqs105,",
+    "teixeluis,jwetzell,",
+    "jimilinuxguy,gregoryfenton,",
+    "notpike,strijar,BehleZebub,",
+    "arneluehrs,rascafr,joyel24,",
+    "ImDroided,zigad,johnelder,",
+    "klockee,nnesetto,LupusE,",
+    "argilo,dc2dc,formtapez,",
+    "RocketGod-git,mrmookie,",
+    "ITAxReal,F33RNI,F4GEV,",
+    "rusty-labs,mjwaxios,andrej-mk,",
+    "RedFox-Fr,nemanjan00,",
+    "MichalLeonBorsuk,",
+    "MatiasFernandez,Giorgiofox,",
+    "ckuethe",
    " ",
    "#Havoc:",
-    "furrtek,mrmookie,NotPike",
-    "mjwaxios,ImDroided,Giorgiofox",
-    "F4GEV,z4ziggy,xmycroftx",
-    "troussos,silascutler",
-    "nickbouwhuis,msoose,leres",
-    "joakar,dhoetger,clem-42",
-    "brianlechthaler,ZeroChaos-...",
+    "jboone,furrtek,eried,argilo,",
+    "mrmookie,Giorgiofox,ImDroided,",
+    "mjwaxios,F4GEV,OpCode1300,",
+    "ZeroChaos-,RndmNmbr,",
+    "silascutler,troussos,z4ziggy,",
+    "clem-42,dhoetger,NickBouwhuis,",
+    "xmycroftx,Maescool,KimIV,",
+    "joakar,leres,brianlechthaler,",
+    "N0vaPixel",
    " ",
    "#PortaPack:",
-    "jboone,argilo",
+    "jboone,mossmann,martinling,",
+    "argilo,eried,ZeroChaos-,",
+    "RndmNmbr",
    " ",
    "#HackRF:",
-    "mossmann,dominicgs,bvernoux",
-    "bgamari,schneider42,miek",
-    "willcode,hessu,Sec42",
-    "yhetti,ckuethe,smunaut",
-    "wishi,mrbubble62,scateu..."};
+    "mossmann,jboone,dominicgs,",
+    "martinling,bvernoux,miek,",
+    "bgamari,schneider42,straithe,",
+    "grvvy,willcode,hessu,yhetti,",
+    "Sec42,ckuethe",
+    " "};

 AboutView::AboutView(NavigationView& nav) {
    add_children({&menu_view,
@@ -59,19 +72,19 @@ AboutView::AboutView(NavigationView& nav) {
        button_ok.focus();
    };

-    for (const std::string& authors_line : authors_list) {
+    for (auto& authors_line : authors_list) {
        // if it's starting with #, it's a title and we have to substract the '#' and paint yellow
        if (authors_line.size() > 0) {
            if (authors_line[0] == '#') {
                menu_view.add_item(
-                    {authors_line.substr(1, authors_line.size() - 1),
-                     ui::Color::yellow(),
+                    {(std::string)authors_line.substr(1, authors_line.size() - 1),
+                     ui::Theme::getInstance()->fg_yellow->foreground,
                     nullptr,
                     nullptr});
            } else {
                menu_view.add_item(
-                    {authors_line,
-                     ui::Color::white(),
+                    {(std::string)authors_line,
+                     Theme::getInstance()->bg_darkest->foreground,
                     nullptr,
                     nullptr});
            }
@@ -79,10 +92,42 @@ AboutView::AboutView(NavigationView& nav) {
    }
 }

+void AboutView::on_frame_sync() {
+    if (interacted) return;
+
+    if (frame_sync_count++ % ROLL_SPEED_FRAME_PER_LINE == 0) {
+        const auto current = menu_view.highlighted_index();
+        const auto count = menu_view.item_count();
+
+        if (current < count - 1) {
+            menu_view.set_highlighted(current + 1);
+        } else {
+            menu_view.set_highlighted(0);
+            // ^ to go back to the REAL top instead of make the 2 at the top to make the title disappeares
+            menu_view.set_highlighted(2);  // the first line that has human name
+        }
+    }
+}
+
 void AboutView::focus() {
+    button_ok.focus();
+    menu_view.set_highlighted(2);  // the first line that has human name
+}
+
+bool AboutView::on_touch(const TouchEvent) {
+    interacted = true;
+    return false;
+}
+
+bool AboutView::on_key(const KeyEvent) {
+    interacted = true;
+    return false;
+}
+
+bool AboutView::on_encoder(const EncoderEvent) {
+    interacted = true;
    menu_view.focus();
-    // put focus on last text line to make it more obvious that list is scrollable
-    menu_view.set_highlighted(10);
+    return false;
 }

 } /* namespace ui */
@@ -14,6 +14,13 @@ class AboutView : public View {
    std::string title() const override { return "About"; };

   private:
+    virtual bool on_key(const KeyEvent event);
+    virtual bool on_encoder(const EncoderEvent event);
+    virtual bool on_touch(const TouchEvent event);
+
+    bool interacted{false};
+    uint16_t frame_sync_count{0};
+    void on_frame_sync();
    MenuView menu_view{
        {0, 0, 240, 264},
        true};
@@ -22,6 +29,12 @@ class AboutView : public View {
        {240 / 3, 270, 240 / 3, 24},
        "OK",
    };
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_frame_sync();
+        }};
 };
 }  // namespace ui

@@ -57,15 +57,15 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
        case ADSBAgeState::Invalid:
        case ADSBAgeState::Current:
            entry_string = "";
-            target_color = Color::green();
+            target_color = Theme::getInstance()->fg_green->foreground;
            break;
        case ADSBAgeState::Recent:
            entry_string = STR_COLOR_LIGHT_GREY;
-            target_color = Color::light_grey();
+            target_color = Theme::getInstance()->fg_light->foreground;
            break;
        default:
            entry_string = STR_COLOR_DARK_GREY;
-            target_color = Color::grey();
+            target_color = Theme::getInstance()->fg_medium->foreground;
    };

    entry_string +=
@@ -205,15 +205,15 @@ class ADSBRxAircraftDetailsView : public View {

   private:
    Labels labels{
-        {{0 * 8, 1 * 16}, "ICAO:", Color::light_grey()},
-        {{0 * 8, 2 * 16}, "Registration:", Color::light_grey()},
-        {{0 * 8, 3 * 16}, "Manufacturer:", Color::light_grey()},
-        {{0 * 8, 5 * 16}, "Model:", Color::light_grey()},
-        {{0 * 8, 7 * 16}, "Type:", Color::light_grey()},
-        {{0 * 8, 8 * 16}, "Number of engines:", Color::light_grey()},
-        {{0 * 8, 9 * 16}, "Engine type:", Color::light_grey()},
-        {{0 * 8, 11 * 16}, "Owner:", Color::light_grey()},
-        {{0 * 8, 13 * 16}, "Operator:", Color::light_grey()}};
+        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
        {5 * 8, 1 * 16, 6 * 8, 16},
@@ -289,13 +289,13 @@ class ADSBRxDetailsView : public View {
    bool airline_checked{false};

    Labels labels{
-        {{0 * 8, 1 * 16}, "ICAO:", Color::light_grey()},
-        {{13 * 8, 1 * 16}, "Callsign:", Color::light_grey()},
-        {{0 * 8, 2 * 16}, "Last seen:", Color::light_grey()},
-        {{0 * 8, 3 * 16}, "Airline:", Color::light_grey()},
-        {{0 * 8, 5 * 16}, "Country:", Color::light_grey()},
-        {{0 * 8, 13 * 16}, "Even position frame:", Color::light_grey()},
-        {{0 * 8, 15 * 16}, "Odd position frame:", Color::light_grey()}};
+        {{0 * 8, 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
+        {{13 * 8, 1 * 16}, "Callsign:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};

    Text text_icao_address{
        {5 * 8, 1 * 16, 6 * 8, 16},
@@ -414,7 +414,7 @@ class ADSBRxView : public View {
    ADSBRxDetailsView* details_view{nullptr};

    Labels labels{
-        {{0 * 8, 0 * 8}, "LNA:   VGA:   AMP:", Color::light_grey()}};
+        {{0 * 8, 0 * 8}, "LNA:   VGA:   AMP:", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
        {4 * 8, 0 * 16}};
@@ -431,12 +431,12 @@ class ADSBRxView : public View {

    ActivityDot status_frame{
        {27 * 8 + 2, 5, 2, 2},
-        Color::white(),
+        Theme::getInstance()->bg_darkest->foreground,
    };

    ActivityDot status_good_frame{
        {27 * 8 + 2, 9, 2, 2},
-        Color::green(),
+        Theme::getInstance()->fg_green->foreground,
    };

    AudioVolumeField field_volume{
@@ -46,7 +46,7 @@ void RecentEntriesTable<APRSRecentEntries>::draw(
    Color target_color;
    // auto entry_age = entry.age;

-    target_color = Color::green();
+    target_color = Theme::getInstance()->fg_green->foreground;

    std::string entry_string = "";

@@ -94,21 +94,39 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
    record_view.set_sampling_rate(24000);

    options_region.on_change = [this](size_t, int32_t i) {
-        if (i == 0) {
+        field_frequency.on_change = [this](rf::Frequency f) { (void)f; };
+        if (i == 0) {  // MAN Manual setting
+            field_frequency.set_value(aprs_rx_freq);
+        } else if (i == 1) {  // NA - North America - is also the default
            field_frequency.set_value(144390000);
-        } else if (i == 1) {
+        } else if (i == 2) {  // EUR
            field_frequency.set_value(144800000);
-        } else if (i == 2) {
+        } else if (i == 3) {  // AUS
            field_frequency.set_value(145175000);
-        } else if (i == 3) {
+        } else if (i == 4) {  // NZ
            field_frequency.set_value(144575000);
-        } else if (i == 4) {
+        } else if (i == 5) {  // ISS
            field_frequency.set_value(145825000);
        }
+        options_region_id = i;
+        receiver_model.set_target_frequency(field_frequency.value());  // Retune
+        field_frequency.on_change = [this](rf::Frequency f) {
+            aprs_rx_freq = f;
+            options_region.set_selected_index(0, true);
+        };
    };

    field_frequency.set_step(100);
-    options_region.set_selected_index(0, true);
+    field_frequency.on_edit = [this]() {
+        auto freq_view = nav_.push<FrequencyKeypadView>(field_frequency.value());
+        freq_view->on_changed = [this](rf::Frequency f) {
+            aprs_rx_freq = f;
+            field_frequency.set_value(f);
+        };
+    };
+
+    // Note: setting the region is also going to sef field_frequency.on_change
+    options_region.set_selected_index(options_region_id, true);

    logger = std::make_unique<APRSLogger>();
    if (logger)
@@ -122,6 +140,12 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
    receiver_model.enable();
 }

+void APRSRxView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+    aprs_rx_freq = freq;
+    options_region.set_selected_index(0, true);
+}
+
 void APRSRxView::on_packet(const APRSPacketMessage* message) {
    std::string str_console = "\x1B";

@@ -185,10 +185,13 @@ class APRSRxView : public View {

    std::string title() const override { return "APRS RX"; };
    void on_packet(const APRSPacketMessage* message);
+    void on_freqchg(int64_t freq);

   private:
    void on_data(uint32_t value, bool is_data);
    bool reset_console = false;
+    uint8_t options_region_id = 1;          // default to North America
+    rf::Frequency aprs_rx_freq{144390000};  // default to North America frequency

    NavigationView& nav_;
    RxRadioState radio_state_{
@@ -197,7 +200,10 @@ class APRSRxView : public View {
        3072000 /* sampling rate */
    };
    app_settings::SettingsManager settings_{
-        "rx_aprs", app_settings::Mode::RX};
+        "rx_aprs",
+        app_settings::Mode::RX,
+        {{"options_region_id"sv, &options_region_id},
+         {"aprs_rx_freq"sv, &aprs_rx_freq}}};

    uint8_t console_color{0};
    std::string str_log{""};
@@ -219,15 +225,15 @@ class APRSRxView : public View {
    OptionsField options_region{
        {0 * 8, 0 * 8},
        3,
-        {{"NA ", 0},
-         {"EUR", 1},
-         {"AUS", 2},
-         {"NZ ", 3},
-         {"ISS", 4}}};
+        {{"MAN", 0},
+         {"NA ", 1},
+         {"EUR", 2},
+         {"AUS", 3},
+         {"NZ ", 4},
+         {"ISS", 5}}};

-    RxFrequencyField field_frequency{
-        {3 * 8, 0 * 16},
-        nav_};
+    FrequencyField field_frequency{
+        {3 * 8, 0 * 16}};

    // DEBUG
    RecordView record_view{
@@ -261,8 +267,8 @@ class APRSRXView : public View {
    APRSTableView view_table{nav_, view_rect};

    TabView tab_view{
-        {"Stream", Color::cyan(), &view_stream},
-        {"List", Color::yellow(), &view_table}};
+        {"Stream", Theme::getInstance()->fg_cyan->foreground, &view_stream},
+        {"List", Theme::getInstance()->fg_yellow->foreground, &view_table}};

    MessageHandlerRegistration message_handler_packet{
        Message::ID::APRSPacket,
@@ -271,6 +277,13 @@ class APRSRXView : public View {
            this->view_stream.on_packet(message);
            this->view_table.on_pkt(message);
        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->view_stream.on_freqchg(message->freq);
+        }};
 };

 } /* namespace ui */
@@ -61,9 +61,9 @@ class APRSTXView : public View {
    void on_tx_progress(const uint32_t progress, const bool done);

    Labels labels{
-        {{0 * 8, 1 * 16}, "Source:       SSID:", Color::light_grey()},  // 6 alphanum + SSID
-        {{0 * 8, 2 * 16}, " Dest.:       SSID:", Color::light_grey()},
-        {{0 * 8, 4 * 16}, "Info field:", Color::light_grey()},
+        {{0 * 8, 1 * 16}, "Source:       SSID:", Theme::getInstance()->fg_light->foreground},  // 6 alphanum + SSID
+        {{0 * 8, 2 * 16}, " Dest.:       SSID:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 4 * 16}, "Info field:", Theme::getInstance()->fg_light->foreground},
    };

    SymField sym_source{
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 HTotoo
 *
 * This file is part of PortaPack.
 *
@@ -24,14 +25,13 @@

 #include "event_m0.hpp"
 #include "portapack.hpp"
-
+#include "battery.hpp"
 #include <cstring>

 using namespace portapack;

 namespace ui {

-bool BattinfoView::needRun = true;
 void BattinfoView::focus() {
    button_exit.focus();
 }
@@ -46,42 +46,106 @@ void BattinfoView::on_timer() {

 void BattinfoView::update_result() {
    if (!battery::BatteryManagement::isDetected()) {
-        // todo show no batt management
        text_percent.set("UNKNOWN");
        text_voltage.set("UNKNOWN");
        text_current.set("-");
        text_charge.set("-");
+        // text_cycles.set("-");
+        text_ttef.set("-");
+        text_method.set("-");
+        // text_warn.set("");
        return;
    }
    bool uichg = false;
-    battery::BatteryManagement::getBatteryInfo(percent, voltage, current, isCharging);
+    uint8_t valid_mask = 0;
+    battery::BatteryManagement::getBatteryInfo(valid_mask, percent, voltage, current);
    // update text fields
-    if (percent <= 100)
+    if (percent <= 100 && (valid_mask & battery::BatteryManagement::BATT_VALID_VOLTAGE) == battery::BatteryManagement::BATT_VALID_VOLTAGE)
        text_percent.set(to_string_dec_uint(percent) + " %");
    else
        text_percent.set("UNKNOWN");
-    if (voltage > 1) {
+    if (voltage > 1 && (valid_mask & battery::BatteryManagement::BATT_VALID_VOLTAGE) == battery::BatteryManagement::BATT_VALID_VOLTAGE) {
        text_voltage.set(to_string_decimal(voltage / 1000.0, 3) + " V");
    } else {
        text_voltage.set("UNKNOWN");
    }
-    if (current != 0) {
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_CURRENT) == battery::BatteryManagement::BATT_VALID_CURRENT) {
        if (labels_opt.hidden()) uichg = true;
        labels_opt.hidden(false);
        text_current.hidden(false);
        text_charge.hidden(false);
        text_current.set(to_string_dec_int(current) + " mA");
-        text_charge.set(isCharging ? "charge" : "discharge");
+        if (current >= 25)  // when >25mA it is charging in any scenario
+            text_charge.set("Charging");
+        else {
+            if (current > -25) {                         // between -25 and 25
+                if (voltage > 4060 || percent == 100) {  // the voltage is high enough, so it is full, that's why no mA
+                    text_charge.set("Full");
+                } else {
+                    text_charge.set("Holding");  // not enough voltage, so should charge. maybe the batttery is off, or USB power is not enough
+                }
+            } else {
+                text_charge.set("Discharging");  // less then -25mA, so it is discharging
+            }
+        }
        labels_opt.hidden(false);
+
+        text_ttef.hidden(false);
    } else {
        if (!labels_opt.hidden()) uichg = true;
        labels_opt.hidden(true);
        text_current.hidden(true);
        text_charge.hidden(true);
+        // text_cycles.hidden(true);
+        text_ttef.hidden(true);
+        // text_warn.set("");
+    }
+    /* if ((valid_mask & battery::BatteryManagement::BATT_VALID_CYCLES) == battery::BatteryManagement::BATT_VALID_CYCLES) {
+        // text_cycles.hidden(false);
+        uint16_t cycles = 0;  // battery::BatteryManagement::get_cycles();
+        if (cycles < 2)
+            text_warn.set("SoC improves after each cycles");
+        else
+            text_warn.set("");
+        // text_cycles.set(to_string_dec_uint(cycles));
+    } else {
+        // text_cycles.hidden(true);
+        text_warn.set("");
+    } */
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_TTEF) == battery::BatteryManagement::BATT_VALID_TTEF) {
+        text_ttef.hidden(false);
+        float ttef = 0;
+        if (current <= 0) {  // we keep this yet
+            ttef = battery::BatteryManagement::get_tte();
+        } else {
+            ttef = battery::BatteryManagement::get_ttf();
+        }
+
+        // Convert ttef to hours and minutes
+        uint8_t hours = static_cast<uint8_t>(ttef);
+        uint8_t minutes = static_cast<uint8_t>((ttef - hours) * 60 + 0.5);  // +0.5 for rounding
+
+        // Create the formatted string
+        std::string formatted_time;
+        if (hours > 0) {
+            formatted_time += to_string_dec_uint(hours) + "h ";
+        }
+        formatted_time += to_string_dec_uint(minutes) + "m";
+
+        text_ttef.set(formatted_time);
+    } else {
+        text_ttef.hidden(true);
+    }
+    if ((valid_mask & battery::BatteryManagement::BATT_VALID_PERCENT) == battery::BatteryManagement::BATT_VALID_PERCENT) {
+        text_method.set("IC");
+        button_mode.set_text("Volt");
+    } else {
+        text_method.set("Voltage");
+        button_mode.set_text("IC");
    }
    if (uichg) set_dirty();
    // to update status bar too, send message in behalf of batt manager
-    BatteryStateMessage msg{percent, isCharging, voltage};
+    BatteryStateMessage msg{valid_mask, percent, current >= 25, voltage};
    EventDispatcher::send_message(msg);
 }

@@ -93,20 +157,34 @@ BattinfoView::BattinfoView(NavigationView& nav)
                  &text_voltage,
                  &text_current,
                  &text_charge,
-                  &button_exit});
+                  &text_method,
+                  &button_mode,
+                  &button_exit,
+                  // &text_cycles,
+                  // &text_warn,
+                  &text_ttef});

    button_exit.on_select = [this, &nav](Button&) {
        nav.pop();
    };
-
+    button_mode.on_select = [this, &nav](Button&) {
+        if (button_mode.text() == "IC") {
+            battery::BatteryManagement::set_calc_override(false);
+            persistent_memory::set_ui_override_batt_calc(false);
+            button_mode.set_text("Volt");
+        } else {
+            battery::BatteryManagement::set_calc_override(true);
+            persistent_memory::set_ui_override_batt_calc(true);
+            button_mode.set_text("IC");
+        }
+    };
    update_result();
-    needRun = true;
-    thread = chThdCreateFromHeap(NULL, 512, NORMALPRIO + 10, BattinfoView::static_fn, this);
+    if (thread == nullptr) thread = chThdCreateFromHeap(NULL, 1024, NORMALPRIO + 10, BattinfoView::static_fn, this);
 }

 msg_t BattinfoView::static_fn(void* arg) {
    auto obj = static_cast<BattinfoView*>(arg);
-    while (needRun) {
+    while (!chThdShouldTerminate()) {
        chThdSleepMilliseconds(16);
        obj->on_timer();
    }
@@ -114,11 +192,10 @@ msg_t BattinfoView::static_fn(void* arg) {
 }

 BattinfoView::~BattinfoView() {
-    needRun = false;
    if (thread) {
        chThdTerminate(thread);
        chThdWait(thread);
        thread = nullptr;
    }
 }
-}  // namespace ui
+}  // namespace ui
@@ -1,6 +1,7 @@
 /*
 * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
 * Copyright (C) 2016 Furrtek
+ * Copyright (C) 2024 HTotoo
 *
 * This file is part of PortaPack.
 *
@@ -27,6 +28,7 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "string_format.hpp"
+#include "i2cdevmanager.hpp"

 namespace ui {
 class BattinfoView : public View {
@@ -50,15 +52,20 @@ class BattinfoView : public View {
    uint8_t percent = 0;
    uint16_t voltage = 0;
    int32_t current = 0;
-    bool isCharging = false;

    Labels labels{
-        {{2 * 8, 1 * 16}, "Percent:", Color::light_grey()},
-        {{2 * 8, 2 * 16}, "Voltage:", Color::light_grey()}};
+        {{2 * 8, 1 * 16}, "Percent:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 2 * 16}, "Voltage:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 3 * 16}, "Method:", Theme::getInstance()->fg_light->foreground},
+    };

    Labels labels_opt{
-        {{2 * 8, 3 * 16}, "Current:", Color::light_grey()},
-        {{2 * 8, 4 * 16}, "Charge:", Color::light_grey()}};
+        {{2 * 8, 4 * 16}, "Current:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 5 * 16}, "Charge:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 6 * 16}, "TTF/E:", Theme::getInstance()->fg_light->foreground},
+        // {{2 * 8, 7 * 16}, "Cycles:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "Change method:", Theme::getInstance()->fg_light->foreground},
+    };

    Text text_percent{
        {13 * 8, 1 * 16, 10 * 16, 16},
@@ -66,21 +73,37 @@ class BattinfoView : public View {
    Text text_voltage{
        {13 * 8, 2 * 16, 10 * 16, 16},
        "-"};
-    Text text_current{
+    Text text_method{
        {13 * 8, 3 * 16, 10 * 16, 16},
        "-"};
-    Text text_charge{
+    Text text_current{
        {13 * 8, 4 * 16, 10 * 16, 16},
        "-"};
+    Text text_charge{
+        {13 * 8, 5 * 16, 10 * 16, 16},
+        "-"};
+    Text text_ttef{
+        {13 * 8, 6 * 16, 10 * 16, 16},
+        "-"};
+    /* Text text_cycles{
+        {13 * 8, 7 * 16, 10 * 16, 16},
+        "-"};
+
+    Text text_warn{
+        {1 * 8, 8 * 16, 30 * 8, 2 * 16},
+        ""}; */
+
+    Button button_mode{
+        {2 * 8, 11 * 16 + 5, 5 * 16, 32},
+        "Volt"};

    Button button_exit{
        {72, 17 * 16, 96, 32},
        "Back"};
    static msg_t static_fn(void* arg);
-    static bool needRun;
    Thread* thread{nullptr};
 };

 } /* namespace ui */

-#endif /*__UI_BATTINFO__*/
+#endif /*__UI_BATTINFO__*/
@@ -50,12 +50,12 @@ class XylosView : public View {

   private:
    Labels labels{
-        {{8 * 8, 1 * 8}, "Header:", Color::light_grey()},
-        {{4 * 8, 3 * 8}, "City code:", Color::light_grey()},
-        {{7 * 8, 5 * 8}, "Family:", Color::light_grey()},
-        {{2 * 8, 7 * 8 + 2}, "Subfamily:", Color::light_grey()},
-        {{2 * 8, 11 * 8}, "Receiver ID:", Color::light_grey()},
-        {{2 * 8, 14 * 8}, "Relay:", Color::light_grey()}};
+        {{8 * 8, 1 * 8}, "Header:", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 3 * 8}, "City code:", Theme::getInstance()->fg_light->foreground},
+        {{7 * 8, 5 * 8}, "Family:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 7 * 8 + 2}, "Subfamily:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 11 * 8}, "Receiver ID:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 14 * 8}, "Relay:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_header_a{
        {16 * 8, 1 * 8},
@@ -130,9 +130,9 @@ class EPARView : public View {

   private:
    Labels labels{
-        {{4 * 8, 1 * 8}, "City code:", Color::light_grey()},
-        {{8 * 8, 3 * 8}, "Group:", Color::light_grey()},
-        {{8 * 8, 7 * 8}, "Relay:", Color::light_grey()}};
+        {{4 * 8, 1 * 8}, "City code:", Theme::getInstance()->fg_light->foreground},
+        {{8 * 8, 3 * 8}, "Group:", Theme::getInstance()->fg_light->foreground},
+        {{8 * 8, 7 * 8}, "Relay:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_city{
        {16 * 8, 1 * 8},
@@ -195,11 +195,11 @@ class BHTView : public View {
    EPARView view_EPAR{view_rect};

    TabView tab_view{
-        {"Xylos", Color::cyan(), &view_xylos},
-        {"EPAR", Color::green(), &view_EPAR}};
+        {"Xylos", Theme::getInstance()->fg_cyan->foreground, &view_xylos},
+        {"EPAR", Theme::getInstance()->fg_green->foreground, &view_EPAR}};

    Labels labels{
-        {{29 * 8, 14 * 16 + 4}, "s", Color::light_grey()}};
+        {{29 * 8, 14 * 16 + 4}, "s", Theme::getInstance()->fg_light->foreground}};

    Checkbox checkbox_scan{
        {1 * 8, 25 * 8},
@@ -25,7 +25,6 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_painter.hpp"
-#include "ui_styles.hpp"
 #include "ui_widget.hpp"
 #include "file.hpp"
 #include "ui_bmpview.hpp"
@@ -34,9 +34,10 @@

 #include "ui_sd_card_debug.hpp"
 #include "ui_font_fixed_8x16.hpp"
-#include "ui_styles.hpp"
 #include "ui_painter.hpp"
 #include "ui_external_items_menu_loader.hpp"
+#include "ui_debug_max17055.hpp"
+#include "ui_external_module_view.hpp"

 #include "portapack.hpp"
 #include "portapack_persistent_memory.hpp"
@@ -73,91 +74,6 @@ void DebugMemoryView::focus() {
    button_done.focus();
 }

-/* TemperatureWidget *****************************************************/
-
-void TemperatureWidget::paint(Painter& painter) {
-    const auto logger = portapack::temperature_logger;
-
-    const auto rect = screen_rect();
-    const Color color_background{0, 0, 64};
-    const Color color_foreground = Color::green();
-    const Color color_reticle{128, 128, 128};
-
-    const auto graph_width = static_cast<int>(logger.capacity()) * bar_width;
-    const Rect graph_rect{
-        rect.left() + (rect.width() - graph_width) / 2, rect.top() + 8,
-        graph_width, rect.height()};
-    const Rect frame_rect{
-        graph_rect.left() - 1, graph_rect.top() - 1,
-        graph_rect.width() + 2, graph_rect.height() + 2};
-    painter.draw_rectangle(frame_rect, color_reticle);
-    painter.fill_rectangle(graph_rect, color_background);
-
-    const auto history = logger.history();
-    for (size_t i = 0; i < history.size(); i++) {
-        const Coord x = graph_rect.right() - (history.size() - i) * bar_width;
-        const auto sample = history[i];
-        const auto temp = temperature(sample);
-        const auto y = screen_y(temp, graph_rect);
-        const Dim bar_height = graph_rect.bottom() - y;
-        painter.fill_rectangle({x, y, bar_width, bar_height}, color_foreground);
-    }
-
-    if (!history.empty()) {
-        const auto sample = history.back();
-        const auto temp = temperature(sample);
-        const auto last_y = screen_y(temp, graph_rect);
-        const Coord x = graph_rect.right() + 8;
-        const Coord y = last_y - 8;
-
-        painter.draw_string({x, y}, style(), temperature_str(temp));
-    }
-
-    const auto display_temp_max = display_temp_min + (graph_rect.height() / display_temp_scale);
-    for (auto temp = display_temp_min; temp <= display_temp_max; temp += 10) {
-        const int32_t tick_length = 6;
-        const auto tick_x = graph_rect.left() - tick_length;
-        const auto tick_y = screen_y(temp, graph_rect);
-        painter.fill_rectangle({tick_x, tick_y, tick_length, 1}, color_reticle);
-        const auto text_x = graph_rect.left() - temp_len * 8 - 8;
-        const auto text_y = tick_y - 8;
-        painter.draw_string({text_x, text_y}, style(), temperature_str(temp));
-    }
-}
-
-TemperatureWidget::temperature_t TemperatureWidget::temperature(const sample_t sensor_value) const {
-    // Scaling is different for MAX2837 vs MAX2839 so it's now done in the respective chip-specific module
-    return sensor_value;
-}
-
-std::string TemperatureWidget::temperature_str(const temperature_t temperature) const {
-    return to_string_dec_int(temperature, temp_len - 2) + STR_DEGREES_C;
-}
-
-Coord TemperatureWidget::screen_y(
-    const temperature_t temperature,
-    const Rect& rect) const {
-    int y_raw = rect.bottom() - ((temperature - display_temp_min) * display_temp_scale);
-    const auto y_limit = std::min(rect.bottom(), std::max(rect.top(), y_raw));
-    return y_limit;
-}
-
-/* TemperatureView *******************************************************/
-
-TemperatureView::TemperatureView(NavigationView& nav) {
-    add_children({
-        &text_title,
-        &temperature_widget,
-        &button_done,
-    });
-
-    button_done.on_select = [&nav](Button&) { nav.pop(); };
-}
-
-void TemperatureView::focus() {
-    button_done.focus();
-}
-
 /* RegistersWidget *******************************************************/

 RegistersWidget::RegistersWidget(
@@ -226,6 +142,10 @@ uint32_t RegistersWidget::reg_read(const uint32_t register_number) {
                return radio::debug::second_if::register_read(register_number);
            case CT_SI5351:
                return portapack::clock_generator.read_register(register_number);
+            case CT_MAX17055: {
+                i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+                return dev->read_register(register_number);
+            }
            case CT_AUDIO:
                return audio::debug::reg_read(register_number);
        }
@@ -247,6 +167,11 @@ void RegistersWidget::reg_write(const uint32_t register_number, const uint32_t v
            case CT_SI5351:
                portapack::clock_generator.write_register(register_number, value);
                break;
+            case CT_MAX17055: {
+                i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+                dev->write_register(register_number, value);
+                break;
+            }
            case CT_AUDIO:
                audio::debug::reg_write(register_number, value);
                break;
@@ -292,7 +217,7 @@ RegistersView::RegistersView(
    const auto value = registers_widget.reg_read(0);
    field_write_data_val.set_value(value);

-    button_write.set_style(&Styles::red);
+    button_write.set_style(Theme::getInstance()->fg_red);
    button_write.on_select = [this](Button&) {
        this->registers_widget.reg_write(field_write_reg_num.to_integer(), field_write_data_val.to_integer());
        this->registers_widget.update();
@@ -315,7 +240,7 @@ bool RegistersView::on_encoder(const EncoderEvent delta) {
 void ControlsSwitchesWidget::on_show() {
    display.fill_rectangle(
        screen_rect(),
-        Color::black());
+        Theme::getInstance()->bg_darkest->background);
 }

 bool ControlsSwitchesWidget::on_key(const KeyEvent key) {
@@ -345,11 +270,11 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
    }};

    for (const auto r : button_rects) {
-        painter.fill_rectangle(r + pos, Color::blue());
+        painter.fill_rectangle(r + pos, Theme::getInstance()->fg_blue->foreground);
    }

    if (get_touch_frame().touch)
-        painter.fill_rectangle(button_rects[8] + pos, Color::yellow());
+        painter.fill_rectangle(button_rects[8] + pos, Theme::getInstance()->fg_yellow->foreground);

    const std::array<Rect, 8> raw_rects{{
        {64 + 1, 32 + 1, 16 - 2, 16 - 2},  // Right
@@ -365,7 +290,7 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
    auto switches_raw = control::debug::switches();
    for (const auto r : raw_rects) {
        if (switches_raw & 1)
-            painter.fill_rectangle(r + pos, Color::yellow());
+            painter.fill_rectangle(r + pos, Theme::getInstance()->fg_yellow->foreground);

        switches_raw >>= 1;
    }
@@ -382,7 +307,7 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
    auto switches_debounced = get_switches_state().to_ulong();
    for (const auto r : debounced_rects) {
        if (switches_debounced & 1)
-            painter.fill_rectangle(r + pos, Color::green());
+            painter.fill_rectangle(r + pos, Theme::getInstance()->fg_green->foreground);

        switches_debounced >>= 1;
    }
@@ -399,7 +324,7 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
    auto switches_event = key_event_mask;
    for (const auto r : events_rects) {
        if (switches_event & 1)
-            painter.fill_rectangle(r + pos, Color::red());
+            painter.fill_rectangle(r + pos, Theme::getInstance()->fg_red->foreground);

        switches_event >>= 1;
    }
@@ -407,12 +332,12 @@ void ControlsSwitchesWidget::paint(Painter& painter) {
    switches_event = long_press_key_event_mask;
    for (const auto r : events_rects) {
        if (switches_event & 1)
-            painter.fill_rectangle(r + pos, Color::cyan());
+            painter.fill_rectangle(r + pos, Theme::getInstance()->fg_cyan->foreground);

        switches_event >>= 1;
    }

-    painter.draw_string({5 * 8, 12 * 16}, Styles::light_grey, to_string_dec_int(last_delta, 3));
+    painter.draw_string({5 * 8, 12 * 16}, *Theme::getInstance()->fg_light, to_string_dec_int(last_delta, 3));
 }

 void ControlsSwitchesWidget::on_frame_sync() {
@@ -455,11 +380,15 @@ void DebugPeripheralsMenuView::on_populate() {
    const char* max283x = hackrf_r9 ? "MAX2839" : "MAX2837";
    const char* si5351x = hackrf_r9 ? "Si5351A" : "Si5351C";
    add_items({
-        {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
-        {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, max283x]() { nav_.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
-        {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this, si5351x]() { nav_.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
-        {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
+        {"RFFC5072", Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
+        {max283x, Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this, max283x]() { nav_.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
+        {si5351x, Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this, si5351x]() { nav_.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
+        {audio::debug::codec_name(), Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
    });
+    if (i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055)) {
+        add_item(
+            {"MAX17055", Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this]() { nav_.push<RegistersView>("MAX17055", RegistersWidgetConfig{CT_MAX17055, 256, 16, 16}); }});
+    }
    set_max_rows(2);  // allow wider buttons
 }

@@ -486,23 +415,26 @@ DebugMenuView::DebugMenuView(NavigationView& nav)

 void DebugMenuView::on_populate() {
    if (portapack::persistent_memory::show_gui_return_icon()) {
-        add_items({{"..", ui::Color::light_grey(), &bitmap_icon_previous, [this]() { nav_.pop(); }}});
+        add_items({{"..", ui::Theme::getInstance()->fg_light->foreground, &bitmap_icon_previous, [this]() { nav_.pop(); }}});
    }
    add_items({
-        {"Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [this]() { nav_.push<DebugControlsView>(); }},
-        {"Debug Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
-        {"M0 Stack Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { stack_dump(); }},
-        {"Memory Dump", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
-        //{"Memory Usage", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryView>(); }},
-        {"Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
-        {"Pers. Memory", ui::Color::dark_cyan(), &bitmap_icon_memory, [this]() { nav_.push<DebugPmemView>(); }},
-        //{ "Radio State",	ui::Color::white(),	nullptr,	[this](){ nav_.push<NotImplementedView>(); } },
-        {"Reboot", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<DebugReboot>(); }},
-        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SDCardDebugView>(); }},
-        {"Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [this]() { nav_.push<TemperatureView>(); }},
-        {"Touch Test", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<DebugScreenTest>(); }},
+        {"Buttons Test", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_controls, [this]() { nav_.push<DebugControlsView>(); }},
+        {"Debug Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { portapack::persistent_memory::debug_dump(); }},
+        {"M0 Stack Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { stack_dump(); }},
+        {"Memory Dump", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugMemoryDumpView>(); }},
+        {"Peripherals", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals, [this]() { nav_.push<DebugPeripheralsMenuView>(); }},
+        {"Pers. Memory", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_memory, [this]() { nav_.push<DebugPmemView>(); }},
+        {"SD Card", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_sdcard, [this]() { nav_.push<SDCardDebugView>(); }},
+        {"Touch Test", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_notepad, [this]() { nav_.push<DebugScreenTest>(); }},
+        {"Reboot", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_setup, [this]() { nav_.push<DebugReboot>(); }},
+        {"Ext Module", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_peripherals_details, [this]() { nav_.push<ExternalModuleView>(); }},
    });

+    if (i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055)) {
+        add_item(
+            {"Battery", ui::Theme::getInstance()->fg_darkcyan->foreground, &bitmap_icon_batt_icon, [this]() { nav_.push<BatteryCapacityView>(); }});
+    }
+
    for (auto const& gridItem : ExternalItemsMenuLoader::load_external_items(app_location_t::DEBUG, nav_)) {
        add_item(gridItem);
    };
@@ -535,7 +467,7 @@ DebugMemoryDumpView::DebugMemoryDumpView(NavigationView& nav) {
        field_data_value.set_dirty();
    };

-    button_write.set_style(&Styles::red);
+    button_write.set_style(Theme::getInstance()->fg_red);
    button_write.on_select = [this](Button&) {
        *(uint32_t*)field_rw_address.to_integer() = (uint32_t)field_data_value.to_integer();
    };
@@ -618,8 +550,8 @@ bool DebugScreenTest::on_touch(const TouchEvent event) {
 }

 void DebugScreenTest::paint(Painter& painter) {
-    painter.fill_rectangle({0, 16, screen_width, screen_height - 16}, Color::white());
-    painter.draw_string({10 * 8, screen_height / 2}, Styles::white, "Use Stylus");
+    painter.fill_rectangle({0, 16, screen_width, screen_height - 16}, Theme::getInstance()->bg_darkest->foreground);
+    painter.draw_string({10 * 8, screen_height / 2}, *Theme::getInstance()->bg_darkest, "Use Stylus");
    pen_color = std::rand();
 }

@@ -86,59 +86,13 @@ class DebugMemoryView : public View {
        "Done"};
 };

-class TemperatureWidget : public Widget {
-   public:
-    explicit TemperatureWidget(
-        Rect parent_rect)
-        : Widget{parent_rect} {
-    }
-
-    void paint(Painter& painter) override;
-
-   private:
-    using sample_t = uint32_t;
-    using temperature_t = int32_t;
-
-    temperature_t temperature(const sample_t sensor_value) const;
-    Coord screen_y(const temperature_t temperature, const Rect& screen_rect) const;
-
-    std::string temperature_str(const temperature_t temperature) const;
-
-    static constexpr temperature_t display_temp_min = -10;  // Accomodate negative values, present in cold startup cases
-    static constexpr temperature_t display_temp_scale = 3;
-    static constexpr int bar_width = 1;
-    static constexpr int temp_len = 5;  // Now scale shows up to 5 chars ("-10ºC")
-};
-
-class TemperatureView : public View {
-   public:
-    explicit TemperatureView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "Temperature"; };
-
-   private:
-    Text text_title{
-        {76, 16, 240, 16},
-        "Temperature",
-    };
-
-    TemperatureWidget temperature_widget{
-        {0, 40, 240, 180},
-    };
-
-    Button button_done{
-        {72, 264, 96, 24},
-        "Done"};
-};
-
 typedef enum {
    CT_PMEM,
    CT_RFFC5072,
    CT_MAX283X,
    CT_SI5351,
    CT_AUDIO,
+    CT_MAX17055,
 } chip_type_t;

 struct RegistersWidgetConfig {
@@ -233,8 +187,8 @@ class RegistersView : public View {
        "Write"};

    Labels labels{
-        {{1 * 8, 248}, "Reg:", Color::light_grey()},
-        {{8 * 8, 248}, "Data:", Color::light_grey()}};
+        {{1 * 8, 248}, "Reg:", Theme::getInstance()->fg_light->foreground},
+        {{8 * 8, 248}, "Data:", Theme::getInstance()->fg_light->foreground}};

    SymField field_write_reg_num{
        {5 * 8, 248},
@@ -288,9 +242,9 @@ class DebugControlsView : public View {

   private:
    Labels labels{
-        {{8 * 8, 1 * 16}, "Controls State", Color::white()},
-        {{0 * 8, 11 * 16}, "Dial:", Color::grey()},
-        {{0 * 8, 14 * 16}, "Long-Press Mode:", Color::grey()}};
+        {{8 * 8, 1 * 16}, "Controls State", Theme::getInstance()->bg_darkest->foreground},
+        {{0 * 8, 11 * 16}, "Dial:", Theme::getInstance()->fg_medium->foreground},
+        {{0 * 8, 14 * 16}, "Long-Press Mode:", Theme::getInstance()->fg_medium->foreground}};

    ControlsSwitchesWidget switches_widget{
        {80, 80, 80, 112},
@@ -333,12 +287,12 @@ class DebugMemoryDumpView : public View {
        "Done"};

    Labels labels{
-        {{5 * 8, 1 * 16}, "Dump Range to File", Color::yellow()},
-        {{0 * 8, 2 * 16}, "Starting Address: 0x", Color::light_grey()},
-        {{0 * 8, 3 * 16}, "Byte Count:       0x", Color::light_grey()},
-        {{3 * 8, 8 * 16}, "Read/Write Single Word", Color::yellow()},
-        {{0 * 8, 9 * 16}, "Memory Address:   0x", Color::light_grey()},
-        {{0 * 8, 10 * 16}, "Data Value:       0x", Color::light_grey()}};
+        {{5 * 8, 1 * 16}, "Dump Range to File", Theme::getInstance()->fg_yellow->foreground},
+        {{0 * 8, 2 * 16}, "Starting Address: 0x", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 3 * 16}, "Byte Count:       0x", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 8 * 16}, "Read/Write Single Word", Theme::getInstance()->fg_yellow->foreground},
+        {{0 * 8, 9 * 16}, "Memory Address:   0x", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 10 * 16}, "Data Value:       0x", Theme::getInstance()->fg_light->foreground}};

    SymField field_starting_address{
        {20 * 8, 2 * 16},
@@ -0,0 +1,111 @@
+#include "ui_debug_max17055.hpp"
+#include "string_format.hpp"
+
+namespace ui {
+
+BatteryCapacityView::RegisterEntry BatteryCapacityView::get_entry(size_t index) {
+    if (index < i2cdev::I2cDev_MAX17055::entries_count) {
+        return i2cdev::I2cDev_MAX17055::entries[index];
+    }
+    return {"", 0, "", 0, false, "", false, 0, false, false, false, 0, false};
+}
+
+BatteryCapacityView::BatteryCapacityView(NavigationView& nav) {
+    for (size_t i = 0; i < ENTRIES_PER_PAGE; ++i) {
+        name_texts[i].set_parent_rect({0 * 8, static_cast<int>((i + 1) * 16), 8 * 8, 16});
+        addr_texts[i].set_parent_rect({9 * 8, static_cast<int>((i + 1) * 16), 4 * 8, 16});
+        hex_texts[i].set_parent_rect({14 * 8, static_cast<int>((i + 1) * 16), 6 * 8, 16});
+        value_texts[i].set_parent_rect({21 * 8, static_cast<int>((i + 1) * 16), 10 * 8, 16});
+
+        add_child(&name_texts[i]);
+        add_child(&addr_texts[i]);
+        add_child(&hex_texts[i]);
+        add_child(&value_texts[i]);
+    }
+
+    add_children({&labels, &page_text, &button_done});
+
+    button_done.on_select = [&nav](Button&) { nav.pop(); };
+
+    auto dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+    if (!dev) {  // dev not found
+        nav.pop();
+        return;
+    }
+
+    populate_page(0);
+    update_page_text();
+}
+
+void BatteryCapacityView::focus() {
+    button_done.focus();
+}
+
+bool BatteryCapacityView::on_encoder(const EncoderEvent delta) {
+    int32_t new_page = current_page + delta;
+    if (new_page >= 0 && new_page < ((int32_t)i2cdev::I2cDev_MAX17055::entries_count + ENTRIES_PER_PAGE - 1) / ENTRIES_PER_PAGE) {
+        current_page = new_page;
+        populate_page(current_page * ENTRIES_PER_PAGE);
+        update_page_text();
+    }
+    return true;
+}
+
+void BatteryCapacityView::update_values() {
+    i2cdev::I2cDev_MAX17055* dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+    for (size_t i = 0; i < ENTRIES_PER_PAGE; ++i) {
+        size_t entry_index = current_page * ENTRIES_PER_PAGE + i;
+        if (entry_index < i2cdev::I2cDev_MAX17055::entries_count) {
+            const auto entry = get_entry(entry_index);
+            uint16_t raw_value = dev->read_register(entry.address);
+
+            hex_texts[i].set("0x" + to_string_hex(raw_value, 4));
+
+            float scaled_value;
+            if (entry.is_signed) {
+                int16_t signed_value = static_cast<int16_t>(raw_value);
+                scaled_value = signed_value * entry.scalar;
+            } else {
+                scaled_value = raw_value * entry.scalar;
+            }
+
+            // Format the value with appropriate decimal places
+            std::string formatted_value;
+            if (entry.resolution > 0) {
+                formatted_value = to_string_decimal(scaled_value, std::min(entry.resolution, 3));
+            } else {
+                formatted_value = to_string_dec_int(scaled_value);  // Show up to 3 decimal places
+            }
+
+            value_texts[i].set(formatted_value + " " + entry.unit);
+        }
+    }
+}
+
+void BatteryCapacityView::populate_page(int start_index) {
+    for (size_t i = 0; i < ENTRIES_PER_PAGE; ++i) {
+        size_t entry_index = start_index + i;
+        if (entry_index < i2cdev::I2cDev_MAX17055::entries_count) {
+            const auto entry = get_entry(entry_index);
+            name_texts[i].set(entry.name);
+            addr_texts[i].set("0x" + to_string_hex(entry.address, 2));
+            name_texts[i].hidden(false);
+            addr_texts[i].hidden(false);
+            hex_texts[i].hidden(false);
+            value_texts[i].hidden(false);
+        } else {
+            name_texts[i].hidden(true);
+            addr_texts[i].hidden(true);
+            hex_texts[i].hidden(true);
+            value_texts[i].hidden(true);
+        }
+    }
+    update_values();
+}
+
+void BatteryCapacityView::update_page_text() {
+    int total_pages = (i2cdev::I2cDev_MAX17055::entries_count + ENTRIES_PER_PAGE - 1) / ENTRIES_PER_PAGE;
+    page_text.set("Page " + to_string_dec_uint(current_page + 1) + "/" + to_string_dec_uint(total_pages));
+}
+
+}  // namespace ui
@@ -0,0 +1,49 @@
+#ifndef __UI_DEBUG_BATTERY_HPP__
+#define __UI_DEBUG_BATTERY_HPP__
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_navigation.hpp"
+#include "battery.hpp"
+#include "i2cdevmanager.hpp"
+#include "i2cdev_max17055.hpp"
+
+namespace ui {
+
+class BatteryCapacityView : public View {
+   public:
+    BatteryCapacityView(NavigationView& nav);
+    void focus() override;
+    std::string title() const override { return "Battery Registers"; }
+
+    bool on_encoder(const EncoderEvent delta) override;
+
+    using RegisterEntry = i2cdev::I2cDev_MAX17055::RegisterEntry;
+
+   private:
+    static RegisterEntry get_entry(size_t index);
+
+    Labels labels{
+        {{0 * 8, 0 * 16}, "Reg", Theme::getInstance()->fg_yellow->foreground},
+        {{9 * 8, 0 * 16}, "Addr", Theme::getInstance()->fg_yellow->foreground},
+        {{14 * 8, 0 * 16}, "Hex", Theme::getInstance()->fg_yellow->foreground},
+        {{21 * 8, 0 * 16}, "Value", Theme::getInstance()->fg_yellow->foreground},
+    };
+    std::array<Text, 16> name_texts = {};
+    std::array<Text, 16> addr_texts = {};
+    std::array<Text, 16> hex_texts = {};
+    std::array<Text, 16> value_texts = {};
+
+    Text page_text{{144, 284, 80, 16}, "Page 1/1"};
+    Button button_done{{16, 280, 96, 24}, "Done"};
+
+    void update_values();
+    void populate_page(int start_index);
+    void update_page_text();
+    int current_page = 0;
+    static constexpr int ENTRIES_PER_PAGE = 16;
+};
+
+}  // namespace ui
+
+#endif  // __UI_DEBUG_BATTERY_HPP__
@@ -41,11 +41,6 @@ DfuMenu::DfuMenu(NavigationView& nav)
                  &text_info_line_8,
                  &text_info_line_9,
                  &text_info_line_10});
-
-    if (battery::BatteryManagement::isDetected()) {
-        add_child(&voltage_label);
-        add_child(&text_info_line_11);
-    }
 }

 void DfuMenu::paint(Painter& painter) {
@@ -53,7 +48,7 @@ void DfuMenu::paint(Painter& painter) {
    size_t m0_fragmented_free_space = 0;
    const auto m0_fragments = chHeapStatus(NULL, &m0_fragmented_free_space);

-    auto lines = (battery::BatteryManagement::isDetected() ? 11 : 10) + 2;
+    auto lines = 10 + 2;

    text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6));
    text_info_line_2.set(to_string_dec_uint(m0_fragmented_free_space, 6));
@@ -65,36 +60,33 @@ void DfuMenu::paint(Painter& painter) {
    text_info_line_8.set(to_string_dec_uint(shared_memory.m4_performance_counter, 6));
    text_info_line_9.set(to_string_dec_uint(shared_memory.m4_buffer_missed, 6));
    text_info_line_10.set(to_string_dec_uint(chTimeNow() / 1000, 6));
-    if (battery::BatteryManagement::isDetected()) {
-        text_info_line_11.set(to_string_decimal_padding((float)battery::BatteryManagement::getVoltage() / 1000.0, 3, 6));
-    }

    constexpr auto margin = 5;

    painter.fill_rectangle(
        {{6 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
         {15 * CHARACTER_WIDTH + margin * 2, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::black());
+        Theme::getInstance()->bg_darkest->background);

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{21 * CHARACTER_WIDTH + margin, 3 * LINE_HEIGHT - margin},
         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin - 8},
         {17 * CHARACTER_WIDTH + margin * 2, 8}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, (lines + 3) * LINE_HEIGHT + margin},
         {17 * CHARACTER_WIDTH + margin * 2, 8}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);
 }

 DfuMenu2::DfuMenu2(NavigationView& nav)
@@ -133,27 +125,27 @@ void DfuMenu2::paint(Painter& painter) {
    painter.fill_rectangle(
        {{5 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
         {19 * CHARACTER_WIDTH + margin * 2, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::black());
+        Theme::getInstance()->bg_darkest->background);

    painter.fill_rectangle(
        {{4 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin},
         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{24 * CHARACTER_WIDTH + margin, 3 * LINE_HEIGHT - margin},
         {CHARACTER_WIDTH, lines * LINE_HEIGHT + margin * 2}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{4 * CHARACTER_WIDTH - margin, 3 * LINE_HEIGHT - margin - 8},
         {21 * CHARACTER_WIDTH + margin * 2, 8}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);

    painter.fill_rectangle(
        {{4 * CHARACTER_WIDTH - margin, (lines + 3) * LINE_HEIGHT + margin},
         {21 * CHARACTER_WIDTH + margin * 2, 8}},
-        ui::Color::dark_cyan());
+        ui::Theme::getInstance()->fg_darkcyan->foreground);
 }

 } /* namespace ui */
@@ -49,18 +49,16 @@ class DfuMenu : public View {
    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 11 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Performance"};

    Labels labels{
-        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 core:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 frags:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M0 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M0 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 heap:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 stack:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "M4 cpu %:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "M4 miss:", Color::dark_cyan()},
-        {{6 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "Uptime:", Color::dark_cyan()}};
-
-    Labels voltage_label{{{6 * CHARACTER_WIDTH, 15 * LINE_HEIGHT}, "Voltage:", Color::dark_cyan()}};
+        {{6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "M0 core:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "M0 heap:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "M0 frags:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "M0 stack:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "M0 cpu %:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "M4 heap:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "M4 stack:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "M4 cpu %:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "M4 miss:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{6 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "Uptime:", Theme::getInstance()->fg_darkcyan->foreground}};

    Text text_info_line_1{{15 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_2{{15 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
@@ -72,7 +70,6 @@ class DfuMenu : public View {
    Text text_info_line_8{{15 * CHARACTER_WIDTH, 12 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_9{{15 * CHARACTER_WIDTH, 13 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
    Text text_info_line_10{{15 * CHARACTER_WIDTH, 14 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
-    Text text_info_line_11{{15 * CHARACTER_WIDTH, 15 * LINE_HEIGHT, 6 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
 };

 class DfuMenu2 : public View {
@@ -88,17 +85,17 @@ class DfuMenu2 : public View {
    Text text_head{{6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 14 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, "Radio Settings"};

    Labels labels{
-        {{5 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "RX Freq:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "RX BW:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "RX SampR:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "RX Satu%:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "Modulatn:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "AM cfg:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "NBFM cfg:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "WFM cfg:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "TX Freq:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "TX BW:", Color::dark_cyan()},
-        {{5 * CHARACTER_WIDTH, 15 * LINE_HEIGHT}, "TX SampR:", Color::dark_cyan()},
+        {{5 * CHARACTER_WIDTH, 5 * LINE_HEIGHT}, "RX Freq:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 6 * LINE_HEIGHT}, "RX BW:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 7 * LINE_HEIGHT}, "RX SampR:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 8 * LINE_HEIGHT}, "RX Satu%:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 9 * LINE_HEIGHT}, "Modulatn:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 10 * LINE_HEIGHT}, "AM cfg:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 11 * LINE_HEIGHT}, "NBFM cfg:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 12 * LINE_HEIGHT}, "WFM cfg:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 13 * LINE_HEIGHT}, "TX Freq:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 14 * LINE_HEIGHT}, "TX BW:", Theme::getInstance()->fg_darkcyan->foreground},
+        {{5 * CHARACTER_WIDTH, 15 * LINE_HEIGHT}, "TX SampR:", Theme::getInstance()->fg_darkcyan->foreground},
    };

    Text text_info_line_1{{14 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT}, ""};
@@ -25,6 +25,9 @@
 #include "baseband_api.hpp"
 #include "string_format.hpp"

+#define PADDING_LEFT 1
+#define PADDING_RIGHT 1
+
 using namespace portapack;

 namespace ui {
@@ -58,6 +61,7 @@ EncodersConfigView::EncodersConfigView(

    options_enctype.on_change = [this](size_t index, int32_t) {
        on_type_change(index);
+        set_dirty();
    };

    options_enctype.set_options(enc_options);
@@ -104,7 +108,18 @@ void EncodersConfigView::on_type_change(size_t index) {

    // Add new SymFields.
    Point pos{2 * 8, 9 * 8};
-    std::string format_string;
+    std::string format_string = encoder_def->word_format;
+
+    /*important notes of this format_String
+     * previously before PR#1444, this code using the for loop below to generate the format_string, which MAYBE to prevent showing the S symble.
+     * but after PR#1444, the entireh of symfield code not compatible with this design anymore.
+     * however the encoder_def struct itself has a field called word_format, which exactly be avle to use as the format_string,
+     * because itself is ONLY a hint text, not impact protocol things.
+     * When you find OOK protocol is broken and see this commit from git blame, please be aware that it's not from here.
+     * previously me and @cusspvz already found it broken, this commit is just to fix the broken that from PR#1444.
+     * @zxkmm
+     */
+
    uint8_t word_length = encoder_def->word_length;
    auto on_change_handler = [this](SymField&) {
        generate_frame();
@@ -119,11 +134,9 @@ void EncodersConfigView::on_type_change(size_t index) {
        switch (symbol_type) {
            case 'A':
                symfield->set_symbol_list(encoder_def->address_symbols);
-                format_string += 'A';
                break;
            case 'D':
                symfield->set_symbol_list(encoder_def->data_symbols);
-                format_string += 'D';
                break;
        }

@@ -131,8 +144,8 @@ void EncodersConfigView::on_type_change(size_t index) {
        pos += Point{8, 0};
    }

-    // Ugly :( Pad to erase
-    format_string.append(24 - format_string.size(), ' ');
+    // cut the S, cuz sync bit isn't in symfield for user to chage/edit.
+    format_string.erase(std::remove(format_string.begin(), format_string.end(), 'S'), format_string.end());
    text_format.set(format_string);

    generate_frame();
@@ -144,12 +157,34 @@ void EncodersConfigView::on_show() {
 }

 void EncodersConfigView::draw_waveform() {
+    // padding reason:
+    // in real world the signal would always start with low level and became low level again after yout turn off the radio;
+    // the waveform_buffer only controls drawing, the real send logic that been sent is controlled by frame_fragments
+    // so just for out of looking things
+
    size_t length = frame_fragments.length();

-    for (size_t n = 0; n < length; n++)
-        waveform_buffer[n] = (frame_fragments[n] == '0') ? 0 : 1;
+    // currently not needed since all the supported OOK protocol wont exceed 550 yet
+    if (length + (PADDING_LEFT + PADDING_RIGHT) >= WAVEFORM_BUFFER_SIZE) {
+        length = WAVEFORM_BUFFER_SIZE - (PADDING_LEFT + PADDING_RIGHT);
+    }

-    waveform.set_length(length);
+    // padding l
+    for (size_t i = 0; i < PADDING_LEFT; i++) {
+        waveform_buffer[i] = 0;
+    }
+
+    // real wf
+    for (size_t n = 0; n < length; n++) {
+        waveform_buffer[n + PADDING_LEFT] = (frame_fragments[n] == '0') ? 0 : 1;
+    }
+
+    // padding r
+    for (size_t i = length + PADDING_LEFT; i < WAVEFORM_BUFFER_SIZE; i++) {
+        waveform_buffer[i] = 0;
+    }
+
+    waveform.set_length(length + PADDING_LEFT + PADDING_RIGHT);
    waveform.set_dirty();
 }

@@ -32,6 +32,8 @@
 #include <memory>
 #include <vector>

+#define WAVEFORM_BUFFER_SIZE 550
+
 using namespace encoders;

 namespace ui {
@@ -56,7 +58,7 @@ class EncodersConfigView : public View {
    std::string frame_fragments = "0";

   private:
-    int16_t waveform_buffer[550];
+    int16_t waveform_buffer[WAVEFORM_BUFFER_SIZE];
    const encoder_def_t* encoder_def{};

    void draw_waveform();
@@ -64,16 +66,16 @@ class EncodersConfigView : public View {
    void on_type_change(size_t index);

    Labels labels{
-        {{1 * 8, 0}, "Type:", Color::light_grey()},
-        {{17 * 8, 0}, "Repeat:", Color::light_grey()},
-        {{1 * 8, 2 * 8}, "Clk:", Color::light_grey()},
-        {{10 * 8, 2 * 8}, "kHz", Color::light_grey()},
-        {{17 * 8, 2 * 8}, "Step:", Color::light_grey()},
-        {{1 * 8, 4 * 8}, "Frame:", Color::light_grey()},
-        {{13 * 8, 4 * 8}, "us", Color::light_grey()},
-        {{17 * 8, 4 * 8}, "Step:", Color::light_grey()},
-        {{2 * 8, 7 * 8}, "Symbols:", Color::light_grey()},
-        {{1 * 8, 14 * 8}, "Waveform:", Color::light_grey()}};
+        {{1 * 8, 0}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{17 * 8, 0}, "Repeat:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 8}, "Clk:", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, 2 * 8}, "kHz", Theme::getInstance()->fg_light->foreground},
+        {{17 * 8, 2 * 8}, "Step:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 4 * 8}, "Frame:", Theme::getInstance()->fg_light->foreground},
+        {{13 * 8, 4 * 8}, "us", Theme::getInstance()->fg_light->foreground},
+        {{17 * 8, 4 * 8}, "Step:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 7 * 8}, "Symbols:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 14 * 8}, "Waveform:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_enctype{// Options are loaded at runtime
                                 {6 * 8, 0},
@@ -128,7 +130,7 @@ class EncodersConfigView : public View {
        0,
        0,
        true,
-        Color::yellow()};
+        Theme::getInstance()->fg_yellow->foreground};
 };

 class EncodersScanView : public View {
@@ -160,9 +162,9 @@ class EncodersScanView : public View {

   private:
    Labels labels{
-        {{1 * 8, 0 * 8}, "Length:", Color::light_grey()},
-        {{1 * 8, 2 * 8}, "Bit length:", Color::light_grey()},
-        {{16 * 8, 2 * 8}, "us", Color::light_grey()},
+        {{1 * 8, 0 * 8}, "Length:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 8}, "Bit length:", Theme::getInstance()->fg_light->foreground},
+        {{16 * 8, 2 * 8}, "us", Theme::getInstance()->fg_light->foreground},
    };
 };

@@ -206,8 +208,8 @@ class EncodersView : public View {
    EncodersScanView view_scan{nav_, view_rect};

    TabView tab_view{
-        {"Config", Color::cyan(), &view_config},
-        {"de Bruijn", Color::green(), &view_scan},
+        {"Config", Theme::getInstance()->fg_cyan->foreground, &view_config},
+        {"de Bruijn", Theme::getInstance()->fg_green->foreground, &view_scan},
    };

    Text text_status{
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2024 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_external_module_view.hpp"
+#include "portapack.hpp"
+#include "ui_standalone_view.hpp"
+
+#include "i2cdevmanager.hpp"
+#include "i2cdev_ppmod.hpp"
+
+#include <optional>
+
+namespace ui {
+
+void ExternalModuleView::focus() {
+    dummy.focus();
+}
+
+void ExternalModuleView::on_tick_second() {
+    i2cdev::I2CDevManager::manual_scan();
+
+    auto dev = (i2cdev::I2cDev_PPmod*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDECMDL_PPMOD);
+
+    if (!dev) {
+        text_header.set("No module connected");
+        text_name.set("");
+        text_version.set("");
+        text_number_apps.set("");
+        text_app1_name.set("");
+        text_app2_name.set("");
+        text_app3_name.set("");
+        text_app4_name.set("");
+        text_app5_name.set("");
+        return;
+    }
+
+    auto device_info = dev->readDeviceInfo();
+
+    if (device_info.has_value() == false) {
+        text_header.set("No module connected");
+        text_name.set("");
+        text_version.set("");
+        text_number_apps.set("");
+        text_app1_name.set("");
+        text_app2_name.set("");
+        text_app3_name.set("");
+        text_app4_name.set("");
+        text_app5_name.set("");
+        return;
+    }
+
+    text_header.set("Module found");
+
+    std::string btnText = (std::string) "Module: " + device_info->module_name;
+    text_name.set(btnText);
+    text_version.set("Version: " + std::to_string(device_info->module_version));
+    text_number_apps.set("No# Apps: " + std::to_string(device_info->application_count));
+
+    for (uint32_t i = 0; i < device_info->application_count && i < 5; i++) {
+        auto appInfo = dev->getStandaloneAppInfo(i);
+        if (appInfo.has_value() == false) {
+            continue;
+        }
+
+        std::string btnText = (std::string) "App " + std::to_string(i + 1) + ": " + (const char*)appInfo->app_name;
+
+        switch (appInfo->menu_location) {
+            case app_location_t::UTILITIES:
+                btnText += " (Utilities)";
+                break;
+            case app_location_t::RX:
+                btnText += " (RX)";
+                break;
+            case app_location_t::TX:
+                btnText += " (TX)";
+                break;
+            case app_location_t::DEBUG:
+                btnText += " (Debug)";
+                break;
+            case app_location_t::HOME:
+                btnText += " (Home)";
+                break;
+        }
+
+        switch (i) {
+            case 0:
+                text_app1_name.set(btnText);
+                break;
+            case 1:
+                text_app2_name.set(btnText);
+                break;
+            case 2:
+                text_app3_name.set(btnText);
+                break;
+            case 3:
+                text_app4_name.set(btnText);
+                break;
+            case 4:
+                text_app5_name.set(btnText);
+                break;
+        }
+    }
+}
+}  // namespace ui
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2024 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __UI_EXTERNAL_MODULE_VIEW_H
+#define __UI_EXTERNAL_MODULE_VIEW_H
+
+#include "ui.hpp"
+#include "ui_widget.hpp"
+#include "ui_painter.hpp"
+#include "ui_menu.hpp"
+#include "ui_navigation.hpp"
+
+#include "rffc507x.hpp"
+#include "portapack.hpp"
+#include "memory_map.hpp"
+#include "irq_controls.hpp"
+
+#include <functional>
+#include <utility>
+
+#include "i2cdevmanager.hpp"
+#include "i2cdev_ppmod.hpp"
+
+namespace ui {
+
+class ExternalModuleView : public View {
+   public:
+    ExternalModuleView(NavigationView& nav)
+        : nav_(nav) {
+        add_children({&text_header,
+                      &text_name,
+                      &text_version,
+                      &text_number_apps,
+                      &text_app1_name,
+                      &text_app2_name,
+                      &text_app3_name,
+                      &text_app4_name,
+                      &text_app5_name,
+                      &dummy});
+
+        text_header.set("No module connected");
+
+        signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
+            on_tick_second();
+        };
+    }
+
+    ~ExternalModuleView() {
+        rtc_time::signal_tick_second -= signal_token_tick_second;
+    }
+
+    std::string title() const override { return "Ext Module"; };
+    void focus() override;
+
+   private:
+    NavigationView& nav_;
+    Text text_header{{16, 16, 208, 16}};
+    Text text_name{{24, 32, 200, 16}};
+    Text text_version{{24, 48, 200, 16}};
+    Text text_number_apps{{24, 64, 200, 16}};
+
+    Text text_app1_name{{24, 96, 200, 16}};
+    Text text_app2_name{{24, 112, 200, 16}};
+    Text text_app3_name{{24, 128, 200, 16}};
+    Text text_app4_name{{24, 144, 200, 16}};
+    Text text_app5_name{{24, 160, 200, 16}};
+
+    Button dummy{
+        {240, 0, 0, 0},
+        ""};
+
+    SignalToken signal_token_tick_second{};
+
+    void on_tick_second();
+};
+
+}  // namespace ui
+
+#endif
@@ -27,7 +27,6 @@
 #include <algorithm>
 #include "ui_fileman.hpp"
 #include "ui_playlist.hpp"
-#include "ui_remote.hpp"
 #include "ui_ss_viewer.hpp"
 #include "ui_bmp_file_viewer.hpp"
 #include "ui_text_editor.hpp"
@@ -389,7 +388,7 @@ void FileManBaseView::refresh_list() {

            menu_view.add_item(
                {entry_name.substr(0, max_filename_length) + std::string(21 - entry_name.length(), ' ') + size_str,
-                 ui::Color::yellow(),
+                 Theme::getInstance()->fg_yellow->foreground,
                 &bitmap_icon_dir,
                 [this](KeyEvent key) {
                     if (on_select_entry)
@@ -704,10 +703,11 @@ bool FileManagerView::handle_file_open() {

        reload_current(false);
        return true;
-    } else if (path_iequal(rem_ext, ext)) {
+    }
+    /*else if (path_iequal(rem_ext, ext)) {
        nav_.push<RemoteView>(path);
        return true;
-    }
+    }*/

    return false;
 }
@@ -747,14 +747,21 @@ FileManagerView::FileManagerView(

    menu_view.on_highlight = [this]() {
        if (menu_view.highlighted_index() >= max_items_loaded - 1) {  // todo check this if correct
-            text_date.set_style(&Styles::red);
+            text_date.set_style(Theme::getInstance()->fg_red);
            text_date.set("Too many files!");
        } else {
-            text_date.set_style(&Styles::grey);
-            if (selected_is_valid())
-                text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path())));
-            else
+            text_date.set_style(Theme::getInstance()->fg_medium);
+            if (selected_is_valid()) {
+                if (get_selected_entry().path == str_back) {
+                    text_date.set("Go page " + std::to_string(pagination + 1 - 1));  // for better explain, pagination start with 0 AKA real page - 1
+                } else if (get_selected_entry().path == str_next) {
+                    text_date.set("Go page " + std::to_string(pagination + 1 + 1));  // when show this, it should display current AKA (pagination + 1) + 1 AKA next page
+                } else {
+                    text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path())));
+                }
+            } else {
                text_date.set("");
+            }
        }
    };

@@ -858,7 +865,7 @@ FileManagerView::FileManagerView(

    button_show_hidden_files.on_select = [this]() {
        show_hidden_files = !show_hidden_files;
-        button_show_hidden_files.set_color(show_hidden_files ? Color::green() : Color::dark_grey());
+        button_show_hidden_files.set_color(show_hidden_files ? *Theme::getInstance()->status_active : Theme::getInstance()->bg_dark->background);
        reload_current();
    };
 }
@@ -81,9 +81,9 @@ class FileManBaseView : public View {
        {u".C8", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".C16", &bitmap_icon_file_iq, ui::Color::dark_cyan()},
        {u".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta()},
-        {u".PPL", &bitmap_icon_file_iq, ui::Color::white()},  // Playlist/Replay
-        {u".REM", &bitmap_icon_remote, ui::Color::orange()},  // Remote
-        {u"", &bitmap_icon_file, ui::Color::light_grey()}     // NB: Must be last.
+        {u".PPL", &bitmap_icon_file_iq, ui::Color::white()},                  // Playlist/Replay
+        {u".REM", &bitmap_icon_remote, ui::Color::orange()},                  // Remote
+        {u"", &bitmap_icon_file, Theme::getInstance()->fg_light->foreground}  // NB: Must be last.
    };

    std::filesystem::path get_selected_full_path() const;
@@ -116,7 +116,7 @@ class FileManBaseView : public View {
    bool show_hidden_files{false};

    Labels labels{
-        {{0, 0}, "Path:", Color::light_grey()}};
+        {{0, 0}, "Path:", Theme::getInstance()->fg_light->foreground}};

    Text text_current{
        {6 * 8, 0 * 8, 24 * 8, 16},
@@ -166,8 +166,8 @@ private:
        std::string buffer_ { };

        Labels labels {
-                { { 0 * 8, 1 * 16 }, "Path:", Color::light_grey() },
-                { { 0 * 8, 6 * 16 }, "Filename:", Color::light_grey() },
+                { { 0 * 8, 1 * 16 }, "Path:", Theme::getInstance()->fg_light->foreground },
+                { { 0 * 8, 6 * 16 }, "Filename:",Theme::getInstance()->fg_light->foreground },
        };

        Text text_path {
@@ -234,62 +234,62 @@ class FileManagerView : public FileManBaseView {
        {0 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_rename,
-        Color::dark_blue()};
+        Theme::getInstance()->fg_blue->foreground};

    NewButton button_delete{
        {9 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trash,
-        Color::red()};
+        Theme::getInstance()->fg_red->foreground};

    NewButton button_clean{
        {13 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_clean,
-        Color::red()};
+        Theme::getInstance()->fg_red->foreground};

    NewButton button_cut{
        {9 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_cut,
-        Color::dark_grey()};
+        Theme::getInstance()->fg_dark->foreground};

    NewButton button_copy{
        {13 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_copy,
-        Color::dark_grey()};
+        Theme::getInstance()->fg_dark->foreground};

    NewButton button_paste{
        {17 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_paste,
-        Color::dark_grey()};
+        Theme::getInstance()->fg_dark->foreground};

    NewButton button_new_dir{
        {22 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_new_dir,
-        Color::green()};
+        Theme::getInstance()->fg_green->foreground};

    NewButton button_new_file{
        {26 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_new_file,
-        Color::green()};
+        Theme::getInstance()->fg_green->foreground};

    NewButton button_open_notepad{
        {0 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_notepad,
-        Color::orange()};
+        Theme::getInstance()->fg_orange->foreground};

    NewButton button_rename_timestamp{

        {4 * 8, 29 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_options_datetime,
-        Color::dark_blue(),
+        Theme::getInstance()->fg_blue->foreground,
        /*vcenter*/ true};

    NewButton button_open_iq_trim{
@@ -297,13 +297,13 @@ class FileManagerView : public FileManBaseView {
        {4 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_trim,
-        Color::orange()};
+        Theme::getInstance()->fg_orange->foreground};

    NewButton button_show_hidden_files{
        {17 * 8, 34 * 8, 4 * 8, 32},
        {},
        &bitmap_icon_hide,
-        Color::dark_grey()};
+        Theme::getInstance()->fg_dark->foreground};
 };

 } /* namespace ui */
@@ -21,7 +21,6 @@
 */

 #include "ui_flash_utility.hpp"
-#include "ui_styles.hpp"
 #include "portapack_shared_memory.hpp"
 #include "file_path.hpp"

@@ -83,6 +82,7 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)

    menu_view.set_parent_rect({0, 3 * 8, 240, 33 * 8});

+    ensure_directory(apps_dir);
    ensure_directory(firmware_dir);

    auto add_firmware_items = [&](
@@ -95,17 +95,17 @@ FlashUtilityView::FlashUtilityView(NavigationView& nav)

            menu_view.add_item({filename.string().substr(0, max_filename_length),
                                color,
-                                &bitmap_icon_temperature,
+                                &bitmap_icon_peripherals_details,
                                [this, path](KeyEvent) {
                                    this->firmware_selected(path);
                                }});
        }
    };

-    add_firmware_items(firmware_dir, u"*.bin", ui::Color::red());
-    add_firmware_items(firmware_dir, u"*.tar", ui::Color::purple());
+    add_firmware_items(firmware_dir, u"*.bin", ui::Theme::getInstance()->fg_red->foreground);
+    add_firmware_items(firmware_dir, u"*.tar", ui::Theme::getInstance()->fg_cyan->foreground);

-    // add_firmware_items(user_firmware_folder,u"*.bin", ui::Color::purple());
+    // add_firmware_items(user_firmware_folder,u"*.bin", ui::Theme::getInstance()->fg_cyan->foreground);
 }

 void FlashUtilityView::firmware_selected(std::filesystem::path::string_type path) {
@@ -134,12 +134,12 @@ std::filesystem::path FlashUtilityView::extract_tar(std::filesystem::path::strin
    //
    painter.fill_rectangle(
        {0, 0, portapack::display.width(), portapack::display.height()},
-        ui::Color::black());
+        Theme::getInstance()->bg_darkest->background);
    painter.draw_string({12, 24}, this->nav_.style(), "Unpacking TAR file...");

    auto res = UnTar::untar(path, [this](const std::string fileName) {
        ui::Painter painter;
-        painter.fill_rectangle({0, 50, portapack::display.width(), 90}, ui::Color::black());
+        painter.fill_rectangle({0, 50, portapack::display.width(), 90}, Theme::getInstance()->bg_darkest->background);
        painter.draw_string({0, 60}, this->nav_.style(), fileName);
    });
    return res;
@@ -153,14 +153,14 @@ bool FlashUtilityView::flash_firmware(std::filesystem::path::string_type path) {
    }

    if (path.empty() || !valid_firmware_file(path.c_str())) {
-        painter.fill_rectangle({0, 50, portapack::display.width(), 90}, ui::Color::black());
-        painter.draw_string({0, 60}, Styles::red, "BAD FIRMWARE FILE");
+        painter.fill_rectangle({0, 50, portapack::display.width(), 90}, Theme::getInstance()->bg_darkest->background);
+        painter.draw_string({0, 60}, *Theme::getInstance()->fg_red, "BAD FIRMWARE FILE OR W/R ERR");
        chThdSleepMilliseconds(5000);
        return false;
    }
    painter.fill_rectangle(
        {0, 0, portapack::display.width(), portapack::display.height()},
-        ui::Color::black());
+        Theme::getInstance()->bg_darkest->background);

    painter.draw_string({12, 24}, this->nav_.style(), "This will take 15 seconds.");
    painter.draw_string({12, 64}, this->nav_.style(), "Please wait while LED RX");
@@ -57,7 +57,7 @@ class FlashUtilityView : public View {
    static Thread* thread;

    Labels labels{
-        {{4, 4}, "Select firmware to flash:", Color::white()}};
+        {{4, 4}, "Select firmware to flash:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
        {0, 2 * 8, 240, 26 * 8},
@@ -29,7 +29,6 @@
 #include "rtc_time.hpp"
 #include "tone_key.hpp"
 #include "ui_receiver.hpp"
-#include "ui_styles.hpp"
 #include "utility.hpp"
 #include "file_path.hpp"

@@ -41,27 +40,39 @@ namespace fs = std::filesystem;

 // TODO: Clean up after moving to better lookup tables.
 using options_t = OptionsField::options_t;
-extern options_t freqman_modulations;
-extern options_t freqman_bandwidths[4];
-extern options_t freqman_steps;
-extern options_t freqman_steps_short;
+
+using option_db_t = std::pair<std::string_view, int32_t>;
+using options_db_t = std::vector<option_db_t>;
+
+extern options_db_t freqman_modulations;
+extern options_db_t freqman_bandwidths[4];
+extern options_db_t freqman_steps;
+extern options_db_t freqman_steps_short;
+
+options_t dboptions_to_options(const options_db_t& dboptions) {
+    options_t options;
+    for (const auto& dboption : dboptions) {
+        options.emplace_back(dboption.first, dboption.second);
+    }
+    return options;
+}

 /* Set options. */
 void freqman_set_modulation_option(OptionsField& option) {
-    option.set_options(freqman_modulations);
+    option.set_options(dboptions_to_options(freqman_modulations));
 }

 void freqman_set_bandwidth_option(freqman_index_t modulation, OptionsField& option) {
    if (is_valid(modulation))
-        option.set_options(freqman_bandwidths[modulation]);
+        option.set_options(dboptions_to_options(freqman_bandwidths[modulation]));
 }

 void freqman_set_step_option(OptionsField& option) {
-    option.set_options(freqman_steps);
+    option.set_options(dboptions_to_options(freqman_steps));
 }

 void freqman_set_step_option_short(OptionsField& option) {
-    option.set_options(freqman_steps_short);
+    option.set_options(dboptions_to_options(freqman_steps_short));
 }

 namespace ui {
@@ -416,16 +427,16 @@ void FrequencyEditView::refresh_ui() {
    auto is_repeater = entry_.type == freqman_type::Repeater;
    auto has_freq_b = is_range || is_ham || is_repeater;

-    field_freq_b.set_style(has_freq_b ? &Styles::white : &Styles::grey);
-    field_step.set_style(is_range ? &Styles::white : &Styles::grey);
-    field_tone.set_style(is_ham ? &Styles::white : &Styles::grey);
+    field_freq_b.set_style(has_freq_b ? Theme::getInstance()->bg_darkest : Theme::getInstance()->fg_medium);
+    field_step.set_style(is_range ? Theme::getInstance()->bg_darkest : Theme::getInstance()->fg_medium);
+    field_tone.set_style(is_ham ? Theme::getInstance()->bg_darkest : Theme::getInstance()->fg_medium);

    if (is_valid(entry_)) {
        text_validation.set("Valid");
-        text_validation.set_style(&Styles::green);
+        text_validation.set_style(Theme::getInstance()->fg_green);
    } else {
        text_validation.set("Error");
-        text_validation.set_style(&Styles::red);
+        text_validation.set_style(Theme::getInstance()->fg_red);
    }
 }

@@ -439,7 +450,7 @@ void FrequencyEditView::populate_bandwidth_options() {
        auto& bandwidths = freqman_bandwidths[entry_.modulation];
        for (auto i = 0u; i < bandwidths.size(); ++i) {
            auto& item = bandwidths[i];
-            options.push_back({item.first, (OptionsField::value_t)i});
+            options.push_back({(std::string)item.first, (OptionsField::value_t)i});
        }
    }

@@ -452,7 +463,7 @@ void FrequencyEditView::populate_step_options() {

    for (auto i = 0u; i < freqman_steps.size(); ++i) {
        auto& item = freqman_steps[i];
-        options.push_back({item.first, (OptionsField::value_t)i});
+        options.push_back({(std::string)item.first, (OptionsField::value_t)i});
    }

    field_step.set_options(std::move(options));
@@ -61,7 +61,7 @@ class FreqManBaseView : public View {

    /* The top section (category) is 20px tall. */
    Labels label_category{
-        {{0, 2}, "F:", Color::light_grey()}};
+        {{0, 2}, "F:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_category{
        {3 * 8, 2},
@@ -97,7 +97,7 @@ class FrequencySaveView : public FreqManBaseView {
        0};

    Labels labels{
-        {{0 * 8, 6 * 16}, "Description:", Color::white()}};
+        {{0 * 8, 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}};

    TextField field_description{
        {0 * 8, 7 * 16, 30 * 8, 1 * 16},
@@ -137,14 +137,14 @@ class FrequencyManagerView : public FreqManBaseView {
        {23 * 8, 0 * 16, 7 * 4, 20},
        {},
        &bitmap_icon_new_file,
-        Color::white(),
+        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_category{
        {26 * 8 + 4, 0 * 16, 7 * 4, 20},
        {},
        &bitmap_icon_trash,
-        Color::red(),
+        Theme::getInstance()->fg_red->foreground,
        true};

    Button button_edit_entry{
@@ -153,7 +153,7 @@ class FrequencyManagerView : public FreqManBaseView {

    Rectangle rect_padding{
        {15 * 8, 14 * 16 - 4, 15 * 8, 1 * 16 + 4},
-        Color::grey()};
+        Theme::getInstance()->fg_medium->background};

    Button button_edit_freq{
        {0 * 8, 15 * 16, 15 * 8, 2 * 16},
@@ -167,14 +167,14 @@ class FrequencyManagerView : public FreqManBaseView {
        {15 * 8, 15 * 16, 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_add,
-        Color::white(),
+        Theme::getInstance()->bg_darkest->foreground,
        true};

    NewButton button_del_entry{
        {22 * 8 + 4, 15 * 16, 7 * 8 + 4, 2 * 16},
        {},
        &bitmap_icon_delete,
-        Color::red(),
+        Theme::getInstance()->fg_red->foreground,
        true};
 };

@@ -200,15 +200,15 @@ class FrequencyEditView : public View {
    void populate_tone_options();

    Labels labels{
-        {{5 * 8, 1 * 16}, "Edit Frequency Entry", Color::white()},
-        {{0 * 8, 3 * 16}, "Entry Type :", Color::light_grey()},
-        {{0 * 8, 4 * 16}, "Frequency A:", Color::light_grey()},
-        {{0 * 8, 5 * 16}, "Frequency B:", Color::light_grey()},
-        {{0 * 8, 6 * 16}, "Modulation :", Color::light_grey()},
-        {{0 * 8, 7 * 16}, "Bandwidth  :", Color::light_grey()},
-        {{0 * 8, 8 * 16}, "Step       :", Color::light_grey()},
-        {{0 * 8, 9 * 16}, "Tone Freq  :", Color::light_grey()},
-        {{0 * 8, 10 * 16}, "Description:", Color::light_grey()},
+        {{5 * 8, 1 * 16}, "Edit Frequency Entry", Theme::getInstance()->bg_darkest->foreground},
+        {{0 * 8, 3 * 16}, "Entry Type :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 4 * 16}, "Frequency A:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 5 * 16}, "Frequency B:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 6 * 16}, "Modulation :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 7 * 16}, "Bandwidth  :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Step       :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 9 * 16}, "Tone Freq  :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 10 * 16}, "Description:", Theme::getInstance()->fg_light->foreground},
    };

    OptionsField field_type{
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_fsk_rx.hpp"
-
-#include "audio.hpp"
-#include "baseband_api.hpp"
-#include "portapack_persistent_memory.hpp"
-#include "string_format.hpp"
-#include "utility.hpp"
-#include "file_path.hpp"
-
-#include "ui_freqman.hpp"
-
-using namespace portapack;
-namespace pmem = portapack::persistent_memory;
-
-void FskRxLogger::log_raw_data(const std::string& data, const uint32_t frequency) {
-    std::string entry = "Raw: F:" + to_string_dec_uint(frequency) + "Hz";
-
-    // // Raw hex dump of all the codewords
-    // for (size_t c = 0; c < 16; c++)
-    //     entry += to_string_hex(packet[c], 8) + " ";
-
-    log_file.write_entry(data + entry);
-}
-
-void FskRxLogger::log_decoded(Timestamp timestamp, const std::string& text) {
-    log_file.write_entry(timestamp, text);
-}
-
-namespace ui {
-//---------------------------------------------------------------------------------------------------------------
-//  Console View
-//---------------------------------------------------------------------------------------------------------------
-FskRxAppConsoleView::FskRxAppConsoleView(NavigationView& nav, Rect parent_rect)
-    : View(parent_rect), nav_{nav} {
-    add_child(&console);
-};
-
-void FskRxAppConsoleView::on_packet(uint32_t value, bool is_data) {
-    if (is_data) {
-        console.write(to_string_dec_uint(value) + " ");
-    }
-}
-
-void FskRxAppConsoleView::on_show() {
-    hidden(false);
-}
-
-void FskRxAppConsoleView::on_hide() {
-    hidden(true);
-}
-
-FskRxAppConsoleView::~FskRxAppConsoleView() {
-}
-
-//---------------------------------------------------------------------------------------------------------------
-//  Spectrum View
-//---------------------------------------------------------------------------------------------------------------
-FskRxAppView::FskRxAppView(NavigationView& nav, Rect parent_rect)
-    : View(parent_rect), nav_{nav} {
-    add_child(&waterfall);
-    hidden(true);
-}
-
-FskRxAppView::~FskRxAppView() {
-}
-
-void FskRxAppView::focus() {
-}
-
-void FskRxAppView::on_show() {
-    hidden(false);
-    waterfall.start();
-}
-
-void FskRxAppView::on_hide() {
-    hidden(true);
-    waterfall.stop();
-}
-
-//---------------------------------------------------------------------------------------------------------------
-//  Base View
-//---------------------------------------------------------------------------------------------------------------
-FskxRxMainView::FskxRxMainView(NavigationView& nav)
-    : nav_{nav} {
-    add_children({&tab_view,
-                  &view_data,
-                  &view_stream,
-                  &labels,
-                  &rssi,
-                  &channel,
-                  &field_rf_amp,
-                  &field_lna,
-                  &field_vga,
-                  &field_frequency,
-                  &deviation_frequency,
-                  &record_view});
-
-    baseband::run_image(portapack::spi_flash::image_tag_fskrx);
-
-    // DEBUG
-    record_view.on_error = [&nav](std::string message) {
-        nav.display_modal("Error", message);
-    };
-
-    deviation_frequency.on_change = [this](rf::Frequency f) {
-        refresh_ui(f);
-    };
-
-    // Set initial sampling rate
-    /* Bandwidth of 2FSK is 2 * Deviation */
-    record_view.set_sampling_rate(initial_deviation * 2);
-
-    field_frequency.set_value(initial_target_frequency);
-    deviation_frequency.set_value(initial_deviation);
-
-    logger.append(logs_dir / u"FSKRX.TXT");
-
-    baseband::set_fsk(initial_deviation);
-
-    audio::output::start();
-    receiver_model.enable();
-}
-
-void FskxRxMainView::handle_decoded(Timestamp timestamp, const std::string& prefix) {
-    if (logging()) {
-        logger.log_decoded(timestamp, prefix);
-    }
-}
-
-void FskxRxMainView::refresh_ui(rf::Frequency deviationHz) {
-    /* Nyquist would imply a sample rate of 2x bandwidth, but because the ADC
-     * provides 2 values (I,Q), the sample_rate is equal to bandwidth here. */
-    /* Bandwidth of 2FSK is 2 * Deviation */
-    auto sample_rate = deviationHz * 2;
-
-    /* base_rate (bandwidth) is used for FFT calculation and display LCD, and also in recording writing SD Card rate. */
-    /* ex. sampling_rate values, 4Mhz, when recording 500 kHz (BW) and fs 8 Mhz, when selected 1 Mhz BW ... */
-    /* ex. recording 500kHz BW to .C16 file, base_rate clock 500kHz x2(I,Q) x 2 bytes (int signed) =2MB/sec rate SD Card. */
-
-    if (!view_stream.hidden()) {
-        view_stream.waterfall.stop();
-    }
-
-    // record_view determines the correct oversampling to apply and returns the actual sample rate.
-    // NB: record_view is what actually updates proc_capture baseband settings.
-    auto actual_sample_rate = record_view.set_sampling_rate(sample_rate);
-
-    // Update the radio model with the actual sampling rate.
-    receiver_model.set_sampling_rate(actual_sample_rate);
-
-    // Get suitable anti-aliasing BPF bandwidth for MAX2837 given the actual sample rate.
-    auto anti_alias_filter_bandwidth = filter_bandwidth_for_sampling_rate(actual_sample_rate);
-    receiver_model.set_baseband_bandwidth(anti_alias_filter_bandwidth);
-
-    if (!view_stream.hidden()) {
-        view_stream.waterfall.start();
-    }
-}
-
-void FskxRxMainView::focus() {
-    field_frequency.focus();
-}
-
-void FskxRxMainView::set_parent_rect(const Rect new_parent_rect) {
-    View::set_parent_rect(new_parent_rect);
-
-    ui::Rect waterfall_rect{0, 0, new_parent_rect.width(), new_parent_rect.height() - header_height};
-    view_stream.waterfall.set_parent_rect(waterfall_rect);
-}
-
-FskxRxMainView::~FskxRxMainView() {
-    audio::output::stop();
-    receiver_model.disable();
-    baseband::shutdown();
-}
-} /* namespace ui */
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2018 Furrtek
- * Copyright (C) 2023 gullradriel, Nilorea Studio Inc.
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_FSK_RX_H__
-#define __UI_FSK_RX_H__
-
-#include "ui_widget.hpp"
-#include "ui_freq_field.hpp"
-#include "ui_receiver.hpp"
-#include "ui_record_view.hpp"
-#include "ui_rssi.hpp"
-#include "ui_spectrum.hpp"
-#include "ui_styles.hpp"
-#include "ui_tabview.hpp"
-
-#include "app_settings.hpp"
-#include "log_file.hpp"
-#include "radio_state.hpp"
-#include "pocsag_app.hpp"
-
-#include <functional>
-
-class FskRxLogger {
-   public:
-    Optional<File::Error> append(const std::filesystem::path& filename) {
-        return log_file.append(filename);
-    }
-
-    void log_raw_data(const std::string& data, const uint32_t frequency);
-    void log_decoded(Timestamp timestamp, const std::string& text);
-
-   private:
-    LogFile log_file{};
-};
-
-namespace ui {
-class FskRxAppConsoleView : public View {
-   public:
-    FskRxAppConsoleView(NavigationView& nav, Rect parent_rec);
-    ~FskRxAppConsoleView();
-
-    std::string title() const override { return "FSK RX Data"; };
-
-    void on_packet(uint32_t value, bool is_data);
-
-    void on_show() override;
-    void on_hide() override;
-
-   private:
-    NavigationView& nav_;
-
-    Console console{
-        {0, 0, 240, 224}};
-};
-
-class FskRxAppView : public View {
-   public:
-    FskRxAppView(NavigationView& nav, Rect parent_rect);
-    ~FskRxAppView();
-
-    void focus() override;
-    void on_show() override;
-    void on_hide() override;
-
-    spectrum::WaterfallView waterfall{};
-
-    std::string title() const override { return "FSK RX Stream"; };
-
-   private:
-    NavigationView& nav_;
-    RxRadioState radio_state_{};
-};
-
-class FskxRxMainView : public View {
-   public:
-    FskxRxMainView(NavigationView& nav);
-    ~FskxRxMainView();
-
-    void focus() override;
-    void set_parent_rect(const Rect new_parent_rect) override;
-
-    std::string title() const override { return "FSK RX"; };
-
-   private:
-    static constexpr uint32_t initial_target_frequency = 902'075'000;
-    static constexpr ui::Dim header_height = (5 * 16);
-
-    uint32_t initial_deviation{3750};
-
-    bool logging() const { return false; };
-    bool logging_raw() const { return false; };
-
-    NavigationView& nav_;
-    Rect view_rect = {0, header_height, 240, 224};
-
-    FskRxAppView view_stream{nav_, view_rect};
-    FskRxAppConsoleView view_data{nav_, view_rect};
-
-    TabView tab_view{
-        {"Data", Color::yellow(), &view_data},
-        {"Stream", Color::cyan(), &view_stream}};
-
-    void refresh_ui(rf::Frequency f);
-    void on_packet(uint32_t value, bool is_data);
-    void handle_decoded(Timestamp timestamp, const std::string& prefix);
-
-    uint32_t last_address = 0;
-    FskRxLogger logger{};
-    uint16_t packet_count = 0;
-
-    RxFrequencyField field_frequency{
-        {0 * 8, 4 * 8},
-        nav_};
-
-    RFAmpField field_rf_amp{
-        {11 * 8, 2 * 16}};
-
-    LNAGainField field_lna{
-        {13 * 8, 2 * 16}};
-
-    VGAGainField field_vga{
-        {16 * 8, 2 * 16}};
-
-    RSSI rssi{
-        {19 * 8 - 4, 35, 6 * 8, 4}};
-
-    Channel channel{
-        {19 * 8 - 4, 40, 6 * 8, 4}};
-
-    Labels labels{
-        {{0 * 8, 3 * 16}, "Deviation:", Color::light_grey()},
-    };
-
-    FrequencyField deviation_frequency{
-        {10 * 8, 3 * 16},
-        {3750, 500000},
-    };
-
-    // DEBUG
-    RecordView record_view{
-        {0 * 8, 4 * 16, 30 * 8, 1 * 16},
-        u"FSKRX_????.C16",
-        u"FSKRX",
-        RecordView::FileType::RawS16,
-        16384,
-        3};
-
-    MessageHandlerRegistration message_handler_packet{
-        Message::ID::AFSKData,
-        [this](Message* const p) {
-            const auto message = static_cast<const AFSKDataMessage*>(p);
-            this->view_data.on_packet(message->value, message->is_data);
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__POCSAG_APP_H__*/
@@ -54,8 +54,8 @@ IQTrimView::IQTrimView(NavigationView& nav)
        };
    };

-    text_samples.set_style(&Styles::light_grey);
-    text_max.set_style(&Styles::light_grey);
+    text_samples.set_style(Theme::getInstance()->fg_light);
+    text_max.set_style(Theme::getInstance()->fg_light);

    field_start.on_change = [this](int32_t v) {
        if (field_end.value() < v)
@@ -149,9 +149,9 @@ void IQTrimView::refresh_ui() {
    // show max power in red if amplification is too high, causing clipping
    uint32_t clipping_limit = (fs::capture_file_sample_size(path_) == sizeof(complex8_t)) ? 0x80 : 0x8000;
    if ((field_amplify.value() * info_->max_iq) > clipping_limit)
-        text_max.set_style(&Styles::red);
+        text_max.set_style(Theme::getInstance()->fg_red);
    else
-        text_max.set_style(&Styles::light_grey);
+        text_max.set_style(Theme::getInstance()->fg_light);

    set_dirty();
 }
@@ -28,7 +28,6 @@
 #include "optional.hpp"
 #include "ui.hpp"
 #include "ui_navigation.hpp"
-#include "ui_styles.hpp"
 #include "ui_widget.hpp"

 #include <array>
@@ -41,21 +40,21 @@ class TrimProgressUI {
   public:
    void show_reading() {
        clear();
-        p.draw_string({6 * 8, 5 * 16}, Styles::yellow, "Reading Capture...");
+        p.draw_string({6 * 8, 5 * 16}, *Theme::getInstance()->fg_yellow, "Reading Capture...");
    }

    void show_trimming() {
        clear();
-        p.draw_string({5 * 8, 5 * 16}, Styles::yellow, "Trimming Capture...");
+        p.draw_string({5 * 8, 5 * 16}, *Theme::getInstance()->fg_yellow, "Trimming Capture...");
    }

    void show_progress(uint8_t percent) {
        auto width = percent * screen_width / 100;
-        p.draw_hline({0, 6 * 16 + 2}, width, Color::yellow());
+        p.draw_hline({0, 6 * 16 + 2}, width, Theme::getInstance()->fg_yellow->foreground);
    }

    void clear() {
-        p.fill_rectangle({0 * 8, 4 * 16, screen_width, 3 * 16}, Color::black());
+        p.fill_rectangle({0 * 8, 4 * 16, screen_width, 3 * 16}, Theme::getInstance()->bg_darkest->background);
    }

    auto get_callback() {
@@ -101,15 +100,15 @@ class IQTrimView : public View {
    TrimProgressUI progress_ui{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "Capture File:", Color::light_grey()},
-        {{0 * 8, 6 * 16}, "Start  :", Color::light_grey()},
-        {{0 * 8, 7 * 16}, "End    :", Color::light_grey()},
-        {{0 * 8, 8 * 16}, "Samples:", Color::light_grey()},
-        {{0 * 8, 9 * 16}, "Max Pwr:", Color::light_grey()},
-        {{0 * 8, 10 * 16}, "Cutoff :", Color::light_grey()},
-        {{12 * 8, 10 * 16}, "%", Color::light_grey()},
-        {{0 * 8, 12 * 16}, "Amplify:", Color::light_grey()},
-        {{10 * 8, 12 * 16}, "x", Color::light_grey()},
+        {{0 * 8, 0 * 16}, "Capture File:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 6 * 16}, "Start  :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 7 * 16}, "End    :", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Samples:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 9 * 16}, "Max Pwr:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 10 * 16}, "Cutoff :", Theme::getInstance()->fg_light->foreground},
+        {{12 * 8, 10 * 16}, "%", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 12 * 16}, "Amplify:", Theme::getInstance()->fg_light->foreground},
+        {{10 * 8, 12 * 16}, "x", Theme::getInstance()->fg_light->foreground},
    };

    TextField field_path{
@@ -169,9 +169,9 @@ LevelView::LevelView(NavigationView& nav)
    rssi_resolution.set_selected_index(1);
    // FILL STEP OPTIONS
    freqman_set_step_option_short(step_mode);
-    freq_stats_rssi.set_style(&Styles::white);
-    freq_stats_db.set_style(&Styles::white);
-    freq_stats_rx.set_style(&Styles::white);
+    freq_stats_rssi.set_style(Theme::getInstance()->bg_darkest);
+    freq_stats_db.set_style(Theme::getInstance()->bg_darkest);
+    freq_stats_rx.set_style(Theme::getInstance()->bg_darkest);
 }

 void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
@@ -187,6 +187,7 @@ void LevelView::on_statistics_update(const ChannelStatistics& statistics) {
    if (last_max_db != statistics.max_db) {
        last_max_db = statistics.max_db;
        freq_stats_db.set("Power: " + to_string_dec_int(statistics.max_db) + " db");
+        rssi.set_db(statistics.max_db);
    }
    // refresh rssi
    if (last_min_rssi != rssi_graph.get_graph_min() || last_avg_rssi != rssi_graph.get_graph_avg() || last_max_rssi != rssi_graph.get_graph_max()) {
@@ -323,4 +324,9 @@ void LevelView::handle_coded_squelch(const uint32_t value) {
        text_ctcss.set("        ");
 }

+void LevelView::on_freqchg(int64_t freq) {
+    receiver_model.set_target_frequency(freq);
+    button_frequency.set_text("<" + to_string_short_freq(freq) + " MHz>");
+}
+
 } /* namespace ui */
@@ -38,7 +38,6 @@
 #include "ui_mictx.hpp"
 #include "ui_receiver.hpp"
 #include "ui_spectrum.hpp"
-#include "ui_styles.hpp"

 namespace ui {

@@ -81,8 +80,8 @@ class LevelView : public View {
        }};

    Labels labels{
-        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey()},
-        {{0 * 8, 1 * 16}, "BW:       MODE:    S:   ", Color::light_grey()},
+        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 1 * 16}, "BW:       MODE:    S:   ", Theme::getInstance()->fg_light->foreground},
    };

    LNAGainField field_lna{
@@ -189,6 +188,15 @@ class LevelView : public View {

    void handle_coded_squelch(const uint32_t value);

+    void on_freqchg(int64_t freq);
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
    MessageHandlerRegistration message_handler_coded_squelch{
        Message::ID::CodedSquelch,
        [this](const Message* const p) {
@@ -49,12 +49,12 @@ int32_t GlassView::map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t

 void GlassView::update_display_beep() {
    if (beep_enabled) {
-        button_beep_squelch.set_style(&Styles::green);
+        button_beep_squelch.set_style(Theme::getInstance()->fg_green);
        // bip-XXdb
        button_beep_squelch.set_text("bip" + to_string_dec_int(beep_squelch, 3) + "db");
        receiver_model.set_headphone_volume(receiver_model.headphone_volume());  // WM8731 hack.
    } else {
-        button_beep_squelch.set_style(&Styles::white);
+        button_beep_squelch.set_style(Theme::getInstance()->bg_darkest);
        button_beep_squelch.set_text("bip OFF ");
    }
 }
@@ -98,7 +98,6 @@ rf::Frequency GlassView::get_freq_from_bin_pos(uint8_t pos) {
        freq_at_pos = f_center_ini + ((pos - 120) * ((looking_glass_range - ((16 * looking_glass_range) / SPEC_NB_BINS)) / 2)) / (SCREEN_W / 2);
    } else
        freq_at_pos = f_min + (2 * offset * each_bin_size) + (pos * looking_glass_range) / SCREEN_W;
-
    return freq_at_pos;
 }

@@ -257,7 +256,7 @@ void GlassView::on_range_changed() {
        bin_length = SCREEN_W;
        ignore_dc = 0;
        looking_glass_bandwidth = looking_glass_range;
-        looking_glass_sampling_rate = looking_glass_bandwidth;
+        looking_glass_sampling_rate = looking_glass_range;
        each_bin_size = looking_glass_bandwidth / SCREEN_W;
        looking_glass_step = looking_glass_bandwidth;
        f_center_ini = f_min + (looking_glass_bandwidth / 2);  // Initial center frequency for sweep
@@ -265,7 +264,7 @@ void GlassView::on_range_changed() {
        // view is made in multiple pass, use original bin picking
        mode = scan_type.selected_index_value();
        looking_glass_bandwidth = LOOKING_GLASS_SLICE_WIDTH_MAX;
-        looking_glass_sampling_rate = LOOKING_GLASS_SLICE_WIDTH_MAX;
+        looking_glass_sampling_rate = LOOKING_GLASS_MAX_SAMPLERATE;
        each_bin_size = LOOKING_GLASS_SLICE_WIDTH_MAX / SPEC_NB_BINS;
        if (mode == LOOKING_GLASS_FASTSCAN) {
            offset = 2;
@@ -305,18 +304,18 @@ void GlassView::plot_marker(uint8_t pos) {
    {
        shift_y = 16;
    }
-    portapack::display.fill_rectangle({0, 100 + shift_y, SCREEN_W, 8}, Color::black());  // Clear old marker and whole marker rectangle btw
-    portapack::display.fill_rectangle({pos - 2, 100 + shift_y, 5, 3}, Color::red());     // Red marker top
-    portapack::display.fill_rectangle({pos - 1, 103 + shift_y, 3, 3}, Color::red());     // Red marker middle
-    portapack::display.fill_rectangle({pos, 106 + shift_y, 1, 2}, Color::red());         // Red marker bottom
+    portapack::display.fill_rectangle({0, 100 + shift_y, SCREEN_W, 8}, Theme::getInstance()->bg_darkest->background);  // Clear old marker and whole marker rectangle btw
+    portapack::display.fill_rectangle({pos - 2, 100 + shift_y, 5, 3}, Theme::getInstance()->fg_red->foreground);       // Red marker top
+    portapack::display.fill_rectangle({pos - 1, 103 + shift_y, 3, 3}, Theme::getInstance()->fg_red->foreground);       // Red marker middle
+    portapack::display.fill_rectangle({pos, 106 + shift_y, 1, 2}, Theme::getInstance()->fg_red->foreground);           // Red marker bottom
 }

 void GlassView::update_min(int32_t v) {
    int32_t min_size = steps;
    if (locked_range)
        min_size = search_span;
-    if (min_size < 2)
-        min_size = 2;
+    if (min_size < 1)
+        min_size = 1;
    if (v > 7200 - min_size) {
        v = 7200 - min_size;
    }
@@ -332,8 +331,8 @@ void GlassView::update_max(int32_t v) {
    int32_t min_size = steps;
    if (locked_range)
        min_size = search_span;
-    if (min_size < 2)
-        min_size = 2;
+    if (min_size < 1)
+        min_size = 1;
    if (v < min_size) {
        v = min_size;
    }
@@ -347,10 +346,10 @@ void GlassView::update_max(int32_t v) {

 void GlassView::update_range_field() {
    if (!locked_range) {
-        field_range.set_style(&Styles::white);
+        field_range.set_style(Theme::getInstance()->bg_darkest);
        field_range.set_text(" " + to_string_dec_uint(search_span) + " ");
    } else {
-        field_range.set_style(&Styles::red);
+        field_range.set_style(Theme::getInstance()->fg_red);
        field_range.set_text(">" + to_string_dec_uint(search_span) + "<");
    }
 }
@@ -487,7 +486,12 @@ GlassView::GlassView(
    range_presets.set_selected_index(preset_index);

    field_marker.on_encoder_change = [this](TextField&, EncoderEvent delta) {
-        marker_pixel_index = clip<uint8_t>(marker_pixel_index + delta, 0, SCREEN_W);
+        if ((marker_pixel_index + delta) < 0)
+            marker_pixel_index = marker_pixel_index + delta + SCREEN_W;
+        else if ((marker_pixel_index + delta) > SCREEN_W)
+            marker_pixel_index = marker_pixel_index + delta - SCREEN_W;
+        else
+            marker_pixel_index = marker_pixel_index + delta;
        on_marker_change();
    };

@@ -561,6 +565,17 @@ GlassView::GlassView(
    update_display_beep();
 }

+void GlassView::on_freqchg(int64_t freq) {
+    int64_t half_range = abs(field_frequency_max.value() - field_frequency_max.value()) / 2;
+    if (half_range < 1) {
+        half_range = 1;
+    }
+    range_presets.set_selected_index(0);  // Manual
+    update_min(freq - half_range);
+    update_max(freq + half_range);
+    on_range_changed();
+}
+
 uint8_t GlassView::get_spec_iq_phase_calibration_value() {  // define accessor functions inside AnalogAudioView to read & write real iq_phase_calibration_value
    return iq_phase_calibration_value;
 }
@@ -33,7 +33,6 @@
 #include "ui_widget.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
-#include "ui_styles.hpp"
 #include "string_format.hpp"
 #include "analog_audio_app.hpp"
 #include "spectrum_color_lut.hpp"
@@ -41,6 +40,7 @@
 namespace ui {

 #define LOOKING_GLASS_SLICE_WIDTH_MAX 20000000
+#define LOOKING_GLASS_MAX_SAMPLERATE 20000000
 #define MHZ_DIV 1000000

 // blanked DC (16 centered bins ignored ) and top left and right (2 bins ignored on each side )
@@ -110,6 +110,7 @@ class GlassView : public View {
        std::string label{};
    };

+    void on_freqchg(int64_t freq);
    int32_t map(int32_t value, int32_t fromLow, int32_t fromHigh, int32_t toLow, int32_t toHigh);
    std::vector<preset_entry> presets_db{};
    void manage_beep_audio();
@@ -171,12 +172,12 @@ class GlassView : public View {
    uint8_t ignore_dc = 0;

    Labels labels{
-        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Color::light_grey()},
-        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Color::light_grey()},
-        {{0, 2 * 16}, "P:", Color::light_grey()},
-        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Color::light_grey()},
-        //{{0, 4 * 16}, "RES:    STEPS:", Color::light_grey()}};
-        {{0, 4 * 16}, "RES:     VOL:", Color::light_grey()}};
+        {{0, 0 * 16}, "MIN:     MAX:     LNA   VGA  ", Theme::getInstance()->fg_light->foreground},
+        {{0, 1 * 16}, "RANGE:       FILTER:     AMP:", Theme::getInstance()->fg_light->foreground},
+        {{0, 2 * 16}, "P:", Theme::getInstance()->fg_light->foreground},
+        {{0, 3 * 16}, "MARKER:          MHz RXIQCAL", Theme::getInstance()->fg_light->foreground},
+        //{{0, 4 * 16}, "RES:    STEPS:", Theme::getInstance()->fg_light->foreground}};
+        {{0, 4 * 16}, "RES:     VOL:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_frequency_min{
        {4 * 8, 0 * 16},
@@ -308,6 +309,7 @@ class GlassView : public View {
            const auto message = *reinterpret_cast<const ChannelSpectrumConfigMessage*>(p);
            this->fifo = message.fifo;
        }};
+
    MessageHandlerRegistration message_handler_frame_sync{
        Message::ID::DisplayFrameSync,
        [this](const Message* const) {
@@ -318,6 +320,13 @@ class GlassView : public View {
                }
            }
        }};
+
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
 };
 }  // namespace ui
 #endif
@@ -63,8 +63,8 @@ void MicTXView::update_vumeter() {
 }

 void MicTXView::update_tx_icon() {
-    tx_icon.set_foreground(transmitting ? Color::red() : Color::black());
-    tx_icon.set_background(transmitting ? Color::yellow() : Color::black());
+    tx_icon.set_foreground(transmitting ? Theme::getInstance()->fg_red->foreground : Theme::getInstance()->bg_darkest->background);
+    tx_icon.set_background(transmitting ? Theme::getInstance()->fg_yellow->foreground : Theme::getInstance()->bg_darkest->background);
 }

 void MicTXView::on_tx_progress(const bool done) {
@@ -269,16 +269,24 @@ void MicTXView::set_rxbw_options(void) {
    }
 }

-void MicTXView::set_rxbw_defaults(bool use_app_settings) {
+void MicTXView::set_rxbw_defaults(bool use_app_settings) {  // Initially in that function we set up rxbw, but now also txbw.
    if (use_app_settings) {
        field_bw.set_value(transmitter_model.channel_bandwidth() / 1000);
        field_rxbw.set_by_value(rxbw_index);
    } else if (mic_mod_index == MIC_MOD_NFM) {
-        field_bw.set_value(10);  // NFM TX bw 10k, RX bw 16k (2) default
-        field_rxbw.set_by_value(2);
+        field_bw.set_value(10);     // NFM TX bw 10k, RX bw 16k (index 2) default
+        field_bw.set_range(1, 60);  // In NFM , FM , we are limitting index modulation range (0.08 ..5) ; (Ex max dev 60khz/12k = 5)
+        field_bw.set_step(1);
+        field_rxbw.set_by_value(2);  // 16k from the three options (8k5,11k,16k)
    } else if (mic_mod_index == MIC_MOD_WFM) {
-        field_bw.set_value(75);  // WFM TX bw 75K, RX bw 200k (0) default
+        field_bw.set_value(75);      // WFM TX bw 75K, RX bw 200k (index 0) default
+        field_bw.set_range(1, 150);  // In our case Mod. Index range (1,67 ...12,5) ; 150k/12k=12,5
+        field_bw.set_step(1);
        field_rxbw.set_by_value(0);
+    } else if ((mic_mod_index == MIC_MOD_USB) | (mic_mod_index == MIC_MOD_LSB)) {
+        field_bw.set_value(3);     // In SSB by default let's limit TX_BW to 3kHz.
+        field_bw.set_range(2, 3);  // User TXBW GUI range to modify that SSB TX_BW to limit SSB radiated spectrum.
+        field_bw.set_step(1);
    }
    // field_bw is hidden in other modulation cases
 }
@@ -482,7 +490,11 @@ MicTXView::MicTXView(
            field_bw.hidden(false);
            options_tone_key.hidden(false);
        } else {
-            field_bw.hidden(true);
+            if ((mic_mod_index == MIC_MOD_USB) || (mic_mod_index == MIC_MOD_LSB)) {
+                field_bw.hidden(false);
+            } else {
+                field_bw.hidden(true);
+            }
            options_tone_key.set_selected_index(0);
            options_tone_key.hidden(true);
        }
@@ -147,27 +147,27 @@ class MicTXView : public View {
    bool button_touch{false};

    Labels labels_both{
-        {{3 * 8, 1 * 8}, "MIC-GAIN:", Color::light_grey()},
-        {{3 * 8, 3 * 8}, "F:", Color::light_grey()},
-        {{15 * 8, 3 * 8}, "FM TXBW:    kHz", Color::light_grey()},  // to be more symetric and consistent to the below FM RXBW
-        {{18 * 8, (5 * 8)}, "Mode:", Color::light_grey()},          // now, no need to handle GAIN, Amp here It is handled by ui_transmitter.cpp
-        {{4 * 8, 10 * 8}, "LVL:", Color::light_grey()},             // we delete  { {11 * 8, 5 * 8 }, "Amp:", Color::light_grey() },
-        {{12 * 8, 10 * 8}, "ATT:", Color::light_grey()},
-        {{20 * 8, 10 * 8}, "DEC:", Color::light_grey()},
-        {{3 * 8, (13 * 8) - 5}, "TONE KEY:", Color::light_grey()},
-        {{3 * 8, (18 * 8) - 1}, "======== Receiver ========", Color::green()},
-        {{5 * 8, (23 * 8) + 2}, "VOL:", Color::light_grey()},
-        {{14 * 8, (23 * 8) + 2}, "RXBW:", Color::light_grey()},  // we remove the label "FM" because we will display all MOD types RX_BW.
-        {{20 * 8, (25 * 8) + 2}, "SQ:", Color::light_grey()},
-        {{5 * 8, (25 * 8) + 2}, "F_RX:", Color::light_grey()},
-        {{5 * 8, (27 * 8) + 2}, "LNA:", Color::light_grey()},
-        {{12 * 8, (27 * 8) + 2}, "VGA:", Color::light_grey()},
-        {{19 * 8, (27 * 8) + 2}, "AMP:", Color::light_grey()},
-        {{21 * 8, (31 * 8)}, "TX-IQ-CAL:", Color::light_grey()}};
+        {{3 * 8, 1 * 8}, "MIC-GAIN:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 3 * 8}, "F:         MHz", Theme::getInstance()->fg_light->foreground},
+        {{18 * 8, 3 * 8}, "TXBW:    kHz", Theme::getInstance()->fg_light->foreground},  // to be more symetric and consistent to the below FM RXBW
+        {{18 * 8, (5 * 8)}, "Mode:", Theme::getInstance()->fg_light->foreground},       // now, no need to handle GAIN, Amp here It is handled by ui_transmitter.cpp
+        {{4 * 8, 10 * 8}, "LVL:", Theme::getInstance()->fg_light->foreground},          // we delete  { {11 * 8, 5 * 8 }, "Amp:", Theme::getInstance()->fg_light->foreground },
+        {{12 * 8, 10 * 8}, "ATT:", Theme::getInstance()->fg_light->foreground},
+        {{20 * 8, 10 * 8}, "DEC:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, (13 * 8) - 5}, "TONE KEY:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, (18 * 8) - 1}, "======== Receiver ========", Theme::getInstance()->fg_green->foreground},
+        {{5 * 8, (23 * 8) + 2}, "VOL:", Theme::getInstance()->fg_light->foreground},
+        {{14 * 8, (23 * 8) + 2}, "RXBW:", Theme::getInstance()->fg_light->foreground},  // we remove the label "FM" because we will display all MOD types RX_BW.
+        {{20 * 8, (25 * 8) + 2}, "SQ:", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, (25 * 8) + 2}, "F_RX:", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, (27 * 8) + 2}, "LNA:", Theme::getInstance()->fg_light->foreground},
+        {{12 * 8, (27 * 8) + 2}, "VGA:", Theme::getInstance()->fg_light->foreground},
+        {{19 * 8, (27 * 8) + 2}, "AMP:", Theme::getInstance()->fg_light->foreground},
+        {{21 * 8, (31 * 8)}, "TX-IQ-CAL:", Theme::getInstance()->fg_light->foreground}};
    Labels labels_WM8731{
-        {{17 * 8, 1 * 8}, "Boost", Color::light_grey()}};
+        {{17 * 8, 1 * 8}, "Boost", Theme::getInstance()->fg_light->foreground}};
    Labels labels_AK4951{
-        {{17 * 8, 1 * 8}, "ALC", Color::light_grey()}};
+        {{17 * 8, 1 * 8}, "ALC", Theme::getInstance()->fg_light->foreground}};

    VuMeter vumeter{
        {0 * 8, 1 * 8, 2 * 8, 33 * 8},
@@ -357,8 +357,8 @@ class MicTXView : public View {
    Image tx_icon{
        {6 * 8, 31 * 8 + 4, 16, 16},
        &bitmap_icon_microphone,
-        Color::black(),
-        Color::black()};
+        Theme::getInstance()->bg_darkest->background,
+        Theme::getInstance()->bg_darkest->background};

    MessageHandlerRegistration message_handler_lcd_sync{
        Message::ID::DisplayFrameSync,
@@ -39,12 +39,12 @@ class ModemSetupView : public View {

   private:
    Labels labels{
-        {{2 * 8, 11 * 8}, "Baudrate:", Color::light_grey()},
-        {{2 * 8, 13 * 8}, "Mark:      Hz", Color::light_grey()},
-        {{2 * 8, 15 * 8}, "Space:     Hz", Color::light_grey()},
-        {{140, 15 * 8}, "Repeat:", Color::light_grey()},
-        {{1 * 8, 6 * 8}, "Modem preset:", Color::light_grey()},
-        {{2 * 8, 22 * 8}, "Serial format:", Color::light_grey()}};
+        {{2 * 8, 11 * 8}, "Baudrate:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 13 * 8}, "Mark:      Hz", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 15 * 8}, "Space:     Hz", Theme::getInstance()->fg_light->foreground},
+        {{140, 15 * 8}, "Repeat:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 6 * 8}, "Modem preset:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 22 * 8}, "Serial format:", Theme::getInstance()->fg_light->foreground}};

    NumberField field_baudrate{
        {11 * 8, 11 * 8},
@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_numbers.hpp"
-#include "ui_styles.hpp"
-#include "string_format.hpp"
-
-#include "portapack.hpp"
-#include "hackrf_hal.hpp"
-#include "portapack_shared_memory.hpp"
-
-#include <cstring>
-#include <stdio.h>
-
-using namespace portapack;
-
-namespace ui {
-
-// TODO: This app takes way too much space, find a way to shrink/simplify or make it an SD card module (loadable)
-
-void NumbersStationView::focus() {
-    if (file_error)
-        nav_.display_modal("No voices", "No valid voices found in\nthe /numbers directory.", ABORT);
-    else
-        button_exit.focus();
-}
-
-NumbersStationView::~NumbersStationView() {
-    transmitter_model.disable();
-    baseband::shutdown();
-}
-
-NumbersStationView::wav_file_t* NumbersStationView::get_wav(uint32_t index) {
-    return &current_voice->available_wavs[index];
-}
-
-void NumbersStationView::prepare_audio() {
-    uint8_t code;
-    wav_file_t* wav_file;
-
-    if (sample_counter >= sample_length) {
-        if (segment == ANNOUNCE) {
-            if (!announce_loop) {
-                code_index = 0;
-                segment = MESSAGE;
-            } else {
-                wav_file = get_wav(11);
-                reader->open(current_voice->dir + file_names[wav_file->index].name + ".wav");
-                sample_length = wav_file->length;
-                announce_loop--;
-            }
-        }
-
-        if (segment == MESSAGE) {
-            if (code_index == 25) {
-                transmitter_model.disable();
-                return;
-            }
-
-            code = symfield_code.get_offset(code_index);
-
-            if (code >= 10) {
-                memset(audio_buffer, 0, 1024);
-                if (code == 10) {
-                    pause = 11025;  // p: 0.25s @ 44100Hz
-                } else if (code == 11) {
-                    pause = 33075;  // P: 0.75s @ 44100Hz
-                } else if (code == 12) {
-                    transmitter_model.disable();
-                    return;
-                }
-            } else {
-                wav_file = get_wav(code);
-                reader->open(current_voice->dir + file_names[code].name + ".wav");
-                sample_length = wav_file->length;
-            }
-            code_index++;
-        }
-        sample_counter = 0;
-    }
-
-    if (!pause) {
-        auto bytes_read = reader->read(audio_buffer, 1024).value();
-
-        // Unsigned to signed, pretty stupid :/
-        for (size_t n = 0; n < bytes_read; n++)
-            audio_buffer[n] -= 0x80;
-        for (size_t n = bytes_read; n < 1024; n++)
-            audio_buffer[n] = 0;
-
-        sample_counter += 1024;
-    } else {
-        if (pause >= 1024) {
-            pause -= 1024;
-        } else {
-            sample_counter = sample_length;
-            pause = 0;
-        }
-    }
-
-    baseband::set_fifo_data(audio_buffer);
-}
-
-void NumbersStationView::start_tx() {
-    // sample_length = sound_sizes[10];		// Announce
-    sample_counter = sample_length;
-
-    code_index = 0;
-    announce_loop = 2;
-    segment = ANNOUNCE;
-
-    prepare_audio();
-
-    transmitter_model.set_rf_amp(true);
-    transmitter_model.enable();
-
-    baseband::set_audiotx_data(
-        (1536000 / 44100) - 1,  // TODO: Read wav file's samplerate
-        12000,
-        1,
-        false,
-        0);
-}
-
-void NumbersStationView::on_tick_second() {
-    armed_blink = not armed_blink;
-
-    if (armed_blink)
-        check_armed.set_style(&Styles::red);
-    else
-        check_armed.set_style(&style());
-
-    check_armed.set_dirty();
-}
-
-void NumbersStationView::on_voice_changed(size_t index) {
-    std::string code_list;
-
-    for (const auto& wavs : voices[index].available_wavs)
-        code_list += wavs.code;
-
-    symfield_code.set_symbol_list(code_list);
-    current_voice = &voices[index];
-}
-
-bool NumbersStationView::check_wav_validity(const std::string dir, const std::string file) {
-    if (reader->open("/numbers/" + dir + "/" + file)) {
-        // Check format (mono, 8 bits)
-        if ((reader->channels() == 1) && (reader->bits_per_sample() == 8))
-            return true;
-        else
-            return false;
-    } else
-        return false;
-}
-
-NumbersStationView::NumbersStationView(
-    NavigationView& nav)
-    : nav_(nav) {
-    std::vector<std::filesystem::path> directory_list;
-    using option_t = std::pair<std::string, int32_t>;
-    using options_t = std::vector<option_t>;
-    options_t voice_options;
-    voice_t temp_voice{};
-    bool valid;
-    uint32_t c;
-    // uint8_t y, m, d, dayofweek;
-
-    reader = std::make_unique<WAVFileReader>();
-
-    // Search for valid voice directories
-    directory_list = scan_root_directories("/numbers");
-    if (!directory_list.size()) {
-        file_error = true;
-        return;
-    }
-
-    for (const auto& dir : directory_list) {
-        c = 0;
-        for (const auto& file_name : file_names) {
-            valid = check_wav_validity(dir.string(), file_name.name + ".wav");
-            if ((!valid) && (file_name.required)) {
-                temp_voice.available_wavs.clear();
-                break;  // Invalid required file means invalid voice
-            } else if (valid) {
-                temp_voice.available_wavs.push_back({file_name.code, c++, 0, 0});  // TODO: Needs length and samplerate
-            }
-        }
-        if (!temp_voice.available_wavs.empty()) {
-            // Voice can be used, are there accent files ?
-            c = 0;
-            for (const auto& file_name : file_names) {
-                valid = check_wav_validity(dir.string(), file_name.name + "a.wav");
-                if ((!valid) && (file_name.required)) {
-                    c = 0;
-                    break;  // Invalid required file means accents can't be used
-                } else if (valid) {
-                    c++;
-                }
-            }
-
-            temp_voice.accent = c ? true : false;
-            temp_voice.dir = dir.string();
-
-            voices.push_back(temp_voice);
-        }
-    }
-
-    if (voices.empty()) {
-        file_error = true;
-        return;
-    }
-
-    baseband::run_image(portapack::spi_flash::image_tag_audio_tx);
-
-    add_children({&labels,
-                  &symfield_code,
-                  &check_armed,
-                  &options_voices,
-                  &text_voice_flags,
-                  //&button_tx_now,
-                  &button_exit});
-
-    for (const auto& voice : voices)
-        voice_options.emplace_back(voice.dir.substr(0, 4), 0);
-
-    options_voices.set_options(voice_options);
-    options_voices.on_change = [this](size_t i, int32_t) {
-        this->on_voice_changed(i);
-    };
-    options_voices.set_selected_index(0);
-
-    check_armed.set_value(false);
-
-    check_armed.on_select = [this](Checkbox&, bool v) {
-        if (v) {
-            armed_blink = false;
-            signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
-                this->on_tick_second();
-            };
-        } else {
-            check_armed.set_style(&style());
-            rtc_time::signal_tick_second -= signal_token_tick_second;
-        }
-    };
-
-    // DEBUG
-    symfield_code.set_offset(0, 10);
-    symfield_code.set_offset(1, 3);
-    symfield_code.set_offset(2, 4);
-    symfield_code.set_offset(3, 11);
-    symfield_code.set_offset(4, 6);
-    symfield_code.set_offset(5, 1);
-    symfield_code.set_offset(6, 9);
-    symfield_code.set_offset(7, 7);
-    symfield_code.set_offset(8, 8);
-    symfield_code.set_offset(9, 0);
-    symfield_code.set_offset(10, 12);  // End
-
-    /*
-        dayofweek = rtc_time::current_day_of_week();
-        text_title.set(day_of_week[dayofweek]);
-    */
-
-    button_exit.on_select = [&nav](Button&) {
-        nav.pop();
-    };
-}
-
-} /* namespace ui */
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_NUMBERS_H__
-#define __UI_NUMBERS_H__
-
-#include "ui.hpp"
-#include "ui_widget.hpp"
-#include "ui_receiver.hpp"
-#include "ui_navigation.hpp"
-#include "rtc_time.hpp"
-#include "clock_manager.hpp"
-#include "baseband_api.hpp"
-#include "utility.hpp"
-#include "message.hpp"
-#include "file.hpp"
-#include "io_wave.hpp"
-#include "radio_state.hpp"
-
-namespace ui {
-
-class NumbersStationView : public View {
-   public:
-    NumbersStationView(NavigationView& nav);
-    ~NumbersStationView();
-
-    NumbersStationView(const NumbersStationView&) = delete;
-    NumbersStationView(NumbersStationView&&) = delete;
-    NumbersStationView& operator=(const NumbersStationView&) = delete;
-    NumbersStationView& operator=(NumbersStationView&&) = delete;
-
-    void focus() override;
-
-    std::string title() const override { return "Station"; };
-
-   private:
-    NavigationView& nav_;
-
-    TxRadioState radio_state_{
-        0 /* frequency */,
-        1750000 /* bandwidth */,
-        1536000 /* sampling rate */
-    };
-
-    // Sequencing state machine
-    enum segments {
-        IDLE = 0,
-        ANNOUNCE,
-        MESSAGE,
-        SIGNOFF
-    };
-
-    typedef struct {
-        char code;
-        uint32_t index;
-        uint32_t length;
-        uint32_t samplerate;
-    } wav_file_t;
-
-    struct voice_t {
-        std::string dir;
-        std::vector<wav_file_t> available_wavs;
-        bool accent;
-    };
-
-    std::vector<voice_t> voices{};
-    voice_t* current_voice{};
-
-    struct wav_file_list_t {
-        std::string name;
-        bool required;
-        char code;
-    };
-
-    const std::vector<wav_file_list_t> file_names = {
-        {"0", true, '0'},
-        {"1", true, '1'},
-        {"2", true, '2'},
-        {"3", true, '3'},
-        {"4", true, '4'},
-        {"5", true, '5'},
-        {"6", true, '6'},
-        {"7", true, '7'},
-        {"8", true, '8'},
-        {"9", true, '9'},
-        {"announce", false, 'A'}};
-
-    segments segment{IDLE};
-    bool armed{false};
-    bool file_error{false};
-
-    // const uint8_t month_table[12] = { 0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4 };
-    // const char * day_of_week[7] = { "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" };
-
-    std::unique_ptr<WAVFileReader> reader{};
-
-    uint8_t code_index{0}, announce_loop{0};
-    uint32_t sample_counter{0};
-    uint32_t sample_length{0};
-    int8_t audio_buffer[1024]{};
-    uint32_t pause{0};
-    bool armed_blink{false};
-    SignalToken signal_token_tick_second{};
-
-    wav_file_t* get_wav(uint32_t index);
-    bool check_wav_validity(const std::string dir, const std::string file);
-    void on_voice_changed(size_t index);
-    void on_tick_second();
-    void prepare_audio();
-    void start_tx();
-
-    Labels labels{
-        {{2 * 8, 5 * 8}, "Voice:     Flags:", Color::light_grey()},
-        {{1 * 8, 8 * 8}, "Code:", Color::light_grey()}};
-
-    OptionsField options_voices{
-        {8 * 8, 1 * 8},
-        4,
-        {}};
-    Text text_voice_flags{
-        {19 * 8, 1 * 8, 2 * 8, 16},
-        ""};
-
-    SymField symfield_code{
-        {1 * 8, 10 * 8},
-        25,
-        SymField::Type::Custom};
-
-    Checkbox check_armed{
-        {2 * 8, 13 * 16},
-        5,
-        "Armed"};
-
-    /*
-    Button button_tx_now {
-        { 18 * 8, 13 * 16, 10 * 8, 32 },
-        "TX now"};
-    */
-
-    Button button_exit{
-        {21 * 8, 16 * 16, 64, 32},
-        "Exit"};
-
-    MessageHandlerRegistration message_handler_fifo_signal{
-        Message::ID::RequestSignal,
-        [this](const Message* const p) {
-            const auto message = static_cast<const RequestSignalMessage*>(p);
-            if (message->signal == RequestSignalMessage::Signal::FillRequest) {
-                this->prepare_audio();
-            }
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__UI_NUMBERS_H__*/
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_nuoptix.hpp"
-
-#include "ch.h"
-#include "portapack.hpp"
-#include "lfsr_random.hpp"
-#include "string_format.hpp"
-
-#include "portapack_shared_memory.hpp"
-
-#include <cstring>
-#include <vector>
-
-using namespace portapack;
-
-namespace ui {
-
-void NuoptixView::focus() {
-    number_timecode.focus();
-}
-
-NuoptixView::~NuoptixView() {
-    transmitter_model.disable();
-    baseband::shutdown();
-}
-
-void NuoptixView::on_tx_progress(const uint32_t progress, const bool done) {
-    if (done)
-        transmit(false);
-    else
-        progressbar.set_value(progress);
-}
-
-void NuoptixView::transmit(bool setup) {
-    uint8_t mod, tone_code;
-    uint8_t c;
-    uint8_t dtmf_message[6];
-    rtc::RTC datetime;
-
-    if (!tx_mode) {
-        transmitter_model.disable();
-        return;
-    }
-
-    if (tx_mode == IMPROVISE)
-        timecode = lfsr_iterate(timecode) % 1999;  // Could be 9999 but that would be one long audio track !
-
-    if (setup) {
-        progressbar.set_max(6 * 2);
-
-        if (tx_mode == IMPROVISE) {
-            // Seed from RTC
-            rtcGetTime(&RTCD1, &datetime);
-            timecode = datetime.day() + datetime.second();
-        } else {
-            timecode = number_timecode.value();
-        }
-
-        transmitter_model.set_rf_amp(true);
-        transmitter_model.enable();
-
-        dtmf_message[0] = '*';  // "Pre-tone for restart" method #1
-        dtmf_message[1] = 'A';  // "Restart" method #1
-    } else {
-        dtmf_message[0] = '#';
-        dtmf_message[1] = (timecode / 1000) % 10;
-        chThdSleepMilliseconds(92);  // 141-49ms
-        number_timecode.set_value(timecode);
-    }
-
-    progressbar.set_value(0);
-
-    dtmf_message[2] = (timecode / 100) % 10;
-    dtmf_message[3] = (timecode / 10) % 10;
-    dtmf_message[4] = timecode % 10;
-
-    mod = 0;
-    for (c = 1; c < 5; c++)
-        if (dtmf_message[c] <= 9)
-            mod += dtmf_message[c];
-
-    mod = 10 - (mod % 10);
-    if (mod == 10) mod = 0;  // Is this right ?
-
-    text_mod.set("Mod: " + to_string_dec_uint(mod));
-
-    dtmf_message[5] = mod;
-
-    for (c = 0; c < 6; c++) {
-        tone_code = dtmf_message[c];
-
-        if (tone_code == 'A')
-            tone_code = 10;
-        else if (tone_code == 'B')
-            tone_code = 11;
-        else if (tone_code == 'C')
-            tone_code = 12;
-        else if (tone_code == 'D')
-            tone_code = 13;
-        else if (tone_code == '#')
-            tone_code = 14;
-        else if (tone_code == '*')
-            tone_code = 15;
-
-        shared_memory.bb_data.tones_data.message[c * 2] = tone_code;
-        shared_memory.bb_data.tones_data.message[c * 2 + 1] = 0xFF;  // Silence
-    }
-
-    for (c = 0; c < 16; c++) {
-        baseband::set_tone(c * 2, dtmf_deltas[c][0], NUOPTIX_TONE_LENGTH);
-        baseband::set_tone(c * 2 + 1, dtmf_deltas[c][1], NUOPTIX_TONE_LENGTH);
-    }
-    shared_memory.bb_data.tones_data.silence = NUOPTIX_TONE_LENGTH;  // 49ms tone, 49ms space
-
-    audio::set_rate(audio::Rate::Hz_24000);
-
-    baseband::set_tones_config(transmitter_model.channel_bandwidth(), 0, 6 * 2, true, true);
-
-    timecode++;
-}
-
-NuoptixView::NuoptixView(
-    NavigationView& nav) {
-    baseband::run_image(portapack::spi_flash::image_tag_tones);
-
-    add_children({&number_timecode,
-                  &text_timecode,
-                  &text_mod,
-                  &progressbar,
-                  &tx_view});
-
-    number_timecode.set_value(1);
-
-    tx_view.on_edit_frequency = [this, &nav]() {
-        auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.target_frequency());
-        new_view->on_changed = [this](rf::Frequency f) {
-            transmitter_model.set_target_frequency(f);
-        };
-    };
-
-    tx_view.on_start = [this]() {
-        tx_view.set_transmitting(true);
-        tx_mode = NORMAL;
-        transmit(true);
-    };
-
-    tx_view.on_stop = [this]() {
-        tx_view.set_transmitting(false);
-        tx_mode = IDLE;
-    };
-
-    /*button_impro.on_select = [this](Button&){
-                if (tx_mode == IMPROVISE) {
-                        tx_mode = IDLE;
-                        button_impro.set_text("IMPROVISE");
-                } else if (tx_mode == IDLE) {
-                        tx_mode = IMPROVISE;
-                        button_impro.set_text("STOP");
-                        transmit(true);
-                }
-        };*/
-}
-
-}  // namespace ui
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __UI_NUOPTIX_H__
-#define __UI_NUOPTIX_H__
-
-#include "ui.hpp"
-#include "ui_widget.hpp"
-#include "baseband_api.hpp"
-#include "ui_navigation.hpp"
-#include "ui_transmitter.hpp"
-#include "rtc_time.hpp"
-#include "tonesets.hpp"
-#include "message.hpp"
-#include "volume.hpp"
-#include "audio.hpp"
-#include "radio_state.hpp"
-
-#define NUOPTIX_TONE_LENGTH ((TONES_SAMPLERATE * 0.049) - 1)  // 49ms
-
-namespace ui {
-
-class NuoptixView : public View {
-   public:
-    NuoptixView(NavigationView& nav);
-    ~NuoptixView();
-
-    void focus() override;
-
-    std::string title() const override { return "Nuoptix sync"; };
-
-   private:
-    enum tx_modes {
-        IDLE = 0,
-        NORMAL,
-        IMPROVISE
-    };
-
-    TxRadioState radio_state_{
-        0 /* frequency */,
-        1750000 /* bandwidth */,
-        1536000 /* sampling rate */
-    };
-
-    tx_modes tx_mode{IDLE};
-
-    void transmit(bool setup);
-    void on_tx_progress(const uint32_t progress, const bool done);
-
-    uint32_t timecode{0};
-
-    Text text_timecode{
-        {10 * 8, 2 * 16, 9 * 8, 16},
-        "Timecode:"};
-
-    NumberField number_timecode{
-        {13 * 8, 3 * 16},
-        4,
-        {1, 9999},
-        1,
-        '0'};
-
-    Text text_mod{
-        {10 * 8, 5 * 16, 6 * 8, 16},
-        "Mod: "};
-
-    ProgressBar progressbar{
-        {16, 14 * 16, 208, 16}};
-
-    /*Button button_impro {
-                { 64, 184, 112, 40 },
-                "IMPROVISE"
-        };*/
-
-    TransmitterView tx_view{
-        16 * 16,
-        10000,
-        15};
-
-    MessageHandlerRegistration message_handler_tx_progress{
-        Message::ID::TXProgress,
-        [this](const Message* const p) {
-            const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
-            this->on_tx_progress(message.progress, message.done);
-        }};
-};
-
-} /* namespace ui */
-
-#endif /*__UI_NUOPTIX_H__*/
@@ -141,8 +141,8 @@ class PlaylistView : public View {
    ImageButton button_play{
        {28 * 8, 2 * 16, 2 * 8, 1 * 16},
        &bitmap_play,
-        Color::green(),
-        Color::black()};
+        Theme::getInstance()->fg_green->foreground,
+        Theme::getInstance()->fg_green->background};

    Text text_track{
        {0 * 8, 3 * 16, 30 * 8, 16}};
@@ -151,37 +151,37 @@ class PlaylistView : public View {
        {2 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_arrow_left,
-        Color::dark_grey()};
+        Theme::getInstance()->bg_dark->background};

    NewButton button_next{
        {6 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_arrow_right,
-        Color::dark_grey()};
+        Theme::getInstance()->bg_dark->background};

    NewButton button_add{
        {11 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_icon_new_file,
-        Color::orange()};
+        Theme::getInstance()->fg_orange->foreground};

    NewButton button_delete{
        {15 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_icon_delete,
-        Color::orange()};
+        Theme::getInstance()->fg_orange->foreground};

    NewButton button_open{
        {20 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_icon_load,
-        Color::dark_blue()};
+        Theme::getInstance()->fg_blue->foreground};

    NewButton button_save{
        {24 * 8, 4 * 16, 4 * 8, 2 * 16},
        "",
        &bitmap_icon_save,
-        Color::dark_blue()};
+        Theme::getInstance()->fg_blue->foreground};

    spectrum::WaterfallView waterfall{};

@@ -33,6 +33,8 @@ using namespace pocsag;

 namespace ui {

+#define MAX_POCSAG_LENGTH 80
+
 void POCSAGTXView::focus() {
    field_address.focus();
 }
@@ -57,6 +59,7 @@ void POCSAGTXView::on_remote(const PocsagTosendMessage data) {
    options_phase.set_selected_index(data.phase == 'P' ? 0 : 1);
    field_address.set_value(data.addr);
    message = (char*)data.msg;
+    buffer = message;
    text_message.set(message);
    options_bitrate.dirty();
    options_type.dirty();
@@ -105,9 +108,9 @@ bool POCSAGTXView::start_tx() {

    progressbar.set_max(total_frames);

-    transmitter_model.set_rf_amp(true);
-    transmitter_model.set_tx_gain(40);
-    // We left exactly same TX LPF settings as previous fw 1.7.4,  TX LPF= 1M75 (min). It is fine even in max FM dev. 150khz and 2400 bauds.
+    // transmitter_model.set_rf_amp(true);
+    // transmitter_model.set_tx_gain(40);
+    //  We left exactly same TX LPF settings as previous fw 1.7.4,  TX LPF= 1M75 (min). It is fine even in max FM dev. 150khz and 2400 bauds.
    transmitter_model.set_baseband_bandwidth(1'750'000);  // Min TX LPF . Pocsag is NBFM , using BW channel 25khz or 12khz
    transmitter_model.enable();

@@ -139,11 +142,18 @@ bool POCSAGTXView::start_tx() {

 void POCSAGTXView::paint(Painter&) {
    message = buffer;
-    text_message.set(message);
+    text_message.set(message);  // the whole message, but it may not fit.
+    if (message.length() > 30 && message.length() <= 60) {
+        text_message_l2.set(message.substr(29));  // remaining to 2nd line
+    } else if (message.length() > 60) {
+        text_message_l2.set(message.substr(29, 27) + "...");
+    } else {
+        text_message_l2.set("");
+    }
 }

 void POCSAGTXView::on_set_text(NavigationView& nav) {
-    text_prompt(nav, buffer, 30);
+    text_prompt(nav, buffer, MAX_POCSAG_LENGTH);
 }

 POCSAGTXView::POCSAGTXView(
@@ -158,6 +168,7 @@ POCSAGTXView::POCSAGTXView(
                  &options_function,
                  &options_phase,
                  &text_message,
+                  &text_message_l2,
                  &button_message,
                  &progressbar,
                  &tx_view});
@@ -80,12 +80,12 @@ class POCSAGTXView : public View {
    bool start_tx();

    Labels labels{
-        {{3 * 8, 4 * 8}, "Bitrate:", Color::light_grey()},
-        {{3 * 8, 6 * 8}, "Address:", Color::light_grey()},
-        {{6 * 8, 8 * 8}, "Type:", Color::light_grey()},
-        {{2 * 8, 10 * 8}, "Function:", Color::light_grey()},
-        {{5 * 8, 12 * 8}, "Phase:", Color::light_grey()},
-        {{0 * 8, 14 * 8}, "Message:", Color::light_grey()}};
+        {{3 * 8, 4 * 8}, "Bitrate:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 6 * 8}, "Address:", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 8 * 8}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 8}, "Function:", Theme::getInstance()->fg_light->foreground},
+        {{5 * 8, 12 * 8}, "Phase:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 14 * 8}, "Message:", Theme::getInstance()->fg_light->foreground}};

    OptionsField options_bitrate{
        {11 * 8, 4 * 8},
@@ -122,15 +122,18 @@ class POCSAGTXView : public View {
        }};

    Text text_message{
-        {0 * 8, 16 * 8, 16 * 8, 16},
+        {0 * 8, 16 * 8, 30 * 8, 16},
+        ""};
+    Text text_message_l2{
+        {0 * 8, 18 * 8, 30 * 8, 16},
        ""};

    Button button_message{
-        {0 * 8, 18 * 8, 14 * 8, 32},
+        {0 * 8, 20 * 8, 14 * 8, 32},
        "Set message"};

    ProgressBar progressbar{
-        {16, 200, 208, 16}};
+        {16, 210, 208, 16}};

    TransmitterView tx_view{
        16 * 16,
@@ -43,8 +43,8 @@ class RDSPSNView : public OptionTabView {

   private:
    Labels labels{
-        {{1 * 8, 3 * 8}, "Program Service Name", Color::light_grey()},
-        {{2 * 8, 7 * 8}, "PSN:", Color::light_grey()}};
+        {{1 * 8, 3 * 8}, "Program Service Name", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 7 * 8}, "PSN:", Theme::getInstance()->fg_light->foreground}};

    Button button_set{
        {18 * 8, 3 * 16, 80, 32},
@@ -75,8 +75,8 @@ class RDSRadioTextView : public OptionTabView {

   private:
    Labels labels{
-        {{2 * 8, 3 * 8}, "Radiotext", Color::light_grey()},
-        {{1 * 8, 6 * 8}, "Text:", Color::light_grey()}};
+        {{2 * 8, 3 * 8}, "Radiotext", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 6 * 8}, "Text:", Theme::getInstance()->fg_light->foreground}};

    Text text_radiotext{
        {1 * 8, 4 * 16, 28 * 8, 16},
@@ -92,7 +92,7 @@ class RDSDateTimeView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Color::red()}};
+        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSAudioView : public OptionTabView {
@@ -101,7 +101,7 @@ class RDSAudioView : public OptionTabView {

   private:
    Labels labels{
-        {{44, 5 * 16}, "Not yet implemented", Color::red()}};
+        {{44, 5 * 16}, "Not yet implemented", Theme::getInstance()->error_dark->foreground}};
 };

 class RDSThread {
@@ -168,16 +168,16 @@ class RDSView : public View {
    RDSAudioView view_audio{view_rect};

    TabView tab_view{
-        {"Name", Color::cyan(), &view_PSN},
-        {"Text", Color::green(), &view_radiotext},
-        {"Time", Color::yellow(), &view_datetime},
-        {"Audio", Color::orange(), &view_audio}};
+        {"Name", Theme::getInstance()->fg_cyan->foreground, &view_PSN},
+        {"Text", Theme::getInstance()->fg_green->foreground, &view_radiotext},
+        {"Time", Theme::getInstance()->fg_yellow->foreground, &view_datetime},
+        {"Audio", Theme::getInstance()->fg_orange->foreground, &view_audio}};

    Labels labels{
-        {{0 * 8, 28}, "Program type:", Color::light_grey()},
-        //{ { 14 * 8, 16 + 8 }, "CC:", Color::light_grey() },
-        {{2 * 8, 28 + 16}, "Program ID:", Color::light_grey()},
-        //{ { 13 * 8, 32 + 8 }, "Cov:", Color::light_grey() },
+        {{0 * 8, 28}, "Program type:", Theme::getInstance()->fg_light->foreground},
+        //{ { 14 * 8, 16 + 8 }, "CC:", Theme::getInstance()->fg_light->foreground },
+        {{2 * 8, 28 + 16}, "Program ID:", Theme::getInstance()->fg_light->foreground},
+        //{ { 13 * 8, 32 + 8 }, "Cov:",Theme::getInstance()->fg_light->foreground },
    };

    OptionsField options_pty{
@@ -28,7 +28,6 @@
 #include "file.hpp"
 #include "file_reader.hpp"
 #include "tone_key.hpp"
-#include "replay_app.hpp"
 #include "string_format.hpp"
 #include "ui_fileman.hpp"
 #include "io_file.hpp"
@@ -65,16 +64,16 @@ void ReconView::reload_restart_recon() {
        recon_resume();
    }
    if (scanner_mode) {
-        file_name.set_style(&Styles::red);
-        button_scanner_mode.set_style(&Styles::red);
+        file_name.set_style(Theme::getInstance()->fg_red);
+        button_scanner_mode.set_style(Theme::getInstance()->fg_red);
        button_scanner_mode.set_text("SCAN");
    } else {
-        file_name.set_style(&Styles::blue);
-        button_scanner_mode.set_style(&Styles::blue);
+        file_name.set_style(Theme::getInstance()->fg_blue);
+        button_scanner_mode.set_style(Theme::getInstance()->fg_blue);
        button_scanner_mode.set_text("RECON");
    }
    if (frequency_list.size() > FREQMAN_MAX_PER_FILE) {
-        file_name.set_style(&Styles::yellow);
+        file_name.set_style(Theme::getInstance()->fg_yellow);
    }
 }

@@ -104,7 +103,7 @@ freqman_entry& ReconView::current_entry() {

 void ReconView::set_loop_config(bool v) {
    continuous = v;
-    button_loop_config.set_style(v ? &Styles::green : &Styles::white);
+    button_loop_config.set_style(v ? Theme::getInstance()->fg_green : Theme::getInstance()->bg_darkest);
    persistent_memory::set_recon_continuous(continuous);
 }

@@ -121,8 +120,8 @@ void ReconView::recon_stop_recording(bool exiting) {
        } else {
            button_audio_app.set_text("AUDIO");
        }
-        button_audio_app.set_style(&Styles::white);
-        button_config.set_style(&Styles::white);
+        button_audio_app.set_style(Theme::getInstance()->bg_darkest);
+        button_config.set_style(Theme::getInstance()->bg_darkest);
    }
 }

@@ -171,23 +170,23 @@ void ReconView::update_description() {
 void ReconView::colorize_waits() {
    // colorize wait on match
    if (wait == 0) {
-        field_wait.set_style(&Styles::blue);
+        field_wait.set_style(Theme::getInstance()->fg_blue);
    } else if (wait >= 500) {
-        field_wait.set_style(&Styles::white);
+        field_wait.set_style(Theme::getInstance()->bg_darkest);
    } else if (wait > -500 && wait < 500) {
-        field_wait.set_style(&Styles::red);
+        field_wait.set_style(Theme::getInstance()->fg_red);
    } else if (wait <= -500) {
-        field_wait.set_style(&Styles::green);
+        field_wait.set_style(Theme::getInstance()->fg_green);
    }
    // colorize lock time if in SPARSE mode as in continuous the lock_wait time is disarmed at first lock count
    if (recon_match_mode == RECON_MATCH_SPARSE) {
        if ((recon_lock_duration / STATS_UPDATE_INTERVAL) <= recon_lock_nb_match) {
-            field_lock_wait.set_style(&Styles::yellow);
+            field_lock_wait.set_style(Theme::getInstance()->fg_yellow);
        } else {
-            field_lock_wait.set_style(&Styles::white);
+            field_lock_wait.set_style(Theme::getInstance()->bg_darkest);
        }
    } else {
-        field_lock_wait.set_style(&Styles::white);
+        field_lock_wait.set_style(Theme::getInstance()->bg_darkest);
    }
 }

@@ -259,17 +258,17 @@ void ReconView::recon_redraw() {
        text_nb_locks.set(to_string_dec_uint(freq_lock) + "/" + to_string_dec_uint(recon_lock_nb_match));
        if (freq_lock == 0) {
            // NO FREQ LOCK, ONGOING STANDARD SCANNING
-            big_display.set_style(&Styles::white);
+            big_display.set_style(Theme::getInstance()->bg_darkest);
            if (recon)
                button_pause.set_text("<PAUSE>");
            else
                button_pause.set_text("<RESUME>");
        } else if (freq_lock == 1 && recon_lock_nb_match != 1) {
            // STARTING LOCK FREQ
-            big_display.set_style(&Styles::yellow);
+            big_display.set_style(Theme::getInstance()->fg_yellow);
            button_pause.set_text("<SKPLCK>");
        } else if (freq_lock >= recon_lock_nb_match) {
-            big_display.set_style(&Styles::green);
+            big_display.set_style(Theme::getInstance()->fg_green);
            button_pause.set_text("<UNLOCK>");
        }
    }
@@ -591,18 +590,18 @@ ReconView::ReconView(NavigationView& nav)
            current_entry().bandwidth = freqman_invalid_index;
            current_entry().step = def_step;

-            big_display.set_style(&Styles::white);  // Back to white color
+            big_display.set_style(Theme::getInstance()->bg_darkest);  // Back to white color

-            freq_stats.set_style(&Styles::white);
+            freq_stats.set_style(Theme::getInstance()->bg_darkest);
            freq_stats.set("0/0/0");

            text_cycle.set_text("1");
            text_max.set("/1");
-            button_scanner_mode.set_style(&Styles::white);
+            button_scanner_mode.set_style(Theme::getInstance()->bg_darkest);
            button_scanner_mode.set_text("MANUAL");
-            file_name.set_style(&Styles::white);
+            file_name.set_style(Theme::getInstance()->bg_darkest);
            file_name.set("MANUAL => " + output_file);
-            desc_cycle.set_style(&Styles::white);
+            desc_cycle.set_style(Theme::getInstance()->bg_darkest);

            last_entry.modulation = freqman_invalid_index;
            last_entry.bandwidth = freqman_invalid_index;
@@ -648,12 +647,12 @@ ReconView::ReconView(NavigationView& nav)
        manual_mode = false;
        if (scanner_mode) {
            scanner_mode = false;
-            button_scanner_mode.set_style(&Styles::blue);
+            button_scanner_mode.set_style(Theme::getInstance()->fg_blue);
            button_scanner_mode.set_text("RECON");
            button_remove.set_text("<REMOVE>");
        } else {
            scanner_mode = true;
-            button_scanner_mode.set_style(&Styles::red);
+            button_scanner_mode.set_style(Theme::getInstance()->fg_red);
            button_scanner_mode.set_text("SCAN");
            button_remove.set_text("<DELETE>");
        }
@@ -726,7 +725,7 @@ ReconView::ReconView(NavigationView& nav)
    };

    // PRE-CONFIGURATION:
-    button_scanner_mode.set_style(&Styles::blue);
+    button_scanner_mode.set_style(Theme::getInstance()->fg_blue);
    button_scanner_mode.set_text("RECON");
    file_name.set("=>");

@@ -772,14 +771,14 @@ void ReconView::frequency_file_load() {
    std::string file_input = input_file;    // default recon mode
    if (scanner_mode) {
        file_input = output_file;
-        file_name.set_style(&Styles::red);
-        button_scanner_mode.set_style(&Styles::red);
-        desc_cycle.set_style(&Styles::red);
+        file_name.set_style(Theme::getInstance()->fg_red);
+        button_scanner_mode.set_style(Theme::getInstance()->fg_red);
+        desc_cycle.set_style(Theme::getInstance()->fg_red);
        button_scanner_mode.set_text("SCAN");
    } else {
-        file_name.set_style(&Styles::blue);
-        button_scanner_mode.set_style(&Styles::blue);
-        desc_cycle.set_style(&Styles::blue);
+        file_name.set_style(Theme::getInstance()->fg_blue);
+        button_scanner_mode.set_style(Theme::getInstance()->fg_blue);
+        desc_cycle.set_style(Theme::getInstance()->fg_blue);
        button_scanner_mode.set_text("RECON");
    }

@@ -791,7 +790,7 @@ void ReconView::frequency_file_load() {
        .load_hamradios = load_hamradios,
        .load_repeaters = load_repeaters};
    if (!load_freqman_file(file_input, frequency_list, options) || frequency_list.empty()) {
-        file_name.set_style(&Styles::red);
+        file_name.set_style(Theme::getInstance()->fg_red);
        desc_cycle.set("...empty file...");
        frequency_list.clear();
        text_cycle.set_text(" ");
@@ -799,7 +798,7 @@ void ReconView::frequency_file_load() {
    }

    if (frequency_list.size() > FREQMAN_MAX_PER_FILE) {
-        file_name.set_style(&Styles::yellow);
+        file_name.set_style(Theme::getInstance()->fg_yellow);
    }

    reset_indexes();
@@ -888,13 +887,13 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
                        audio_output_start();
                    // contents of a possible recon_start_recording(), but not yet since it's only called once
                    if (auto_record_locked && !is_recording) {
-                        button_audio_app.set_style(&Styles::red);
+                        button_audio_app.set_style(Theme::getInstance()->fg_red);
                        if (field_mode.selected_index_value() == SPEC_MODULATION) {
                            button_audio_app.set_text("RAW REC");
                        } else
                            button_audio_app.set_text("WAV REC");
                        record_view->start();
-                        button_config.set_style(&Styles::light_grey);  // disable config while recording as it's causing an IO error pop up at exit
+                        button_config.set_style(Theme::getInstance()->fg_light);  // disable config while recording as it's causing an IO error pop up at exit
                        is_recording = true;
                    }
                    // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
@@ -1106,7 +1105,7 @@ void ReconView::recon_pause() {
    if (field_mode.selected_index_value() != SPEC_MODULATION)
        audio_output_start();

-    big_display.set_style(&Styles::white);
+    big_display.set_style(Theme::getInstance()->bg_darkest);
    button_pause.set_text("<RESUME>");  // PAUSED, show resume
 }

@@ -1118,7 +1117,7 @@ void ReconView::recon_resume() {
    if (field_mode.selected_index_value() != SPEC_MODULATION)
        audio::output::stop();

-    big_display.set_style(&Styles::white);
+    big_display.set_style(Theme::getInstance()->bg_darkest);
    button_pause.set_text("<PAUSE>");
 }

@@ -1401,8 +1400,8 @@ void ReconView::start_repeat() {
            std::string delay_message = "TX DELAY: " + to_string_dec_uint(delay) + "s";

            // update display information
-            p.fill_rectangle({0, (SCREEN_H / 2) - 16, SCREEN_W, 64}, Color::light_grey());
-            p.draw_string({(SCREEN_W / 2) - 7 * 8, SCREEN_H / 2}, Styles::red, delay_message);
+            p.fill_rectangle({0, (SCREEN_H / 2) - 16, SCREEN_W, 64}, Theme::getInstance()->fg_light->foreground);
+            p.draw_string({(SCREEN_W / 2) - 7 * 8, SCREEN_H / 2}, *Theme::getInstance()->fg_red, delay_message);

            // sleep 1 second
            chThdSleepMilliseconds(1000);
@@ -27,7 +27,6 @@
 #include "ui.hpp"
 #include "receiver_model.hpp"
 #include "ui_receiver.hpp"
-#include "ui_styles.hpp"
 #include "freqman.hpp"
 #include "analog_audio_app.hpp"
 #include "audio.hpp"
@@ -219,11 +218,11 @@ class ReconView : public View {
    std::unique_ptr<RecordView> record_view{};

    Labels labels{
-        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Color::light_grey()},
-        {{3 * 8, 8 * 16}, "START       END", Color::light_grey()},
-        {{0 * 8, (22 * 8)}, "                S:          ", Color::light_grey()},
-        {{0 * 8, (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Color::light_grey()},
-        {{0 * 8, (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Color::light_grey()}};
+        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:     ", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 8 * 16}, "START       END", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, (22 * 8)}, "                S:          ", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, (24 * 8) + 4}, "NBLCKS:x      W,L:      ,     ", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, (26 * 8) + 4}, "MODE:     ,      SQUELCH:    ", Theme::getInstance()->fg_light->foreground}};

    LNAGainField field_lna{
        {4 * 8, 0 * 16}};
@@ -137,15 +137,15 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
                  &field_repeat_delay});

    // tx options have to be in yellow to inform the users that activating them will make the device transmit
-    checkbox_repeat_recorded.set_style(&Styles::yellow);
-    field_repeat_file_mode.set_style(&Styles::yellow);
-    text_repeat_nb.set_style(&Styles::yellow);
-    field_repeat_nb.set_style(&Styles::yellow);
-    checkbox_repeat_amp.set_style(&Styles::yellow);
-    text_repeat_gain.set_style(&Styles::yellow);
-    field_repeat_gain.set_style(&Styles::yellow);
-    text_repeat_delay.set_style(&Styles::yellow);
-    field_repeat_delay.set_style(&Styles::yellow);
+    checkbox_repeat_recorded.set_style(Theme::getInstance()->fg_yellow);
+    field_repeat_file_mode.set_style(Theme::getInstance()->fg_yellow);
+    text_repeat_nb.set_style(Theme::getInstance()->fg_yellow);
+    field_repeat_nb.set_style(Theme::getInstance()->fg_yellow);
+    checkbox_repeat_amp.set_style(Theme::getInstance()->fg_yellow);
+    text_repeat_gain.set_style(Theme::getInstance()->fg_yellow);
+    field_repeat_gain.set_style(Theme::getInstance()->fg_yellow);
+    text_repeat_delay.set_style(Theme::getInstance()->fg_yellow);
+    field_repeat_delay.set_style(Theme::getInstance()->fg_yellow);

    checkbox_load_freqs.set_value(persistent_memory::recon_load_freqs());
    checkbox_load_repeaters.set_value(persistent_memory::recon_load_repeaters());
@@ -30,7 +30,6 @@
 #include "ui_tabview.hpp"
 #include "ui_navigation.hpp"
 #include "string_format.hpp"
-#include "ui_styles.hpp"

 // 1Mhz helper
 #ifdef OneMHz
@@ -60,7 +59,7 @@

 // screen size helper
 #define SCREEN_W 240
-//#define SCREEN_H 320
+// #define SCREEN_H 320

 // recon settings nb params
 #define RECON_SETTINGS_NB_PARAMS 7
@@ -226,8 +225,8 @@ class ReconSetupView : public View {
    ReconSetupViewMore viewMore{nav_, view_rect};

    TabView tab_view{
-        {"Main", Color::cyan(), &viewMain},
-        {"More", Color::green(), &viewMore}};
+        {"Main", Theme::getInstance()->fg_cyan->foreground, &viewMain},
+        {"More", Theme::getInstance()->fg_green->foreground, &viewMore}};

    Button button_save{
        {9 * 8, 255, 14 * 8, 40},
@@ -185,16 +185,16 @@ void ScannerView::bigdisplay_update(int32_t v) {

        switch (bigdisplay_current_color) {
            case BDC_GREY:
-                big_display.set_style(&Styles::grey);
+                big_display.set_style(Theme::getInstance()->fg_medium);
                break;
            case BDC_YELLOW:
-                big_display.set_style(&Styles::yellow);
+                big_display.set_style(Theme::getInstance()->fg_yellow);
                break;
            case BDC_GREEN:
-                big_display.set_style(&Styles::green);
+                big_display.set_style(Theme::getInstance()->fg_green);
                break;
            case BDC_RED:
-                big_display.set_style(&Styles::red);
+                big_display.set_style(Theme::getInstance()->fg_red);
                break;
            default:
                break;
@@ -280,10 +280,10 @@ void ScannerView::show_max_index() {  // show total number of freqs to scan
    field_current_index.set_text("<->");

    if (entries.size() == FREQMAN_MAX_PER_FILE) {
-        text_max_index.set_style(&Styles::red);
+        text_max_index.set_style(Theme::getInstance()->fg_red);
        text_max_index.set("/ " + to_string_dec_uint(FREQMAN_MAX_PER_FILE) + " (DB MAX!)");
    } else {
-        text_max_index.set_style(&Styles::grey);
+        text_max_index.set_style(Theme::getInstance()->fg_medium);
        text_max_index.set("/ " + to_string_dec_uint(entries.size()));
    }
 }
@@ -34,11 +34,10 @@
 #include "ui.hpp"
 #include "ui_mictx.hpp"
 #include "ui_receiver.hpp"
-#include "ui_styles.hpp"

 #define SCANNER_SLEEP_MS 50  // ms that Scanner Thread sleeps per loop
 #define STATISTICS_UPDATES_PER_SEC 10
-#define MAX_FREQ_LOCK 10  //# of 50ms cycles scanner locks into freq when signal detected, to verify signal is not spurious
+#define MAX_FREQ_LOCK 10  // # of 50ms cycles scanner locks into freq when signal detected, to verify signal is not spurious

 namespace ui {

@@ -172,12 +171,12 @@ class ScannerView : public View {
    };

    Labels labels{
-        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:", Color::light_grey()},
-        {{0 * 8, 1 * 16}, "BW:       SQ:    Wsa:   Wsl:", Color::light_grey()},
-        {{0 * 8, 10 * 16}, "SRCH START  SEARCH END  SWITCH", Color::light_grey()},
+        {{0 * 8, 0 * 16}, "LNA:   VGA:   AMP:  VOL:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 1 * 16}, "BW:       SQ:    Wsa:   Wsl:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 10 * 16}, "SRCH START  SEARCH END  SWITCH", Theme::getInstance()->fg_light->foreground},

-        {{0 * 8, (26 * 8) + 4}, "MODE:", Color::light_grey()},
-        {{11 * 8, (26 * 8) + 4}, "STEP:", Color::light_grey()},
+        {{0 * 8, (26 * 8) + 4}, "MODE:", Theme::getInstance()->fg_light->foreground},
+        {{11 * 8, (26 * 8) + 4}, "STEP:", Theme::getInstance()->fg_light->foreground},
    };

    LNAGainField field_lna{
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui_script.hpp"
-
-#include "portapack.hpp"
-#include "event_m0.hpp"
-
-#include <cstring>
-
-using namespace portapack;
-
-namespace ui {
-
-void ScriptView::on_frequency_select() {
-    // button_edit_freq.focus();
-}
-
-void ScriptView::on_edit_freq(rf::Frequency f) {
-    (void)f;
-    // frequencies[menu_view.highlighted()].value = f;
-    setup_list();
-}
-
-void ScriptView::on_edit_desc(NavigationView& nav) {
-    (void)nav;
-}
-
-void ScriptView::on_delete() {
-    // frequencies.erase(frequencies.begin() + menu_view.highlighted());
-    setup_list();
-}
-
-void ScriptView::setup_list() {
-    // size_t n;
-
-    menu_view.clear();
-
-    /*for (n = 0; n < frequencies.size(); n++) {
-                menu_view.add_item({ freqman_item_string(frequencies[n]), ui::Color::white(), nullptr, [this](){ on_frequency_select(); } });
-        }*/
-
-    menu_view.set_parent_rect({0, 0, 240, 168});
-    menu_view.set_highlighted(menu_view.highlighted());  // Refresh
-}
-
-void ScriptView::focus() {
-    menu_view.focus();
-}
-
-ScriptView::ScriptView(
-    NavigationView& nav) {
-    add_children({&menu_view,
-                  &text_edit,
-                  &button_edit_freq,
-                  &button_edit_desc,
-                  &button_del,
-                  &button_exit});
-
-    setup_list();
-
-    button_edit_freq.on_select = [this, &nav](Button&) {
-        /*auto new_view = nav.push<FrequencyKeypadView>(frequencies[menu_view.highlighted()].value);
-                new_view->on_changed = [this](rf::Frequency f) {
-                        on_edit_freq(f);
-                };*/
-    };
-
-    button_edit_desc.on_select = [this, &nav](Button&) {
-        on_edit_desc(nav);
-    };
-
-    button_del.on_select = [this, &nav](Button&) {
-        nav.push<ModalMessageView>("Confirm", "Are you sure?", YESNO,
-                                   [this](bool choice) {
-                                       if (choice) {
-                                           on_delete();
-                                       }
-                                   });
-    };
-
-    button_exit.on_select = [this, &nav](Button&) {
-        nav.pop();
-    };
-}
-
-}  // namespace ui
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- * Copyright (C) 2016 Furrtek
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ui.hpp"
-#include "ui_widget.hpp"
-#include "ui_painter.hpp"
-#include "ui_menu.hpp"
-#include "ui_navigation.hpp"
-#include "ui_receiver.hpp"
-#include "ui_textentry.hpp"
-#include "rtc_time.hpp"
-
-namespace ui {
-
-enum script_keyword {
-    STOP = 0,
-    WAIT_N,
-    WAIT_RTC,
-    IF,
-    LOOP,
-    END,
-    TX,
-    RX
-};
-
-struct script_line {
-    script_keyword keyword;
-};
-
-class ScriptView : public View {
-   public:
-    ScriptView(NavigationView& nav);
-
-    void focus() override;
-
-    std::string title() const override { return "Script editor"; };
-
-   private:
-    void on_frequency_select();
-    void on_edit_freq(rf::Frequency f);
-    void on_edit_desc(NavigationView& nav);
-    void on_delete();
-    void setup_list();
-
-    std::vector<script_line> script{};
-
-    MenuView menu_view{
-        {0, 0, 240, 168},
-        true};
-
-    Text text_edit{
-        {16, 194, 5 * 8, 16},
-        "Edit:"};
-    Button button_edit_freq{
-        {16, 194 + 16, 88, 32},
-        "Frequency"};
-    Button button_edit_desc{
-        {16, 194 + 16 + 34, 88, 32},
-        "Description"};
-    Button button_del{
-        {160, 192, 72, 64},
-        "Delete"};
-
-    Button button_exit{
-        {160, 264, 72, 32},
-        "Exit"};
-};
-
-} /* namespace ui */
@@ -34,13 +34,13 @@ SdOverUsbView::SdOverUsbView(NavigationView& nav)
        ui::Painter painter;
        painter.fill_rectangle(
            {0, 0, portapack::display.width(), portapack::display.height()},
-            ui::Color::black());
+            Theme::getInstance()->bg_darkest->background);

        painter.draw_bitmap(
            {portapack::display.width() / 2 - 8, portapack::display.height() / 2 - 8},
            bitmap_icon_hackrf,
-            ui::Color::yellow(),
-            ui::Color::black());
+            Theme::getInstance()->bg_darkest->foreground,
+            Theme::getInstance()->bg_darkest->background);

        sdcDisconnect(&SDCD1);
        sdcStop(&SDCD1);
@@ -46,11 +46,11 @@ class SdOverUsbView : public View {
    NavigationView& nav_;

    Labels labels{
-        {{3 * 8, 2 * 16}, "Click Run to start the", Color::white()},
-        {{3 * 8, 3 * 16}, "USB Mass Storage Mode.", Color::white()},
-        {{3 * 8, 5 * 16}, "It can take up to 20s", Color::white()},
-        {{3 * 8, 6 * 16}, "for the drive to be", Color::white()},
-        {{3 * 8, 7 * 16}, "available.", Color::white()},
+        {{3 * 8, 2 * 16}, "Click Run to start the", Theme::getInstance()->bg_darkest->foreground},
+        {{3 * 8, 3 * 16}, "USB Mass Storage Mode.", Theme::getInstance()->bg_darkest->foreground},
+        {{3 * 8, 5 * 16}, "It can take up to 20s", Theme::getInstance()->bg_darkest->foreground},
+        {{3 * 8, 6 * 16}, "for the drive to be", Theme::getInstance()->bg_darkest->foreground},
+        {{3 * 8, 7 * 16}, "available.", Theme::getInstance()->bg_darkest->foreground},
    };

    Button button_run{
@@ -80,11 +80,11 @@ SearchView::SearchView(
        nav.push<FrequencySaveView>(entry.frequency);
    };

-    text_mean.set_style(&Styles::grey);
-    text_slices.set_style(&Styles::grey);
-    text_rate.set_style(&Styles::grey);
-    progress_timers.set_style(&Styles::grey);
-    big_display.set_style(&Styles::grey);
+    text_mean.set_style(Theme::getInstance()->fg_medium);
+    text_slices.set_style(Theme::getInstance()->fg_medium);
+    text_rate.set_style(Theme::getInstance()->fg_medium);
+    progress_timers.set_style(Theme::getInstance()->fg_medium);
+    big_display.set_style(Theme::getInstance()->fg_medium);

    field_frequency_min.set_step(100'000);
    bind(field_frequency_min, settings_.freq_min, nav, [this](auto) {
@@ -184,7 +184,7 @@ void SearchView::do_detection() {
                        recent_entries_view.set_dirty();

                        text_infos.set("Locked ! ");
-                        big_display.set_style(&Styles::green);
+                        big_display.set_style(Theme::getInstance()->fg_green);

                        locked = true;
                        locked_bin = bin_max;
@@ -209,7 +209,7 @@ void SearchView::do_detection() {
                recent_entries_view.set_dirty();

                text_infos.set("Listening");
-                big_display.set_style(&Styles::grey);
+                big_display.set_style(Theme::getInstance()->fg_medium);
            }
        }
    }
@@ -219,10 +219,10 @@ void SearchView::do_detection() {
    search_counter++;

    // Refresh red tick
-    portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Color::black());
+    portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->background);
    if (bin_max > -1) {
        last_tick_pos = (Coord)(bin_max / slices_nb);
-        portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Color::red());
+        portapack::display.fill_rectangle({last_tick_pos, 90, 1, 6}, Theme::getInstance()->fg_red->foreground);
    }
 }

@@ -26,7 +26,6 @@
 #include "radio_state.hpp"
 #include "spectrum_color_lut.hpp"
 #include "ui_receiver.hpp"
-#include "ui_styles.hpp"

 namespace ui {

@@ -162,12 +161,12 @@ class SearchView : public View {
    RecentEntriesView<RecentEntries<SearchRecentEntry>> recent_entries_view{columns, recent};

    Labels labels{
-        {{1 * 8, 0}, "Min:      Max:       LNA VGA", Color::light_grey()},
-        {{1 * 8, 4 * 8}, "Trig:   /255    Mean:   /255", Color::light_grey()},
-        {{1 * 8, 6 * 8}, "Slices:  /32      Rate:   Hz", Color::light_grey()},
-        {{6 * 8, 10 * 8}, "Timer  Status", Color::light_grey()},
-        {{1 * 8, 25 * 8}, "Accuracy +/-4.9kHz", Color::light_grey()},
-        {{26 * 8, 25 * 8}, "MHz", Color::light_grey()}};
+        {{1 * 8, 0}, "Min:      Max:       LNA VGA", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 4 * 8}, "Trig:   /255    Mean:   /255", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 6 * 8}, "Slices:  /32      Rate:   Hz", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 10 * 8}, "Timer  Status", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 25 * 8}, "Accuracy +/-4.9kHz", Theme::getInstance()->fg_light->foreground},
+        {{26 * 8, 25 * 8}, "MHz", Theme::getInstance()->fg_light->foreground}};

    FrequencyField field_frequency_min{
        {1 * 8, 1 * 16}};
@@ -5,6 +5,7 @@
 * Copyright (C) 2023 Kyle Reed
 * Copyright (C) 2024 Mark Thompson
 * Copyright (C) 2024 u-foka
+ * Copyright (C) 2024 HTotoo
 * Copyleft (ɔ) 2024 zxkmm under GPL license
 *
 * This file is part of PortaPack.
@@ -46,10 +47,13 @@ using namespace portapack;
 namespace fs = std::filesystem;

 #include "string_format.hpp"
-#include "ui_styles.hpp"
 #include "ui_font_fixed_8x16.hpp"
 #include "cpld_update.hpp"
 #include "config_mode.hpp"
+#include "i2cdevmanager.hpp"
+#include "i2cdev_max17055.hpp"
+
+extern ui::SystemView* system_view_ptr;

 namespace pmem = portapack::persistent_memory;

@@ -228,9 +232,9 @@ SetRadioView::SetRadioView(
    value_source_frequency.set(clock_manager.get_freq());

    // Make these Text controls look like Labels.
-    label_source.set_style(&Styles::light_grey);
-    value_source.set_style(&Styles::light_grey);
-    value_source_frequency.set_style(&Styles::light_grey);
+    label_source.set_style(Theme::getInstance()->fg_light);
+    value_source.set_style(Theme::getInstance()->fg_light);
+    value_source_frequency.set_style(Theme::getInstance()->fg_light);

    SetFrequencyCorrectionModel model{
        static_cast<int8_t>(pmem::correction_ppb() / 1000), 0};
@@ -320,7 +324,6 @@ SetUIView::SetUIView(NavigationView& nav) {
                  &toggle_bias_tee,
                  &toggle_clock,
                  &toggle_mute,
-                  &toggle_fake_brightness,
                  &toggle_sd_card,
                  &button_save,
                  &button_cancel});
@@ -358,7 +361,6 @@ SetUIView::SetUIView(NavigationView& nav) {
    toggle_clock.set_value(!pmem::ui_hide_clock());
    toggle_speaker.set_value(!pmem::ui_hide_speaker());
    toggle_mute.set_value(!pmem::ui_hide_mute());
-    toggle_fake_brightness.set_value(!pmem::ui_hide_fake_brightness());
    toggle_battery_icon.set_value(!pmem::ui_hide_battery_icon());
    toggle_battery_text.set_value(!pmem::ui_hide_numeric_battery());
    toggle_sd_card.set_value(!pmem::ui_hide_sd_card());
@@ -387,7 +389,6 @@ SetUIView::SetUIView(NavigationView& nav) {
        pmem::set_ui_hide_clock(!toggle_clock.value());
        pmem::set_ui_hide_speaker(!toggle_speaker.value());
        pmem::set_ui_hide_mute(!toggle_mute.value());
-        pmem::set_ui_hide_fake_brightness(!toggle_fake_brightness.value());
        pmem::set_ui_hide_battery_icon(!toggle_battery_icon.value());
        pmem::set_ui_hide_numeric_battery(!toggle_battery_text.value());
        pmem::set_ui_hide_sd_card(!toggle_sd_card.value());
@@ -575,7 +576,7 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
        &button_return,
    });

-    text_pmem_status.set_style(&Styles::yellow);
+    text_pmem_status.set_style(Theme::getInstance()->fg_yellow);

    check_use_sdcard_for_pmem.set_value(pmem::should_use_sdcard_for_pmem());
    check_use_sdcard_for_pmem.on_select = [this](Checkbox&, bool v) {
@@ -737,7 +738,7 @@ AppSettingsView::AppSettingsView(
        auto path = settings_dir / entry.path();

        menu_view.add_item({path.filename().string().substr(0, 26),
-                            ui::Color::dark_cyan(),
+                            ui::Theme::getInstance()->fg_darkcyan->foreground,
                            &bitmap_icon_file_text,
                            [this, path](KeyEvent) {
                                nav_.push<TextEditorView>(path);
@@ -773,21 +774,20 @@ void SetConfigModeView::focus() {
    button_save.focus();
 }

-/* SetFakeBrightnessView ************************************/
+/* SetDisplayView ************************************/

-SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
-    add_children({&labels,
-                  &field_fake_brightness,
-                  &button_save,
+SetDisplayView::SetDisplayView(NavigationView& nav) {
+    add_children({&button_save,
                  &button_cancel,
-                  &checkbox_brightness_switch});
+                  &checkbox_invert_switch});

-    field_fake_brightness.set_by_value(pmem::fake_brightness_level());
-    checkbox_brightness_switch.set_value(pmem::apply_fake_brightness());
+    checkbox_invert_switch.set_value(pmem::config_lcd_inverted_mode());

    button_save.on_select = [&nav, this](Button&) {
-        pmem::set_apply_fake_brightness(checkbox_brightness_switch.value());
-        pmem::set_fake_brightness_level(field_fake_brightness.selected_index_value());
+        if (checkbox_invert_switch.value() != pmem::config_lcd_inverted_mode()) {
+            display.set_inverted(checkbox_invert_switch.value());
+            pmem::set_lcd_inverted_mode(checkbox_invert_switch.value());
+        }
        send_system_refresh();
        nav.pop();
    };
@@ -797,10 +797,111 @@ SetFakeBrightnessView::SetFakeBrightnessView(NavigationView& nav) {
    };
 }

-void SetFakeBrightnessView::focus() {
+void SetDisplayView::focus() {
    button_save.focus();
 }

+/* SetTouchscreenSensitivityView ************************************/
+/* sample max: 1023 sample_t AKA uint16_t
+ * touch_sensitivity: range: 1 to 128
+ * threshold = 1023 / sensitive
+ * threshold range: 1023/1 to 1023/128  =  1023 to 8
+ */
+SetTouchscreenThresholdView::SetTouchscreenThresholdView(NavigationView& nav) {
+    add_children({&labels,
+                  &field_threshold,
+                  &button_autodetect,
+                  &button_reset,
+                  &button_save,
+                  &button_cancel,
+                  &text_hint,
+                  &text_wait_timer});
+
+    set_dirty();
+    org_threshold = portapack::touch_threshold;
+    field_threshold.set_value(pmem::touchscreen_threshold());
+    text_hint.set_style(Theme::getInstance()->error_dark);
+    text_hint.hidden(true);
+    text_wait_timer.set_style(Theme::getInstance()->error_dark);
+    text_wait_timer.hidden(true);
+    // clang-format off
+    button_autodetect.on_select = [this, &nav](Button&) {
+        nav.display_modal("NOTICE",
+                          "Now on don't touch screen;\n"
+                          "Use arrow keys to operate.\n"
+                          "Follow instructions.\n"
+                          "Press YES to continue",
+                          YESNO, [this, &nav](bool choice) {
+                if (choice){
+                        time_start_auto_detect = chTimeNow();
+                        text_hint.hidden(false);
+                        text_wait_timer.hidden(false);
+                        text_wait_timer.set("ETA " + to_string_dec_uint(10) + "s");
+                        in_auto_detect = true;
+                        field_threshold.set_value(1);
+                        portapack::touch_threshold = 1;
+                        set_dirty(); } }, TRUE);
+    };
+    // clang-format on
+
+    button_reset.on_select = [this](Button&) {
+        field_threshold.set_value(32);
+        portapack::touch_threshold = 32;
+    };
+
+    button_save.on_select = [&nav, this](Button&) {
+        pmem::set_touchscreen_threshold(field_threshold.value());
+        portapack::touch_threshold = field_threshold.value();
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        portapack::touch_threshold = org_threshold;
+        nav.pop();
+    };
+}
+
+void SetTouchscreenThresholdView::focus() {
+    button_autodetect.focus();
+    set_dirty();
+}
+
+void SetTouchscreenThresholdView::on_frame_sync() {
+    if (!in_auto_detect) return;
+    uint32_t time_now = chTimeNow();
+    int32_t time_diff = time_now - time_start_auto_detect;
+    text_wait_timer.set("ETA " + to_string_dec_uint((10 - time_diff / 1000) <= 0 ? 0 : 10 - time_diff / 1000) + "s");
+    if (time_diff >= 10001 && !auto_detect_succeed_consumed) {  // 10s
+        in_auto_detect = false;
+        text_wait_timer.hidden(true);
+        text_hint.set("OK, press save and reboot");
+        portapack::touch_threshold = org_threshold;
+        pmem::set_touchscreen_threshold(org_threshold);
+        set_dirty();
+        auto_detect_succeed_consumed = true;
+        button_save.focus();
+        return;
+    }
+    if (get_touch_frame().touch) {
+        if (in_auto_detect) {
+            uint16_t sen = field_threshold.value();
+            sen++;
+            portapack::touch_threshold = sen;
+            field_threshold.set_value(sen);
+        }
+    }
+}
+
+SetTouchscreenThresholdView::~SetTouchscreenThresholdView() {
+    // it seems that sometimes in the msg handler func it would enter the condi that not possible to entered,
+    // so added this workaround.
+    // TODO: find out why
+    in_auto_detect = false;
+    auto_detect_succeed_consumed = false;
+    time_start_auto_detect = 0;
+}
+
 /* SetMenuColorView ************************************/

 void SetMenuColorView::paint_sample() {
@@ -862,6 +963,7 @@ SetAutostartView::SetAutostartView(NavigationView& nav) {
    add_children({&labels,
                  &button_save,
                  &button_cancel,
+                  &button_reset,
                  &options});

    button_save.on_select = [&nav, this](Button&) {
@@ -878,6 +980,12 @@ SetAutostartView::SetAutostartView(NavigationView& nav) {
        nav.pop();
    };

+    button_reset.on_select = [this](Button&) {
+        selected = 0;
+        options.set_selected_index(0);
+        autostart_app = "";
+    };
+
    // options
    i = 0;
    OptionsField::option_t o{"-none-", i};
@@ -910,6 +1018,79 @@ void SetAutostartView::focus() {
    options.focus();
 }

+/* SetThemeView ************************************/
+
+SetThemeView::SetThemeView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_save,
+                  &button_cancel,
+                  &options,
+                  &checkbox_menuset});
+
+    button_save.on_select = [&nav, this](Button&) {
+        if (selected < Theme::ThemeId::MAX && (uint8_t)selected != portapack::persistent_memory::ui_theme_id()) {
+            portapack::persistent_memory::set_ui_theme_id((uint8_t)selected);
+            Theme::SetTheme((Theme::ThemeId)selected);
+            if (checkbox_menuset.value()) {
+                pmem::set_menu_color(Theme::getInstance()->bg_medium->background);
+            }
+            send_system_refresh();
+        }
+        nav.pop();
+    };
+
+    checkbox_menuset.set_value(true);
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+
+    options.on_change = [this](size_t, OptionsField::value_t v) {
+        selected = v;
+    };
+    options.set_selected_index(portapack::persistent_memory::ui_theme_id());
+}
+
+void SetThemeView::focus() {
+    options.focus();
+}
+
+/* SetBatteryView ************************************/
+
+SetBatteryView::SetBatteryView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_save,
+                  &button_cancel,
+                  &checkbox_overridebatt});
+
+    if (i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055)) add_children({&button_reset, &labels2});
+
+    button_save.on_select = [&nav, this](Button&) {
+        pmem::set_ui_override_batt_calc(checkbox_overridebatt.value());
+        battery::BatteryManagement::set_calc_override(checkbox_overridebatt.value());
+        send_system_refresh();
+        nav.pop();
+    };
+
+    button_reset.on_select = [&nav, this](Button&) {
+        auto dev = (i2cdev::I2cDev_MAX17055*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDEVMDL_MAX17055);
+        if (dev->reset_learned())
+            nav.display_modal("Reset", "Battery parameters reset");
+        else
+            nav.display_modal("Error", "Error parameter reset");
+    };
+
+    checkbox_overridebatt.set_value(pmem::ui_override_batt_calc());
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+}
+
+void SetBatteryView::focus() {
+    button_cancel.focus();
+}
+
 /* SettingsMenuView **************************************/

 SettingsMenuView::SettingsMenuView(NavigationView& nav)
@@ -925,6 +1106,7 @@ void SettingsMenuView::on_populate() {
        {"App Settings", ui::Color::dark_cyan(), &bitmap_icon_notepad, [this]() { nav_.push<AppSettingsView>(); }},
        {"Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [this]() { nav_.push<SetAudioView>(); }},
        {"Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [this]() { nav_.push<TouchCalibrationView>(); }},
+        {"TouchThreshold", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [this]() { nav_.push<SetTouchscreenThresholdView>(); }},
        {"Config Mode", ui::Color::dark_cyan(), &bitmap_icon_clk_ext, [this]() { nav_.push<SetConfigModeView>(); }},
        {"Converter", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push<SetConverterSettingsView>(); }},
        {"Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [this]() { nav_.push<SetDateTimeView>(); }},
@@ -935,10 +1117,12 @@ void SettingsMenuView::on_populate() {
        {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push<SetSDCardView>(); }},
        {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push<SetUIView>(); }},
        //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
-        {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetFakeBrightnessView>(); }},
+        {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetDisplayView>(); }},
        {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
+        {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetThemeView>(); }},
        {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},
    });
+    if (battery::BatteryManagement::isDetected()) add_item({"Battery", ui::Color::dark_cyan(), &bitmap_icon_batt_icon, [this]() { nav_.push<SetBatteryView>(); }});
 }

 } /* namespace ui */
@@ -35,6 +35,7 @@
 #include "bitmap.hpp"
 #include "ff.h"
 #include "portapack_persistent_memory.hpp"
+#include "irq_controls.hpp"

 #include <cstdint>

@@ -65,14 +66,14 @@ class SetDateTimeView : public View {
    std::vector<option_t> month_options = {{"Jan", 1}, {"Feb", 2}, {"Mar", 3}, {"Apr", 4}, {"May", 5}, {"Jun", 6}, {"Jul", 7}, {"Aug", 8}, {"Sep", 9}, {"Oct", 10}, {"Nov", 11}, {"Dec", 12}};

    Labels labels{
-        {{1 * 8, 1 * 16}, "Adjust the RTC clock date &", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "time. If clock resets after", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "reboot, coin batt. is dead. ", Color::light_grey()},
-        {{1 * 8, 5 * 16 - 2}, "YYYY-MM-DD HH:MM:SS  DoW DoY", Color::grey()},
-        {{5 * 8, 6 * 16}, "-  -     :  :", Color::light_grey()},
-        {{1 * 8, 11 * 16}, "DST adds 1 hour to RTC time.", Color::light_grey()},
-        {{0 * 8, 12 * 16}, "Start: 0:00 on Nth  DDD in", Color::light_grey()},
-        {{0 * 8, 13 * 16}, "End:   1:00 on Nth  DDD in", Color::light_grey()}};
+        {{1 * 8, 1 * 16}, "Adjust the RTC clock date &", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "time. If clock resets after", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "reboot, coin batt. is dead. ", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 5 * 16 - 2}, "YYYY-MM-DD HH:MM:SS  DoW DoY", Theme::getInstance()->fg_medium->foreground},
+        {{5 * 8, 6 * 16}, "-  -     :  :", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 11 * 16}, "DST adds 1 hour to RTC time.", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 12 * 16}, "Start: 0:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 13 * 16}, "End:   1:00 on Nth  DDD in", Theme::getInstance()->fg_light->foreground}};

    NumberField field_year{
        {1 * 8, 6 * 16},
@@ -210,8 +211,8 @@ class SetRadioView : public View {
        ""};

    Labels labels_correction{
-        {{2 * 8, 3 * 16}, "Frequency correction:", Color::light_grey()},
-        {{6 * 8, 4 * 16}, "PPM", Color::light_grey()},
+        {{2 * 8, 3 * 16}, "Frequency correction:", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 4 * 16}, "PPM", Theme::getInstance()->fg_light->foreground},
    };

    NumberField field_ppm{
@@ -233,13 +234,13 @@ class SetRadioView : public View {
        SymField::Type::Dec};

    Labels labels_clkout_khz{
-        {{26 * 8, 6 * 16}, "kHz", Color::light_grey()}};
+        {{26 * 8, 6 * 16}, "kHz", Theme::getInstance()->fg_light->foreground}};

    Labels labels_bias{
-        {{4 * 8 + 4, 8 * 16}, "CAUTION: Ensure that all", Color::red()},
-        {{5 * 8 + 0, 9 * 16}, "devices attached to the", Color::red()},
-        {{6 * 8 + 0, 10 * 16}, "antenna connector can", Color::red()},
-        {{6 * 8 + 4, 11 * 16}, "accept a DC voltage!", Color::red()}};
+        {{4 * 8 + 4, 8 * 16}, "CAUTION: Ensure that all", Theme::getInstance()->error_dark->foreground},
+        {{5 * 8 + 0, 9 * 16}, "devices attached to the", Theme::getInstance()->error_dark->foreground},
+        {{6 * 8 + 0, 10 * 16}, "antenna connector can", Theme::getInstance()->error_dark->foreground},
+        {{6 * 8 + 4, 11 * 16}, "accept a DC voltage!", Theme::getInstance()->error_dark->foreground}};

    Checkbox check_bias{
        {18, 12 * 16},
@@ -319,7 +320,7 @@ class SetUIView : public View {
        "Back button in menu"};

    Labels labels{
-        {{3 * 8, 13 * 16}, "Show/Hide Status Icons", Color::light_grey()},
+        {{3 * 8, 13 * 16}, "Show/Hide Status Icons", Theme::getInstance()->fg_light->foreground},
    };

    ImageToggle toggle_camera{
@@ -362,12 +363,8 @@ class SetUIView : public View {
        {19 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_icon_batt_text};

-    ImageToggle toggle_fake_brightness{
-        {21 * 8, 14 * 16 + 2, 16, 16},
-        &bitmap_icon_brightness};
-
    ImageToggle toggle_sd_card{
-        {23 * 8, 14 * 16 + 2, 16, 16},
+        {21 * 8, 14 * 16 + 2, 16, 16},
        &bitmap_sd_card_ok};

    Button button_save{
@@ -390,8 +387,8 @@ class SetSDCardView : public View {
   private:
    Labels labels{
        // 01234567890123456789012345678
-        {{1 * 8, 120 - 48}, "    HIGH SPEED SDCARD IO     ", Color::light_grey()},
-        {{1 * 8, 120 - 32}, "   May or may not work !!    ", Color::light_grey()}};
+        {{1 * 8, 120 - 48}, "    HIGH SPEED SDCARD IO     ", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 120 - 32}, "   May or may not work !!    ", Theme::getInstance()->fg_light->foreground}};

    Checkbox checkbox_sdcard_speed{
        {2 * 8, 120},
@@ -425,11 +422,11 @@ class SetConverterSettingsView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Options for working with", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "up/down converter hardware", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "like a Ham It Up.", Color::light_grey()},
-        {{2 * 8, 9 * 16 - 2}, "Conversion frequency:", Color::light_grey()},
-        {{18 * 8, 10 * 16}, "MHz", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Options for working with", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "up/down converter hardware", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "like a Ham It Up.", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 9 * 16 - 2}, "Conversion frequency:", Theme::getInstance()->fg_light->foreground},
+        {{18 * 8, 10 * 16}, "MHz", Theme::getInstance()->fg_light->foreground},
    };

    Checkbox check_show_converter{
@@ -469,13 +466,13 @@ class SetFrequencyCorrectionView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Frequency correction allows", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "RX and TX frequencies to be", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "adjusted for all apps.", Color::light_grey()},
-        {{2 * 8, 6 * 16}, "RX Adjustment Frequency", Color::light_grey()},
-        {{18 * 8, 7 * 16}, "MHz", Color::light_grey()},
-        {{2 * 8, 9 * 16}, "TX Adjustment Frequency", Color::light_grey()},
-        {{18 * 8, 10 * 16}, "MHz", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Frequency correction allows", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "RX and TX frequencies to be", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "adjusted for all apps.", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 6 * 16}, "RX Adjustment Frequency", Theme::getInstance()->fg_light->foreground},
+        {{18 * 8, 7 * 16}, "MHz", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 9 * 16}, "TX Adjustment Frequency", Theme::getInstance()->fg_light->foreground},
+        {{18 * 8, 10 * 16}, "MHz", Theme::getInstance()->fg_light->foreground},
    };

    OptionsField opt_rx_correction_mode{
@@ -512,14 +509,14 @@ class SetAudioView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Controls the volume of the", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "tone when transmitting in", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "Soundboard or Mic apps:", Color::light_grey()},
-        {{2 * 8, 5 * 16}, "Tone key mix:   %", Color::light_grey()},
-        {{1 * 8, 8 * 16}, "Controls whether apps should", Color::light_grey()},
-        {{1 * 8, 9 * 16}, "beep on speaker & headphone", Color::light_grey()},
-        {{1 * 8, 10 * 16}, "when a packet is received", Color::light_grey()},
-        {{1 * 8, 11 * 16}, "(not all apps support this):", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Controls the volume of the", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "tone when transmitting in", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "Soundboard or Mic apps:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 5 * 16}, "Tone key mix:   %", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 8 * 16}, "Controls whether apps should", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 9 * 16}, "beep on speaker & headphone", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 10 * 16}, "when a packet is received", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 11 * 16}, "(not all apps support this):", Theme::getInstance()->fg_light->foreground},
    };

    NumberField field_tone_mix{
@@ -554,8 +551,8 @@ class SetQRCodeView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Change the size of the QR", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "code shown in Radiosonde.", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Change the size of the QR", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "code shown in Radiosonde.", Theme::getInstance()->fg_light->foreground},
    };

    Checkbox checkbox_bigger_qr{
@@ -586,14 +583,14 @@ class SetEncoderDialView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Adjusts sensitivity to dial", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "rotation position (number of", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "steps per full rotation):", Color::light_grey()},
-        {{2 * 8, 5 * 16}, "Dial sensitivity:", Color::light_grey()},
-        {{1 * 8, 8 * 16}, "Adjusts sensitivity to dial", Color::light_grey()},
-        {{1 * 8, 9 * 16}, "rotation rate (default 1", Color::light_grey()},
-        {{1 * 8, 10 * 16}, "means no rate dependency):", Color::light_grey()},
-        {{3 * 8, 12 * 16}, "Rate multiplier:", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Adjusts sensitivity to dial", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "rotation position (number of", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "steps per full rotation):", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 5 * 16}, "Dial sensitivity:", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 8 * 16}, "Adjusts sensitivity to dial", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 9 * 16}, "rotation rate (default 1", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 10 * 16}, "means no rate dependency):", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 12 * 16}, "Rate multiplier:", Theme::getInstance()->fg_light->foreground},
    };

    OptionsField field_encoder_dial_sensitivity{
@@ -630,9 +627,9 @@ class SetPersistentMemoryView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Save persistent memory on SD", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "card. Needed when device has", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "dead/missing coin battery.", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Save persistent memory on SD", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "card. Needed when device has", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "dead/missing coin battery.", Theme::getInstance()->fg_light->foreground},
    };

    Text text_pmem_status{
@@ -672,7 +669,7 @@ class AppSettingsView : public View {
    NavigationView& nav_;

    Labels labels{
-        {{0, 4}, "Select file to edit:", Color::white()}};
+        {{0, 4}, "Select file to edit:", Theme::getInstance()->bg_darkest->foreground}};

    MenuView menu_view{
        {0, 2 * 8, 240, 26 * 8},
@@ -689,9 +686,9 @@ class SetConfigModeView : public View {

   private:
    Labels labels{
-        {{1 * 8, 1 * 16}, "Controls whether firmware", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "will enter Config Mode", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "after a boot failure.", Color::light_grey()},
+        {{1 * 8, 1 * 16}, "Controls whether firmware", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "will enter Config Mode", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "after a boot failure.", Theme::getInstance()->fg_light->foreground},
    };

    Checkbox checkbox_config_mode_enabled{
@@ -709,35 +706,19 @@ class SetConfigModeView : public View {
    };
 };

-using portapack::persistent_memory::fake_brightness_level_options;
-
-class SetFakeBrightnessView : public View {
+class SetDisplayView : public View {
   public:
-    SetFakeBrightnessView(NavigationView& nav);
+    SetDisplayView(NavigationView& nav);

    void focus() override;

-    std::string title() const override { return "Brightness"; };
+    std::string title() const override { return "Display"; };

   private:
-    Labels labels{
-        {{1 * 8, 1 * 16}, "Limits screen brightness", Color::light_grey()},
-        {{1 * 8, 2 * 16}, "(has a small performance", Color::light_grey()},
-        {{1 * 8, 3 * 16}, "impact when enabled).", Color::light_grey()},
-        {{2 * 8, 8 * 16}, "Brightness:", Color::light_grey()},
-    };
-
-    OptionsField field_fake_brightness{
-        {20 * 8, 8 * 16},
-        6,
-        {{"12.5%", fake_brightness_level_options::BRIGHTNESS_12p5},
-         {"25%", fake_brightness_level_options::BRIGHTNESS_25},
-         {"50%", fake_brightness_level_options::BRIGHTNESS_50}}};
-
-    Checkbox checkbox_brightness_switch{
-        {1 * 8, 5 * 16},
-        16,
-        "Enable brightness adjust"};
+    Checkbox checkbox_invert_switch{
+        {1 * 8, 2 * 16},
+        23,
+        "Invert colors (For IPS)"};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
@@ -749,6 +730,77 @@ class SetFakeBrightnessView : public View {
    };
 };

+using portapack::persistent_memory::touchscreen_threshold;
+
+class SetTouchscreenThresholdView : public View {
+   public:
+    SetTouchscreenThresholdView(NavigationView& nav);
+    ~SetTouchscreenThresholdView();
+
+    void focus() override;
+
+    std::string title() const override { return "Touch S"; };
+
+   private:
+    bool in_auto_detect = false;
+    uint16_t org_threshold = 0;
+    uint8_t auto_detect_succeed_consumed = false;  // prevent screen flash but can still change text content
+    uint32_t time_start_auto_detect = 0;
+
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Set touchscreen sensitivity", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "Or press auto detect button", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 3 * 16}, "FOLLOW INSTRUCTIONS", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 4 * 16}, "REBOOT TO APPLY", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 11 * 16}, "Threshold:", Theme::getInstance()->fg_light->foreground},
+    };
+
+    Text text_hint{
+        {1 * 8, 7 * 16, screen_width - 2 * 8, 1 * 16},
+        "DON'T TOUCH SCREEN"};
+
+    Text text_wait_timer{
+        {1 * 8, 8 * 16, screen_width - 2 * 8, 1 * 16},
+        "ETA 00:00"};
+
+    void on_frame_sync();
+
+    /* sample max: 1023 sample_t AKA uint16_t
+     * touch_sensitivity: range: 1 to 128
+     * threshold range: 1023/1 to 1023/128  =  1023 to 8
+     */
+    NumberField field_threshold{
+        {1 * 8 + 11 * 8 + 8, 11 * 16},
+        4,
+        {1, 1023},
+        1,
+        ' ',
+    };
+
+    Button button_autodetect{
+        {2 * 8, 13 * 16, 12 * 8, 32},
+        "Auto Detect"};
+    Button button_reset{
+        {16 * 8, 13 * 16, 12 * 8, 32},
+        "Reset",
+    };
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+
+    MessageHandlerRegistration message_handler_frame_sync{
+        Message::ID::DisplayFrameSync,
+        [this](const Message* const) {
+            this->on_frame_sync();
+        }};
+};
+
 class SetMenuColorView : public View {
   public:
    SetMenuColorView(NavigationView& nav);
@@ -761,10 +813,10 @@ class SetMenuColorView : public View {
    void paint_sample();

    Labels labels{
-        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Color::light_grey()},
-        {{2 * 8, 8 * 16}, "Red Level:", Color::light_grey()},
-        {{2 * 8, 9 * 16}, "Green Level:", Color::light_grey()},
-        {{2 * 8, 10 * 16}, "Blue Level:", Color::light_grey()},
+        {{3 * 8, 1 * 16}, "Menu Button Color Scheme", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 8 * 16}, "Red Level:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 9 * 16}, "Green Level:", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 10 * 16}, "Blue Level:", Theme::getInstance()->fg_light->foreground},
    };

    NewButton button_sample{
@@ -830,22 +882,103 @@ class SetAutostartView : public View {
        "nav"sv,
        {{"autostart_app"sv, &autostart_app}}};
    Labels labels{
-        {{1 * 8, 1 * 16}, "Select app to start on boot", Color::light_grey()},
-        {{2 * 8, 2 * 16}, "(an SD Card is required)", Color::light_grey()}};
+        {{1 * 8, 1 * 16}, "Select app to start on boot", Theme::getInstance()->fg_light->foreground},
+        {{2 * 8, 2 * 16}, "(an SD Card is required)", Theme::getInstance()->fg_light->foreground}};

    Button button_save{
        {2 * 8, 16 * 16, 12 * 8, 32},
        "Save"};

    OptionsField options{
-        {8 * 8, 4 * 16},
-        30,
-        {}};
+        {0 * 8, 4 * 16},
+        screen_width / 8,
+        {},
+        true};

    Button button_cancel{
        {16 * 8, 16 * 16, 12 * 8, 32},
        "Cancel",
    };
+
+    Button button_reset{
+        {2 * 8, 6 * 16, screen_width - 4 * 8, 32},
+        "Reset"};
+};
+
+class SetThemeView : public View {
+   public:
+    SetThemeView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Theme"; };
+
+   private:
+    int32_t selected = 0;
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Select a theme.", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "Restart PP to fully apply!", Theme::getInstance()->fg_light->foreground}};
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    OptionsField options{
+        {0 * 8, 4 * 16},
+        screen_width / 8,
+        {
+            {"Default - Grey", 0},
+            {"Yellow", 1},
+            {"Aqua", 2},
+            {"Green", 3},
+            {"Red", 4},
+        },
+        true};
+
+    Checkbox checkbox_menuset{
+        {2 * 8, 6 * 16},
+        23,
+        "Set Menu color too"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
+class SetBatteryView : public View {
+   public:
+    SetBatteryView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Battery"; };
+
+   private:
+    int32_t selected = 0;
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Override batt calculation", Theme::getInstance()->fg_light->foreground},
+        {{1 * 8, 2 * 16}, "method to voltage based", Theme::getInstance()->fg_light->foreground}};
+    Labels labels2{
+        {{1 * 8, 6 * 16}, "Reset IC's learned params.", Theme::getInstance()->fg_light->foreground}};
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    Checkbox checkbox_overridebatt{
+        {2 * 8, 4 * 16},
+        23,
+        "Override"};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+
+    Button button_reset{
+        {2 * 8, 8 * 16, 12 * 8, 32},
+        "Reset",
+    };
 };

 class SettingsMenuView : public BtnGridView {
@@ -56,17 +56,17 @@ SIGFRXView::~SIGFRXView() {
 void SIGFRXView::paint(Painter& painter) {
    uint8_t i, xp;

-    // portapack::display.drawBMP({0, 302-160}, fox_bmp);
-    portapack::display.fill_rectangle({0, 16, 240, 160 - 16}, ui::Color::white());
+    // portapack::display.draw_bmp_from_bmp_hex_arr({0, 302-160}, fox_bmp);
+    portapack::display.fill_rectangle({0, 16, 240, 160 - 16}, Theme::getInstance()->bg_darkest->foreground);
    for (i = 0; i < 6; i++) {
        xp = sigfrx_marks[i * 3];
        painter.draw_string({(ui::Coord)sigfrx_marks[(i * 3) + 1], 144 - 20}, style_white, to_string_dec_uint(sigfrx_marks[(i * 3) + 2]));
-        portapack::display.draw_line({xp, 144 - 4}, {xp, 144}, ui::Color::black());
+        portapack::display.draw_line({xp, 144 - 4}, {xp, 144}, Theme::getInstance()->bg_darkest->background);
    }
 }

 void SIGFRXView::on_channel_spectrum(const ChannelSpectrum& spectrum) {
-    portapack::display.fill_rectangle({0, 144, 240, 4}, ui::Color::white());
+    portapack::display.fill_rectangle({0, 144, 240, 4}, Theme::getInstance()->bg_darkest->foreground);

    uint8_t xmax = 0, imax = 0;
    size_t i;
@@ -97,7 +97,7 @@ void SIGFRXView::on_channel_spectrum(const ChannelSpectrum& spectrum) {

    last_channel = imax;

-    portapack::display.fill_rectangle({(ui::Coord)(imax - 2), 144, 4, 4}, ui::Color::red());
+    portapack::display.fill_rectangle({(ui::Coord)(imax - 2), 144, 4, 4}, Theme::getInstance()->fg_red->foreground);
 }

 void SIGFRXView::on_show() {
@@ -129,9 +129,9 @@ SIGFRXView::SIGFRXView(
                  &text_data,
                  &button_exit});

-    text_type.set_style(&Styles::bg_white);
-    text_channel.set_style(&Styles::bg_white);
-    text_data.set_style(&Styles::bg_white);
+    text_type.set_style(Theme::getInstance()->bg_lightest);
+    text_channel.set_style(Theme::getInstance()->bg_lightest);
+    text_data.set_style(Theme::getInstance()->bg_lightest);

    button_exit.on_select = [&nav](Button&) {
        nav.pop();
@@ -24,7 +24,6 @@
 #include "ui_widget.hpp"
 #include "ui_painter.hpp"
 #include "ui_menu.hpp"
-#include "ui_styles.hpp"
 #include "ui_navigation.hpp"
 #include "clock_manager.hpp"
 #include "message.hpp"
@@ -72,15 +72,15 @@ class SigGenView : public View {
    bool auto_update{false};

    Labels labels{
-        {{3 * 8, 4 + 10}, "Shape:", Color::light_grey()},
-        {{6 * 8, 7 * 8}, "Tone:      Hz", Color::light_grey()},
-        {{22 * 8, 15 * 8 + 4}, "s.", Color::light_grey()},
-        {{8 * 8, 20 * 8}, "Modulation: FM", Color::light_grey()}};
+        {{3 * 8, 4 + 10}, "Shape:", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 7 * 8}, "Tone:      Hz", Theme::getInstance()->fg_light->foreground},
+        {{22 * 8, 15 * 8 + 4}, "s.", Theme::getInstance()->fg_light->foreground},
+        {{8 * 8, 20 * 8}, "Modulation: FM", Theme::getInstance()->fg_light->foreground}};

    ImageOptionsField options_shape{
        {10 * 8, 4, 32, 32},
-        Color::white(),
-        Color::black(),
+        Theme::getInstance()->bg_darkest->foreground,
+        Theme::getInstance()->bg_darkest->background,
        {{&bitmap_sig_cw, 0},
         {&bitmap_sig_sine, 1},
         {&bitmap_sig_tri, 2},
@@ -187,4 +187,8 @@ void SondeView::on_packet(const sonde::Packet& packet) {
    }
 }

+void SondeView::on_freqchg(int64_t freq) {
+    field_frequency.set_value(freq);
+}
+
 } /* namespace ui */
@@ -94,14 +94,14 @@ class SondeView : public View {
    // AudioOutput audio_output { };

    Labels labels{
-        {{4 * 8, 2 * 16}, "Type:", Color::light_grey()},
-        {{6 * 8, 3 * 16}, "ID:", Color::light_grey()},
-        {{0 * 8, 4 * 16}, "DateTime:", Color::light_grey()},
+        {{4 * 8, 2 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
+        {{6 * 8, 3 * 16}, "ID:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 4 * 16}, "DateTime:", Theme::getInstance()->fg_light->foreground},

-        {{3 * 8, 5 * 16}, "Vbatt:", Color::light_grey()},
-        {{3 * 8, 6 * 16}, "Frame:", Color::light_grey()},
-        {{4 * 8, 7 * 16}, "Temp:", Color::light_grey()},
-        {{0 * 8, 8 * 16}, "Humidity:", Color::light_grey()}};
+        {{3 * 8, 5 * 16}, "Vbatt:", Theme::getInstance()->fg_light->foreground},
+        {{3 * 8, 6 * 16}, "Frame:", Theme::getInstance()->fg_light->foreground},
+        {{4 * 8, 7 * 16}, "Temp:", Theme::getInstance()->fg_light->foreground},
+        {{0 * 8, 8 * 16}, "Humidity:", Theme::getInstance()->fg_light->foreground}};

    RxFrequencyField field_frequency{
        {0 * 8, 0 * 8},
@@ -195,6 +195,14 @@ class SondeView : public View {
            const auto message = static_cast<const OrientationDataMessage*>(p);
            this->on_orientation(message);
        }};
+    MessageHandlerRegistration message_handler_freqchg{
+        Message::ID::FreqChangeCommand,
+        [this](Message* const p) {
+            const auto message = static_cast<const FreqChangeCommandMessage*>(p);
+            this->on_freqchg(message->freq);
+        }};
+
+    void on_freqchg(int64_t freq);

    void on_gps(const GPSPosDataMessage* msg);
    void on_orientation(const OrientationDataMessage* msg);
@@ -48,12 +48,12 @@ void ScreenshotViewer::paint(Painter& painter) {
    painter.fill_rectangle({0, 0, screen_width, screen_height}, Color::black());

    auto show_invalid = [&]() {
-        painter.draw_string({10, 160}, Styles::white, "Not a valid screenshot.");
+        painter.draw_string({10, 160}, *Theme::getInstance()->bg_darkest, "Not a valid screenshot.");
    };

    auto error = file.open(path_);
    if (error) {
-        painter.draw_string({10, 160}, Styles::white, error->what());
+        painter.draw_string({10, 160}, *Theme::getInstance()->bg_darkest, error->what());
        return;
    }

@@ -119,14 +119,14 @@ bool SplashViewer::on_key(const KeyEvent key) {
 void SplashViewer::paint(Painter& painter) {
    painter.fill_rectangle({0, 0, screen_width, screen_height}, Color::black());

-    if (!portapack::display.drawBMP2({0, 0}, path_)) {
-        painter.draw_string({10, 160}, Styles::white, "Not a valid splash image.");
+    if (!portapack::display.draw_bmp_from_sdcard_file({0, 0}, path_)) {
+        painter.draw_string({10, 160}, *Theme::getInstance()->bg_darkest, "Not a valid splash image.");
        return;
    }

    // Show option to set splash screen if it's not already the splash screen
    if (!path_iequal(path_, splash_dot_bmp)) {
-        painter.draw_string({0, 0}, Styles::white, "*RIGHT BUTTON UPDATES SPLASH*");
+        painter.draw_string({0, 0}, *Theme::getInstance()->bg_darkest, "*RIGHT BUTTON UPDATES SPLASH*");
        valid_image = true;
    }
 }
@@ -26,7 +26,6 @@
 #include "ui.hpp"
 #include "ui_navigation.hpp"
 #include "ui_painter.hpp"
-#include "ui_styles.hpp"
 #include "ui_widget.hpp"
 #include "file.hpp"

@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2024 Bernd Herzog
+ *
+ * This file is part of PortaPack.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ui_standalone_view.hpp"
+#include "irq_controls.hpp"
+
+#include "i2cdevmanager.hpp"
+#include "i2cdev_ppmod.hpp"
+
+#include "ui_font_fixed_5x8.hpp"
+#include "ui_font_fixed_8x16.hpp"
+
+namespace ui {
+
+void create_thread(int32_t (*fn)(void*), void* arg, size_t stack_size, int priority) {
+    // TODO: collect memory on terminate, once this is used
+    chThdCreateFromHeap(NULL, stack_size, priority, fn, arg);
+}
+
+void fill_rectangle(int x, int y, int width, int height, uint16_t color) {
+    ui::Painter painter;
+    painter.fill_rectangle({x, y, width, height}, ui::Color(color));
+}
+
+void fill_rectangle_unrolled8(int x, int y, int width, int height, uint16_t color) {
+    ui::Painter painter;
+    painter.fill_rectangle_unrolled8({x, y, width, height}, ui::Color(color));
+}
+
+void draw_bitmap(int x, int y, int width, int height, const uint8_t* pixels, uint16_t foreground, uint16_t background) {
+    ui::Painter painter;
+    painter.draw_bitmap({x, y}, {{width, height}, pixels}, ui::Color(foreground), ui::Color(background));
+}
+
+void* alloc(size_t size) {
+    void* p = chHeapAlloc(0x0, size);
+    if (p == nullptr)
+        chDbgPanic("Out of Memory");
+    return p;
+}
+
+uint64_t get_switches_state_ulong() {
+    return get_switches_state().to_ulong();
+}
+
+ui::Coord scroll_area_y(const ui::Coord y) {
+    return portapack::display.scroll_area_y(y);
+}
+
+void scroll_set_area(const ui::Coord top_y, const ui::Coord bottom_y) {
+    portapack::display.scroll_set_area(top_y, bottom_y);
+}
+
+void scroll_disable() {
+    portapack::display.scroll_disable();
+}
+
+ui::Coord scroll_set_position(const ui::Coord position) {
+    return portapack::display.scroll_set_position(position);
+}
+
+ui::Coord scroll(const int32_t delta) {
+    return portapack::display.scroll(delta);
+}
+
+bool i2c_read(uint8_t* cmd, size_t cmd_len, uint8_t* data, size_t data_len) {
+    auto dev = (i2cdev::I2cDev_PPmod*)i2cdev::I2CDevManager::get_dev_by_model(I2C_DEVMDL::I2CDECMDL_PPMOD);
+    if (!dev) {
+        return false;
+    }
+
+    if (data_len == 0 || data == nullptr)
+        return dev->i2c_write(nullptr, 0, cmd, cmd_len);
+
+    return dev->i2c_read(cmd, cmd_len, data, data_len);
+}
+
+StandaloneView* standaloneView = nullptr;
+
+void set_dirty() {
+    if (standaloneView != nullptr)
+        standaloneView->set_dirty();
+}
+
+standalone_application_api_t api = {
+    /* .malloc = */ &alloc,
+    /* .calloc = */ &calloc,
+    /* .realloc = */ &realloc,
+    /* .free = */ &chHeapFree,
+    /* .create_thread = */ &create_thread,
+    /* .fill_rectangle = */ &fill_rectangle,
+    /* .swizzled_switches = */ &swizzled_switches,
+    /* .get_switches_state = */ &get_switches_state_ulong,
+    /* .fixed_5x8_glyph_data = */ ui::font::fixed_5x8.get_data(),
+    /* .fixed_8x16_glyph_data = */ ui::font::fixed_8x16.get_data(),
+    /* .fill_rectangle_unrolled8 = */ &fill_rectangle_unrolled8,
+    /* .draw_bitmap = */ &draw_bitmap,
+    /* .scroll_area_y = */ &scroll_area_y,
+    /* .scroll_set_area = */ &scroll_set_area,
+    /* .scroll_disable = */ &scroll_disable,
+    /* .scroll_set_position = */ &scroll_set_position,
+    /* .scroll = */ &scroll,
+    /* .i2c_read = */ &i2c_read,
+    /* .panic = */ &chDbgPanic,
+    /* .set_dirty = */ &set_dirty,
+};
+
+StandaloneView::StandaloneView(NavigationView& nav, uint8_t* app_image)
+    : nav_(nav),
+      _app_image(*app_image) {
+    if (app_image == nullptr) {
+        chDbgPanic("Invalid application image");
+    }
+
+    set_focusable(true);
+
+    standaloneView = this;
+}
+
+void StandaloneView::focus() {
+    View::focus();
+}
+
+void StandaloneView::paint(Painter& painter) {
+    (void)painter;
+
+    if (initialized &&
+        get_application_information()->header_version > 1) {
+        get_application_information()->PaintViewMirror();
+    }
+}
+
+void StandaloneView::on_focus() {
+    if (get_application_information()->header_version > 1) {
+        get_application_information()->OnFocus();
+    }
+}
+
+bool StandaloneView::on_key(const KeyEvent key) {
+    if (get_application_information()->header_version > 1) {
+        return get_application_information()->OnKeyEvent((uint8_t)key);
+    }
+
+    return false;
+}
+
+bool StandaloneView::on_encoder(const EncoderEvent event) {
+    if (get_application_information()->header_version > 1) {
+        return get_application_information()->OnEncoder((int32_t)event);
+    }
+    return false;
+}
+
+bool StandaloneView::on_touch(const TouchEvent event) {
+    if (get_application_information()->header_version > 1) {
+        get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type);
+    }
+    return true;
+}
+
+bool StandaloneView::on_keyboard(const KeyboardEvent event) {
+    if (get_application_information()->header_version > 1) {
+        return get_application_information()->OnKeyboard((uint8_t)event);
+    }
+    return false;
+}
+
+void StandaloneView::frame_sync() {
+    // skip first refresh
+    if (!initialized) {
+        initialized = true;
+    } else {
+        get_application_information()->on_event(1);
+    }
+}
+
+void StandaloneView::on_after_attach() {
+    context().focus_manager().setMirror(this);
+    get_application_information()->initialize(api);
+}
+
+void StandaloneView::on_before_detach() {
+    get_application_information()->shutdown();
+    context().focus_manager().clearMirror();
+}
+
+}  // namespace ui
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Bernd Herzog
+ * Copyright (C) 2024 Bernd Herzog
 *
 * This file is part of PortaPack.
 *
@@ -19,33 +19,45 @@
 * Boston, MA 02110-1301, USA.
 */

-#ifndef __UI_PACMAN_H__
-#define __UI_PACMAN_H__
+#ifndef __UI_STANDALONE_VIEW_H__
+#define __UI_STANDALONE_VIEW_H__

 #include "ui_navigation.hpp"
 #include "event_m0.hpp"
 #include "message.hpp"
+#include "standalone_app.hpp"

-namespace ui::external_app::pacman {
+namespace ui {

-class PacmanView : public View {
+class StandaloneView : public View {
   public:
-    PacmanView(NavigationView& nav);
+    StandaloneView(NavigationView& nav, uint8_t* app_image);
+    virtual ~StandaloneView() override {
+    }
+
+    std::string title() const override { return (const char*)get_application_information()->app_name; };

    void focus() override;
-
-    std::string title() const override { return "Pac-Man"; };
-
    void paint(Painter& painter) override;
+
+    void on_focus() override;
+    bool on_key(const KeyEvent key) override;
+    bool on_encoder(const EncoderEvent event) override;
+    bool on_touch(const TouchEvent event) override;
+    bool on_keyboard(const KeyboardEvent event) override;
+
+    void on_after_attach() override;
+    void on_before_detach() override;
+
    void frame_sync();

   private:
    bool initialized = false;
    NavigationView& nav_;
-
-    Button dummy{
-        {240, 0, 0, 0},
-        ""};
+    uint8_t& _app_image;
+    standalone_application_information_t* get_application_information() const {
+        return reinterpret_cast<standalone_application_information_t*>(&_app_image);
+    }

    MessageHandlerRegistration message_handler_sample{
        Message::ID::DisplayFrameSync,
@@ -54,6 +66,6 @@ class PacmanView : public View {
        }};
 };

-}  // namespace ui::external_app::pacman
+}  // namespace ui

-#endif /*__UI_PACMAN_H__*/
+#endif /*__UI_STANDALONE_VIEW_H__*/
--- a/Show More
+++ b/Show More