diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
new file mode 100644
index 00000000..e3af3aaf
--- /dev/null
+++ b/.github/workflows/run-unit-tests.yml
@@ -0,0 +1,31 @@
+name: Run Unit Tests
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Run Unit Tests
+        run: pio test -e native -vv
+
+      - name: Upload Test Results
+        # Upload test results even if the test step failed.
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: .pio/build/native/
diff --git a/arch/nrf52/extra_scripts/patch_bluefruit.py b/arch/nrf52/extra_scripts/patch_bluefruit.py
deleted file mode 100644
index b43bffb5..00000000
--- a/arch/nrf52/extra_scripts/patch_bluefruit.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-Bluefruit BLE Patch Script
-
-Patches Bluefruit library to fix semaphore leak bug that causes device lockup
-when BLE central disconnects unexpectedly (e.g., going out of range, supervision timeout).
-
-Patches applied:
-1. BLEConnection.h: Add _hvn_qsize member to track semaphore queue size
-2. BLEConnection.cpp: Store hvn_qsize and restore semaphore on disconnect
-
-Bug description:
-- When a BLE central disconnects unexpectedly (reason=8 supervision timeout),
-  the BLE_GATTS_EVT_HVN_TX_COMPLETE event may never fire
-- This leaves the _hvn_sem counting semaphore in a decremented state
-- Since BLEConnection objects are reused (destructor never called), the
-  semaphore count is never restored
-- Eventually all semaphore counts are exhausted and notify() blocks/fails
-
-"""
-
-from pathlib import Path
-
-Import("env")  # pylint: disable=undefined-variable
-
-
-def _patch_ble_connection_header(source: Path) -> bool:
-    """
-    Add _hvn_qsize member variable to BLEConnection class.
-    
-    This is needed to restore the semaphore to its correct count on disconnect.
-    
-    Returns True if patch was applied or already applied, False on error.
-    """
-    try:
-        content = source.read_text()
-        
-        # Check if already patched
-        if "_hvn_qsize" in content:
-            return True  # Already patched
-        
-        # Find the location to insert - after _phy declaration
-        original_pattern = '''    uint8_t  _phy;
-
-    uint8_t  _role;'''
-        
-        patched_pattern = '''    uint8_t  _phy;
-    uint8_t  _hvn_qsize;
-
-    uint8_t  _role;'''
-        
-        if original_pattern not in content:
-            print("Bluefruit patch: WARNING - BLEConnection.h pattern not found")
-            return False
-        
-        content = content.replace(original_pattern, patched_pattern)
-        source.write_text(content)
-        
-        # Verify
-        if "_hvn_qsize" not in source.read_text():
-            return False
-        
-        return True
-    except Exception as e:
-        print(f"Bluefruit patch: ERROR patching BLEConnection.h: {e}")
-        return False
-
-
-def _patch_ble_connection_source(source: Path) -> bool:
-    """
-    Patch BLEConnection.cpp to:
-    1. Store hvn_qsize in constructor
-    2. Restore _hvn_sem semaphore to full count on disconnect
-    
-    Returns True if patch was applied or already applied, False on error.
-    """
-    try:
-        content = source.read_text()
-        
-        # Check if already patched (look for the restore loop)
-        if "uxSemaphoreGetCount(_hvn_sem)" in content:
-            return True  # Already patched
-        
-        # Patch 1: Store queue size in constructor
-        constructor_original = '''  _hvn_sem   = xSemaphoreCreateCounting(hvn_qsize, hvn_qsize);'''
-        
-        constructor_patched = '''  _hvn_qsize = hvn_qsize;
-  _hvn_sem   = xSemaphoreCreateCounting(hvn_qsize, hvn_qsize);'''
-        
-        if constructor_original not in content:
-            print("Bluefruit patch: WARNING - BLEConnection.cpp constructor pattern not found")
-            return False
-        
-        content = content.replace(constructor_original, constructor_patched)
-        
-        # Patch 2: Restore semaphore on disconnect
-        disconnect_original = '''    case BLE_GAP_EVT_DISCONNECTED:
-      // mark as disconnected
-      _connected = false;
-    break;'''
-        
-        disconnect_patched = '''    case BLE_GAP_EVT_DISCONNECTED:
-      // Restore notification semaphore to full count
-      // This fixes lockup when disconnect occurs with notifications in flight
-      while (uxSemaphoreGetCount(_hvn_sem) < _hvn_qsize) {
-        xSemaphoreGive(_hvn_sem);
-      }
-      // Release indication semaphore if waiting
-      if (_hvc_sem) {
-        _hvc_received = false;
-        xSemaphoreGive(_hvc_sem);
-      }
-      // mark as disconnected
-      _connected = false;
-    break;'''
-        
-        if disconnect_original not in content:
-            print("Bluefruit patch: WARNING - BLEConnection.cpp disconnect pattern not found")
-            return False
-        
-        content = content.replace(disconnect_original, disconnect_patched)
-        source.write_text(content)
-        
-        # Verify
-        verify_content = source.read_text()
-        if "uxSemaphoreGetCount(_hvn_sem)" not in verify_content:
-            return False
-        if "_hvn_qsize = hvn_qsize" not in verify_content:
-            return False
-        
-        return True
-    except Exception as e:
-        print(f"Bluefruit patch: ERROR patching BLEConnection.cpp: {e}")
-        return False
-
-
-def _apply_bluefruit_patches(target, source, env):  # pylint: disable=unused-argument
-    framework_path = env.get("PLATFORMFW_DIR")
-    if not framework_path:
-        framework_path = env.PioPlatform().get_package_dir("framework-arduinoadafruitnrf52")
-
-    if not framework_path:
-        print("Bluefruit patch: ERROR - framework directory not found")
-        env.Exit(1)
-        return
-
-    framework_dir = Path(framework_path)
-    bluefruit_lib = framework_dir / "libraries" / "Bluefruit52Lib" / "src"
-    patch_failed = False
-    
-    # Patch BLEConnection.h
-    conn_header = bluefruit_lib / "BLEConnection.h"
-    if conn_header.exists():
-        before = conn_header.read_text()
-        success = _patch_ble_connection_header(conn_header)
-        after = conn_header.read_text()
-        
-        if success:
-            if before != after:
-                print("Bluefruit patch: OK - Applied BLEConnection.h fix (added _hvn_qsize member)")
-            else:
-                print("Bluefruit patch: OK - BLEConnection.h already patched")
-        else:
-            print("Bluefruit patch: FAILED - BLEConnection.h")
-            patch_failed = True
-    else:
-        print(f"Bluefruit patch: ERROR - BLEConnection.h not found at {conn_header}")
-        patch_failed = True
-    
-    # Patch BLEConnection.cpp
-    conn_source = bluefruit_lib / "BLEConnection.cpp"
-    if conn_source.exists():
-        before = conn_source.read_text()
-        success = _patch_ble_connection_source(conn_source)
-        after = conn_source.read_text()
-        
-        if success:
-            if before != after:
-                print("Bluefruit patch: OK - Applied BLEConnection.cpp fix (restore semaphore on disconnect)")
-            else:
-                print("Bluefruit patch: OK - BLEConnection.cpp already patched")
-        else:
-            print("Bluefruit patch: FAILED - BLEConnection.cpp")
-            patch_failed = True
-    else:
-        print(f"Bluefruit patch: ERROR - BLEConnection.cpp not found at {conn_source}")
-        patch_failed = True
-    
-    if patch_failed:
-        print("Bluefruit patch: CRITICAL - Patch failed! Build aborted.")
-        env.Exit(1)
-
-
-# Register the patch to run before build
-bluefruit_action = env.VerboseAction(_apply_bluefruit_patches, "Applying Bluefruit BLE patches...")
-env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", bluefruit_action)
-
-# Also run immediately to patch before any compilation
-_apply_bluefruit_patches(None, None, env)
diff --git a/boards/t-echo.json b/boards/t-echo.json
index c974ca65..e0df6eac 100644
--- a/boards/t-echo.json
+++ b/boards/t-echo.json
@@ -53,11 +53,14 @@
     "protocols": [
       "jlink",
       "nrfjprog",
+      "nrfutil",
       "stlink",
       "cmsis-dap",
       "blackmagic"
-    ]
+    ],
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
   },
   "url": "https://os.mbed.com/platforms/Nordic-nRF52840-DK/",
   "vendor": "Nordic"
-}
\ No newline at end of file
+}
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index f5370b98..85135e04 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -126,7 +126,9 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 
 **Parameters:**
 
-- `pubkey_prefix`: The public key of the node to remove from the neighbors list
+- `pubkey_prefix`: The public key of the node to remove from the neighbors list. This can be a short prefix or the full key. All neighbors matching the provided prefix will be removed.
+
+**Note:** You can remove all neighbors by sending a space character as the prefix. The space indicates an empty prefix, which matches all existing neighbors.
 
 ---
 
@@ -543,7 +545,7 @@ If `noise_floor` reports `0`, check `get agc.reset.interval`. If it is not `0`,
 
 **Note:** the 'path.hash.mode' sets the low-level ID/hash encoding size used when the repeater adverts. This setting has no impact on what packet ID/hash size this repeater forwards, all sizes should be forwarded on firmware >= 1.14. This feature was added in firmware 1.14
 
-**Temporary Note:** adverts with ID/hash sizes of 2 or 3 bytes may have limited flood propogation in your network while this feature is new as v1.13.0 firmware and older will drop packets with multibyte path ID/hashes as only 1-byte hashes are suppored. Consider your install base of firmware >=1.14 has reached a criticality for effective network flooding before implementing higher ID/hash sizes.
+**Temporary Note:** adverts with ID/hash sizes of 2 or 3 bytes may have limited flood propagation in your network while this feature is new as v1.13.0 firmware and older will drop packets with multibyte path ID/hashes as only 1-byte hashes are supported. Consider your install base of firmware >=1.14 has reached a criticality for effective network flooding before implementing higher ID/hash sizes.
 
 ---
 
@@ -1115,7 +1117,7 @@ region save
 
 ---
 
-#### View or change thevalue of a sensor
+#### View or change the value of a sensor
 
 **Usage:**
 
diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 64c79a1f..0bfa8e7b 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -1031,8 +1031,8 @@ void MyMesh::begin(bool has_display) {
   addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
   _store->loadChannels(this);
 
-  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
-  radio_set_tx_power(_prefs.tx_power_dbm);
+  radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+  radio_driver.setTxPower(_prefs.tx_power_dbm);
   radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
   MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
                      radio_driver.getRxBoostedGainMode() ? "Enabled" : "Disabled");
@@ -1454,7 +1454,7 @@ void MyMesh::handleCmdFrame(size_t len) {
       _prefs.client_repeat = repeat;
       savePrefs();
 
-      radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+      radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
       MESH_DEBUG_PRINTLN("OK: CMD_SET_RADIO_PARAMS: f=%d, bw=%d, sf=%d, cr=%d", freq, bw, (uint32_t)sf,
                          (uint32_t)cr);
 
@@ -1471,7 +1471,7 @@ void MyMesh::handleCmdFrame(size_t len) {
     } else {
       _prefs.tx_power_dbm = power;
       savePrefs();
-      radio_set_tx_power(_prefs.tx_power_dbm);
+      radio_driver.setTxPower(_prefs.tx_power_dbm);
       writeOKFrame();
     }
   } else if (cmd_frame[0] == CMD_SET_TUNING_PARAMS) {
diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp
index b7bcb6d0..17e73f71 100644
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -125,7 +125,7 @@ void setup() {
 
   if (!radio_init()) { halt(); }
 
-  fast_rng.begin(radio_get_rng_seed());
+  fast_rng.begin(radio_driver.getRngSeed());
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   InternalFS.begin();
diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp
index 94a8ee3e..6f363d7f 100644
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -57,13 +57,21 @@ public:
     int logoWidth = 128;
     display.drawXbm((display.width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
+    // meshcore website
+    const char* website = "https://meshcore.io";
+    display.setColor(DisplayDriver::LIGHT);
+    display.setTextSize(1);
+    uint16_t websiteWidth = display.getTextWidth(website);
+    display.setCursor((display.width() - websiteWidth) / 2, 22);
+    display.print(website);
+
     // version info
     display.setColor(DisplayDriver::LIGHT);
-    display.setTextSize(2);
-    display.drawTextCentered(display.width()/2, 22, _version_info);
+    display.setTextSize(1);
+    display.drawTextCentered(display.width()/2, 35, _version_info);
 
     display.setTextSize(1);
-    display.drawTextCentered(display.width()/2, 42, FIRMWARE_BUILD_DATE);
+    display.drawTextCentered(display.width()/2, 48, FIRMWARE_BUILD_DATE);
 
     return 1000;
   }
@@ -146,7 +154,7 @@ class HomeScreen : public UIScreen {
   bool sensors_scroll = false;
   int sensors_scroll_offset = 0;
   int next_sensors_refresh = 0;
-  
+
   void refresh_sensors() {
     if (millis() > next_sensors_refresh) {
       sensors_lpp.reset();
@@ -170,7 +178,7 @@ class HomeScreen : public UIScreen {
 
 public:
   HomeScreen(UITask* task, mesh::RTCClock* rtc, SensorManager* sensors, NodePrefs* node_prefs)
-     : _task(task), _rtc(rtc), _sensors(sensors), _node_prefs(node_prefs), _page(0), 
+     : _task(task), _rtc(rtc), _sensors(sensors), _node_prefs(node_prefs), _page(0),
        _shutdown_init(false), sensors_lpp(200) {  }
 
   void poll() override {
@@ -213,7 +221,7 @@ public:
         IPAddress ip = WiFi.localIP();
         snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
         display.setTextSize(1);
-        display.drawTextCentered(display.width() / 2, 54, tmp); 
+        display.drawTextCentered(display.width() / 2, 54, tmp);
       #endif
       if (_task->hasConnection()) {
         display.setColor(DisplayDriver::GREEN);
@@ -241,10 +249,10 @@ public:
         } else {
           sprintf(tmp, "%dh", secs / (60*60));
         }
-        
+
         int timestamp_width = display.getTextWidth(tmp);
         int max_name_width = display.width() - timestamp_width - 1;
-        
+
         char filtered_recent_name[sizeof(a->name)];
         display.translateUTF8ToBlocks(filtered_recent_name, a->name, sizeof(filtered_recent_name));
         display.drawTextEllipsized(0, y, max_name_width, filtered_recent_name);
@@ -310,7 +318,7 @@ public:
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
         display.drawTextLeftAlign(0, y, "pos");
-        sprintf(buf, "%.4f %.4f", 
+        sprintf(buf, "%.4f %.4f",
           nmea->getLatitude()/1000000., nmea->getLongitude()/1000000.);
         display.drawTextRightAlign(display.width()-1, y, buf);
         y = y + 12;
@@ -567,6 +575,7 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
 #ifdef PIN_BUZZER
   buzzer.begin();
   buzzer.quiet(_node_prefs->buzzer_quiet);
+  buzzer.startup();
 #endif
 
 #ifdef PIN_VIBRATION
@@ -741,7 +750,7 @@ void UITask::loop() {
 #endif
 #if defined(PIN_USER_BTN_ANA)
   if (abs(millis() - _analogue_pin_read_millis) > 10) {
-    ev = analog_btn.check();
+    int ev = analog_btn.check();
     if (ev == BUTTON_EVENT_CLICK) {
       c = checkDisplayOn(KEY_NEXT);
     } else if (ev == BUTTON_EVENT_LONG_PRESS) {
@@ -878,7 +887,7 @@ bool UITask::getGPSState() {
         return !strcmp(_sensors->getSettingValue(i), "1");
       }
     }
-  } 
+  }
   return false;
 }
 
diff --git a/examples/companion_radio/ui-orig/UITask.cpp b/examples/companion_radio/ui-orig/UITask.cpp
index 3ad36fb0..12a374d9 100644
--- a/examples/companion_radio/ui-orig/UITask.cpp
+++ b/examples/companion_radio/ui-orig/UITask.cpp
@@ -57,6 +57,7 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
 #ifdef PIN_BUZZER
   buzzer.begin();
   buzzer.quiet(_node_prefs->buzzer_quiet);
+  buzzer.startup();
 #endif
 
   // Initialize digital button if available
diff --git a/examples/kiss_modem/main.cpp b/examples/kiss_modem/main.cpp
index 35079592..e497aa98 100644
--- a/examples/kiss_modem/main.cpp
+++ b/examples/kiss_modem/main.cpp
@@ -10,7 +10,10 @@
   #include <LittleFS.h>
 #elif defined(ESP32)
   #include <SPIFFS.h>
+#else
+  #include <InternalFileSystem.h>
 #endif
+
 #if defined(KISS_UART_RX) && defined(KISS_UART_TX)
   #include <HardwareSerial.h>
 #endif
@@ -29,7 +32,7 @@ void halt() {
 }
 
 void loadOrCreateIdentity() {
-#if defined(NRF52_PLATFORM)
+#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
   InternalFS.begin();
   IdentityStore store(InternalFS, "");
 #elif defined(ESP32)
@@ -53,11 +56,11 @@ void loadOrCreateIdentity() {
 }
 
 void onSetRadio(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio_set_params(freq, bw, sf, cr);
+  radio_driver.setParams(freq, bw, sf, cr);
 }
 
 void onSetTxPower(uint8_t power) {
-  radio_set_tx_power(power);
+  radio_driver.setTxPower(power);
 }
 
 float onGetCurrentRssi() {
@@ -79,7 +82,7 @@ void setup() {
 
   radio_driver.begin();
 
-  rng.begin(radio_get_rng_seed());
+  rng.begin(radio_driver.getRngSeed());
   loadOrCreateIdentity();
 
   sensors.begin();
diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 5df5387b..150fac41 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -1348,8 +1348,8 @@ void MyMesh::begin(FILESYSTEM *fs, ArchiveStorage* archive) {
   mqtt.begin(_fs);
 #endif
 
-  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
-  radio_set_tx_power(_prefs.tx_power_dbm);
+  radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+  radio_driver.setTxPower(_prefs.tx_power_dbm);
 
   radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
   MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
@@ -1464,7 +1464,7 @@ void MyMesh::dumpLogFile() {
 }
 
 void MyMesh::setTxPower(int8_t power_dbm) {
-  radio_set_tx_power(power_dbm);
+  radio_driver.setTxPower(power_dbm);
 }
 
 #if defined(USE_SX1262) || defined(USE_SX1268)
@@ -2774,13 +2774,13 @@ void MyMesh::loop() {
 
   if (set_radio_at && millisHasNowPassed(set_radio_at)) { // apply pending (temporary) radio params
     set_radio_at = 0;                                     // clear timer
-    radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
+    radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
     MESH_DEBUG_PRINTLN("Temp radio params");
   }
 
   if (revert_radio_at && millisHasNowPassed(revert_radio_at)) { // revert radio params to orig
     revert_radio_at = 0;                                        // clear timer
-    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
     MESH_DEBUG_PRINTLN("Radio params restored");
   }
 
diff --git a/examples/simple_repeater/UITask.cpp b/examples/simple_repeater/UITask.cpp
index 631f9f0a..6895207a 100644
--- a/examples/simple_repeater/UITask.cpp
+++ b/examples/simple_repeater/UITask.cpp
@@ -53,17 +53,25 @@ void UITask::renderCurrScreen() {
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
+    // meshcore website
+    const char* website = "https://meshcore.io";
+    _display->setColor(DisplayDriver::LIGHT);
+    _display->setTextSize(1);
+    uint16_t websiteWidth = _display->getTextWidth(website);
+    _display->setCursor((_display->width() - websiteWidth) / 2, 22);
+    _display->print(website);
+
     // version info
     _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     uint16_t versionWidth = _display->getTextWidth(_version_info);
-    _display->setCursor((_display->width() - versionWidth) / 2, 22);
+    _display->setCursor((_display->width() - versionWidth) / 2, 35);
     _display->print(_version_info);
 
     // node type
     const char* node_type = "< Repeater >";
     uint16_t typeWidth = _display->getTextWidth(node_type);
-    _display->setCursor((_display->width() - typeWidth) / 2, 35);
+    _display->setCursor((_display->width() - typeWidth) / 2, 48);
     _display->print(node_type);
   } else {  // home screen
     // node name
diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp
index 490b2a59..11cebaf1 100644
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -60,7 +60,7 @@ void setup() {
     halt();
   }
 
-  fast_rng.begin(radio_get_rng_seed());
+  fast_rng.begin(radio_driver.getRngSeed());
 
   FILESYSTEM* fs;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
index 88cc5570..788cf036 100644
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -691,8 +691,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
     }
   }
 
-  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
-  radio_set_tx_power(_prefs.tx_power_dbm);
+  radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+  radio_driver.setTxPower(_prefs.tx_power_dbm);
 
   updateAdvertTimer();
   updateFloodAdvertTimer();
@@ -796,7 +796,7 @@ void MyMesh::dumpLogFile() {
 }
 
 void MyMesh::setTxPower(int8_t power_dbm) {
-  radio_set_tx_power(power_dbm);
+  radio_driver.setTxPower(power_dbm);
 }
 
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
@@ -1003,13 +1003,13 @@ void MyMesh::loop() {
 
   if (set_radio_at && millisHasNowPassed(set_radio_at)) { // apply pending (temporary) radio params
     set_radio_at = 0;                                     // clear timer
-    radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
+    radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
     MESH_DEBUG_PRINTLN("Temp radio params");
   }
 
   if (revert_radio_at && millisHasNowPassed(revert_radio_at)) { // revert radio params to orig
     revert_radio_at = 0;                                        // clear timer
-    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
     MESH_DEBUG_PRINTLN("Radio params restored");
   }
 
diff --git a/examples/simple_room_server/UITask.cpp b/examples/simple_room_server/UITask.cpp
index 42bc14d4..640a1d2d 100644
--- a/examples/simple_room_server/UITask.cpp
+++ b/examples/simple_room_server/UITask.cpp
@@ -52,17 +52,25 @@ void UITask::renderCurrScreen() {
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
+    // meshcore website
+    const char* website = "https://meshcore.io";
+    _display->setColor(DisplayDriver::LIGHT);
+    _display->setTextSize(1);
+    uint16_t websiteWidth = _display->getTextWidth(website);
+    _display->setCursor((_display->width() - websiteWidth) / 2, 22);
+    _display->print(website);
+
     // version info
     _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     uint16_t versionWidth = _display->getTextWidth(_version_info);
-    _display->setCursor((_display->width() - versionWidth) / 2, 22);
+    _display->setCursor((_display->width() - versionWidth) / 2, 35);
     _display->print(_version_info);
 
     // node type
     const char* node_type = "< Room Server >";
     uint16_t typeWidth = _display->getTextWidth(node_type);
-    _display->setCursor((_display->width() - typeWidth) / 2, 35);
+    _display->setCursor((_display->width() - typeWidth) / 2, 48);
     _display->print(node_type);
   } else {  // home screen
     // node name
diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp
index af54dd63..bbf21896 100644
--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -35,7 +35,7 @@ void setup() {
 
   if (!radio_init()) { halt(); }
 
-  fast_rng.begin(radio_get_rng_seed());
+  fast_rng.begin(radio_driver.getRngSeed());
 
   FILESYSTEM* fs;
 #if defined(NRF52_PLATFORM)
diff --git a/examples/simple_secure_chat/main.cpp b/examples/simple_secure_chat/main.cpp
index ab14d393..d5066736 100644
--- a/examples/simple_secure_chat/main.cpp
+++ b/examples/simple_secure_chat/main.cpp
@@ -562,7 +562,7 @@ void setup() {
 
   if (!radio_init()) { halt(); }
 
-  fast_rng.begin(radio_get_rng_seed());
+  fast_rng.begin(radio_driver.getRngSeed());
 
 #if defined(NRF52_PLATFORM)
   InternalFS.begin();
@@ -577,8 +577,8 @@ void setup() {
   #error "need to define filesystem"
 #endif
 
-  radio_set_params(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
-  radio_set_tx_power(the_mesh.getTxPowerPref());
+  radio_driver.setParams(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
+  radio_driver.setTxPower(the_mesh.getTxPowerPref());
 
   the_mesh.showWelcome();
 
diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
index cbd974e8..5862441e 100644
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -764,8 +764,8 @@ void SensorMesh::begin(FILESYSTEM* fs) {
     }
   }
 
-  radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
-  radio_set_tx_power(_prefs.tx_power_dbm);
+  radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+  radio_driver.setTxPower(_prefs.tx_power_dbm);
 
   updateAdvertTimer();
   updateFloodAdvertTimer();
@@ -842,7 +842,7 @@ void SensorMesh::updateFloodAdvertTimer() {
 }
 
 void SensorMesh::setTxPower(int8_t power_dbm) {
-  radio_set_tx_power(power_dbm);
+  radio_driver.setTxPower(power_dbm);
 }
 
 void SensorMesh::formatStatsReply(char *reply, size_t reply_size) {
@@ -912,13 +912,13 @@ void SensorMesh::loop() {
 
   if (set_radio_at && millisHasNowPassed(set_radio_at)) {   // apply pending (temporary) radio params
     set_radio_at = 0;  // clear timer
-    radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
+    radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
     MESH_DEBUG_PRINTLN("Temp radio params");
   }
 
   if (revert_radio_at && millisHasNowPassed(revert_radio_at)) {   // revert radio params to orig
     revert_radio_at = 0;  // clear timer
-    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
     MESH_DEBUG_PRINTLN("Radio params restored");
   }
 
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
index ecd74527..46e8f648 100644
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -34,11 +34,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts
 
 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "20 Mar 2026"
+  #define FIRMWARE_BUILD_DATE   "19 Apr 2026"
 #endif
 
 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.14.1"
+  #define FIRMWARE_VERSION   "v1.15.0"
 #endif
 
 #define FIRMWARE_ROLE "sensor"
diff --git a/examples/simple_sensor/UITask.cpp b/examples/simple_sensor/UITask.cpp
index 0e78fee0..757ea1dc 100644
--- a/examples/simple_sensor/UITask.cpp
+++ b/examples/simple_sensor/UITask.cpp
@@ -52,17 +52,25 @@ void UITask::renderCurrScreen() {
     int logoWidth = 128;
     _display->drawXbm((_display->width() - logoWidth) / 2, 3, meshcore_logo, logoWidth, 13);
 
+    // meshcore website
+    const char* website = "https://meshcore.io";
+    _display->setColor(DisplayDriver::LIGHT);
+    _display->setTextSize(1);
+    uint16_t websiteWidth = _display->getTextWidth(website);
+    _display->setCursor((_display->width() - websiteWidth) / 2, 22);
+    _display->print(website);
+
     // version info
     _display->setColor(DisplayDriver::LIGHT);
     _display->setTextSize(1);
     uint16_t versionWidth = _display->getTextWidth(_version_info);
-    _display->setCursor((_display->width() - versionWidth) / 2, 22);
+    _display->setCursor((_display->width() - versionWidth) / 2, 35);
     _display->print(_version_info);
 
     // node type
     const char* node_type = "< Sensor >";
     uint16_t typeWidth = _display->getTextWidth(node_type);
-    _display->setCursor((_display->width() - typeWidth) / 2, 35);
+    _display->setCursor((_display->width() - typeWidth) / 2, 48);
     _display->print(node_type);
   } else {  // home screen
     // node name
diff --git a/examples/simple_sensor/main.cpp b/examples/simple_sensor/main.cpp
index 330adcc2..cace67a0 100644
--- a/examples/simple_sensor/main.cpp
+++ b/examples/simple_sensor/main.cpp
@@ -68,7 +68,7 @@ void setup() {
 
   if (!radio_init()) { halt(); }
 
-  fast_rng.begin(radio_get_rng_seed());
+  fast_rng.begin(radio_driver.getRngSeed());
 
   FILESYSTEM* fs;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
diff --git a/platformio.ini b/platformio.ini
index 3a8901b9..2480a29b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,8 +10,8 @@
 
 [platformio]
 extra_configs =
-	variants/*/platformio.ini
-	platformio.local.ini
+  variants/*/platformio.ini
+  platformio.local.ini
 
 [arduino_base]
 framework = arduino
@@ -83,10 +83,11 @@ platform = https://github.com/pioarduino/platform-espressif32/releases/download/
 extends = arduino_base
 platform = nordicnrf52
 platform_packages =
-  framework-arduinoadafruitnrf52 @ 1.10700.0
-extra_scripts =
-  create-uf2.py
-  arch/nrf52/extra_scripts/patch_bluefruit.py
+  ; use internal fork that includes patch to ble stack to prevent firmware lockup during rapid connect/disconnect
+  ; https://github.com/meshcore-dev/MeshCore/pull/1177
+  ; https://github.com/meshcore-dev/MeshCore/pull/1295
+  framework-arduinoadafruitnrf52 @ https://github.com/meshcore-dev/Adafruit_nRF52_Arduino#d541301
+extra_scripts = create-uf2.py
 build_flags = ${arduino_base.build_flags}
   -D NRF52_PLATFORM
   -D LFS_NO_ASSERT=1
@@ -153,3 +154,17 @@ lib_deps =
   stevemarple/MicroNMEA @ ^2.0.6
   adafruit/Adafruit BME680 Library @ ^2.0.4
   adafruit/Adafruit BMP085 Library @ ^1.2.4
+
+; ----------------- TESTING ---------------------
+
+[env:native]
+platform = native
+build_flags = -std=c++17
+  -I src
+  -I test/mocks
+test_build_src = yes
+build_src_filter =
+  -<*>
+  +<../src/Utils.cpp>
+lib_deps =
+  google/googletest @ 1.17.0
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index e7b8a5a0..c9a5b59b 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -2,6 +2,7 @@
 #include "CommonCLI.h"
 #include "TxtDataHelpers.h"
 #include "AdvertDataHelpers.h"
+#include "TxtDataHelpers.h"
 #include <RTClib.h>
 
 #ifndef BRIDGE_MAX_BAUD
@@ -308,7 +309,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re
       // change admin password
       StrHelper::strncpy(_prefs->password, &command[9], sizeof(_prefs->password));
       savePrefs();
-      sprintf(reply, "password now: %s", _prefs->password);   // echo back just to let admin know for sure!!
+      sprintf(reply, "password now: ");
+      StrHelper::strncpy(&reply[14], _prefs->password, 160-15);   // echo back just to let admin know for sure!!
     } else if (memcmp(command, "clear stats", 11) == 0) {
       _callbacks->clearStats();
       strcpy(reply, "(OK - stats reset)");
@@ -751,7 +753,8 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
       strcpy(reply, "Error: unsupported by this board");
     };
   } else {
-    sprintf(reply, "unknown config: %s", config);
+    strcpy(reply, "unknown config: ");
+    StrHelper::strncpy(&reply[16], config, 160-17);
   }
 }
 
@@ -809,10 +812,11 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
   } else if (memcmp(config, "direct.txdelay", 14) == 0) {
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor));
   } else if (memcmp(config, "owner.info", 10) == 0) {
+    auto start = reply;
     *reply++ = '>';
     *reply++ = ' ';
     const char* sp = _prefs->owner_info;
-    while (*sp) {
+    while (*sp && reply - start < 159) {
       *reply++ = (*sp == '\n') ? '|' : *sp;    // translate newline back to orig '|'
       sp++;
     }
diff --git a/src/helpers/esp32/ESPNOWRadio.cpp b/src/helpers/esp32/ESPNOWRadio.cpp
index ced19f91..a7557f14 100644
--- a/src/helpers/esp32/ESPNOWRadio.cpp
+++ b/src/helpers/esp32/ESPNOWRadio.cpp
@@ -54,6 +54,10 @@ void ESPNOWRadio::init() {
   }
 }
 
+uint32_t ESPNOWRadio::getRngSeed() {
+  return millis() + intID();  // TODO: where to get some entropy?
+}
+
 void ESPNOWRadio::setTxPower(uint8_t dbm) {
   esp_wifi_set_max_tx_power(dbm * 4);
 }
diff --git a/src/helpers/esp32/ESPNOWRadio.h b/src/helpers/esp32/ESPNOWRadio.h
index 43772e5e..67b1448e 100644
--- a/src/helpers/esp32/ESPNOWRadio.h
+++ b/src/helpers/esp32/ESPNOWRadio.h
@@ -9,6 +9,13 @@ protected:
 public:
   ESPNOWRadio() { n_recv = n_sent = n_recv_errors = 0; }
 
+  uint32_t getRngSeed();
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) {
+    // no-op
+  }
+  void powerOff() { /* no-op */ }
+
   void init();
   int recvRaw(uint8_t* bytes, int sz) override;
   uint32_t getEstAirtimeFor(int len_bytes) override;
diff --git a/src/helpers/radiolib/CustomLLCC68Wrapper.h b/src/helpers/radiolib/CustomLLCC68Wrapper.h
index fc0975cf..8861f76d 100644
--- a/src/helpers/radiolib/CustomLLCC68Wrapper.h
+++ b/src/helpers/radiolib/CustomLLCC68Wrapper.h
@@ -7,6 +7,15 @@
 class CustomLLCC68Wrapper : public RadioLibWrapper {
 public:
   CustomLLCC68Wrapper(CustomLLCC68& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomLLCC68 *)_radio)->setFrequency(freq);
+    ((CustomLLCC68 *)_radio)->setSpreadingFactor(sf);
+    ((CustomLLCC68 *)_radio)->setBandwidth(bw);
+    ((CustomLLCC68 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   bool isReceivingPacket() override { 
     return ((CustomLLCC68 *)_radio)->isReceiving();
   }
@@ -20,6 +29,7 @@ public:
     int sf = ((CustomLLCC68 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+  uint8_t getSpreadingFactor() const override { return ((CustomLLCC68 *)_radio)->spreadingFactor; }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 
diff --git a/src/helpers/radiolib/CustomLR1110.h b/src/helpers/radiolib/CustomLR1110.h
index 7c3685a1..4061c6b1 100644
--- a/src/helpers/radiolib/CustomLR1110.h
+++ b/src/helpers/radiolib/CustomLR1110.h
@@ -36,4 +36,6 @@ class CustomLR1110 : public LR1110 {
       bool detected = ((irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID) || (irq & RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
       return detected;
     }
+
+    uint8_t getSpreadingFactor() const { return spreadingFactor; }
 };
\ No newline at end of file
diff --git a/src/helpers/radiolib/CustomLR1110Wrapper.h b/src/helpers/radiolib/CustomLR1110Wrapper.h
index 42d36440..a99d39ef 100644
--- a/src/helpers/radiolib/CustomLR1110Wrapper.h
+++ b/src/helpers/radiolib/CustomLR1110Wrapper.h
@@ -7,6 +7,15 @@
 class CustomLR1110Wrapper : public RadioLibWrapper {
 public:
   CustomLR1110Wrapper(CustomLR1110& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomLR1110 *)_radio)->setFrequency(freq);
+    ((CustomLR1110 *)_radio)->setSpreadingFactor(sf);
+    ((CustomLR1110 *)_radio)->setBandwidth(bw);
+    ((CustomLR1110 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio, ((CustomLR1110 *)_radio)->getFreqMHz()); }
   bool isReceivingPacket() override {
     return ((CustomLR1110 *)_radio)->isReceiving();
@@ -19,12 +28,14 @@ public:
 
   void onSendFinished() override {
     RadioLibWrapper::onSendFinished();
-    _radio->setPreambleLength(16); // overcomes weird issues with small and big pkts
+    _radio->setPreambleLength(preambleLengthForSF(getSpreadingFactor())); // overcomes weird issues with small and big pkts
   }
 
   float getLastRSSI() const override { return ((CustomLR1110 *)_radio)->getRSSI(); }
   float getLastSNR() const override { return ((CustomLR1110 *)_radio)->getSNR(); }
 
+  uint8_t getSpreadingFactor() const override { return ((CustomLR1110 *)_radio)->getSpreadingFactor(); }
+
   void setRxBoostedGainMode(bool en) override {
     ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en);
   }
diff --git a/src/helpers/radiolib/CustomSTM32WLxWrapper.h b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
index e3e52029..97bf6820 100644
--- a/src/helpers/radiolib/CustomSTM32WLxWrapper.h
+++ b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
@@ -8,6 +8,15 @@
 class CustomSTM32WLxWrapper : public RadioLibWrapper {
 public:
   CustomSTM32WLxWrapper(CustomSTM32WLx& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomSTM32WLx *)_radio)->setFrequency(freq);
+    ((CustomSTM32WLx *)_radio)->setSpreadingFactor(sf);
+    ((CustomSTM32WLx *)_radio)->setBandwidth(bw);
+    ((CustomSTM32WLx *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   bool isReceivingPacket() override { 
     return ((CustomSTM32WLx *)_radio)->isReceiving();
   }
@@ -21,6 +30,7 @@ public:
     int sf = ((CustomSTM32WLx *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+  uint8_t getSpreadingFactor() const override { return ((CustomSTM32WLx *)_radio)->spreadingFactor; }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 };
diff --git a/src/helpers/radiolib/CustomSX1262Wrapper.h b/src/helpers/radiolib/CustomSX1262Wrapper.h
index 6499deb2..cc7bb223 100644
--- a/src/helpers/radiolib/CustomSX1262Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1262Wrapper.h
@@ -11,6 +11,15 @@
 class CustomSX1262Wrapper : public RadioLibWrapper {
 public:
   CustomSX1262Wrapper(CustomSX1262& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomSX1262 *)_radio)->setFrequency(freq);
+    ((CustomSX1262 *)_radio)->setSpreadingFactor(sf);
+    ((CustomSX1262 *)_radio)->setBandwidth(bw);
+    ((CustomSX1262 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   bool isReceivingPacket() override { 
     return ((CustomSX1262 *)_radio)->isReceiving();
   }
@@ -24,6 +33,7 @@ public:
     int sf = ((CustomSX1262 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+  uint8_t getSpreadingFactor() const override { return ((CustomSX1262 *)_radio)->spreadingFactor; }
   virtual void powerOff() override {
     ((CustomSX1262 *)_radio)->sleep(false);
   }
diff --git a/src/helpers/radiolib/CustomSX1268Wrapper.h b/src/helpers/radiolib/CustomSX1268Wrapper.h
index 54c37ee8..9ddea78f 100644
--- a/src/helpers/radiolib/CustomSX1268Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1268Wrapper.h
@@ -11,6 +11,15 @@
 class CustomSX1268Wrapper : public RadioLibWrapper {
 public:
   CustomSX1268Wrapper(CustomSX1268& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomSX1268 *)_radio)->setFrequency(freq);
+    ((CustomSX1268 *)_radio)->setSpreadingFactor(sf);
+    ((CustomSX1268 *)_radio)->setBandwidth(bw);
+    ((CustomSX1268 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   bool isReceivingPacket() override { 
     return ((CustomSX1268 *)_radio)->isReceiving();
   }
@@ -24,6 +33,7 @@ public:
     int sf = ((CustomSX1268 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+  uint8_t getSpreadingFactor() const override { return ((CustomSX1268 *)_radio)->spreadingFactor; }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 
diff --git a/src/helpers/radiolib/CustomSX1276Wrapper.h b/src/helpers/radiolib/CustomSX1276Wrapper.h
index 5cde72f7..9d75ce12 100644
--- a/src/helpers/radiolib/CustomSX1276Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1276Wrapper.h
@@ -10,6 +10,15 @@
 class CustomSX1276Wrapper : public RadioLibWrapper {
 public:
   CustomSX1276Wrapper(CustomSX1276& radio, mesh::MainBoard& board) : RadioLibWrapper(radio, board) { }
+
+  void setParams(float freq, float bw, uint8_t sf, uint8_t cr) override {
+    ((CustomSX1276 *)_radio)->setFrequency(freq);
+    ((CustomSX1276 *)_radio)->setSpreadingFactor(sf);
+    ((CustomSX1276 *)_radio)->setBandwidth(bw);
+    ((CustomSX1276 *)_radio)->setCodingRate(cr);
+    updatePreamble(sf);
+  }
+
   bool isReceivingPacket() override { 
     return ((CustomSX1276 *)_radio)->isReceiving();
   }
@@ -23,4 +32,5 @@ public:
     int sf = ((CustomSX1276 *)_radio)->spreadingFactor;
     return packetScoreInt(snr, sf, packet_len);
   }
+  uint8_t getSpreadingFactor() const override { return ((CustomSX1276 *)_radio)->spreadingFactor; }
 };
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index 2216ca8f..b6519aef 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -26,6 +26,8 @@ void setFlag(void) {
 
 void RadioLibWrapper::begin() {
   _radio->setPacketReceivedAction(setFlag);  // this is also SentComplete interrupt
+  _preamble_sf = getSpreadingFactor();
+  _radio->setPreambleLength(preambleLengthForSF(_preamble_sf)); // longer preamble for lower SF improves reliability
   state = STATE_IDLE;
 
   if (_board->getStartupReason() == BD_STARTUP_RX_PACKET) {  // received a LoRa packet (while in deep sleep)
@@ -40,6 +42,14 @@ void RadioLibWrapper::begin() {
   _floor_sample_sum = 0;
 }
 
+uint32_t RadioLibWrapper::getRngSeed() {
+  return _radio->random(0x7FFFFFFF);
+}
+
+void RadioLibWrapper::setTxPower(int8_t dbm) {
+  _radio->setOutputPower(dbm);
+}
+
 void RadioLibWrapper::idle() {
   _radio->standby();
   state = STATE_IDLE;   // need another startReceive()
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index a42e060a..efd3e179 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -11,6 +11,7 @@ protected:
   int16_t _noise_floor, _threshold;
   uint16_t _num_floor_samples;
   int32_t _floor_sample_sum;
+  uint8_t _preamble_sf;
 
   void idle();
   void startRecv();
@@ -19,7 +20,7 @@ protected:
   virtual void doResetAGC();
 
 public:
-  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board) { n_recv = n_sent = 0; }
+  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board), _preamble_sf(0) { n_recv = n_sent = 0; }
 
   void begin() override;
   virtual void powerOff() { _radio->sleep(); }
@@ -37,7 +38,14 @@ public:
     return isChannelActive();
   }
 
+  virtual void setParams(float freq, float bw, uint8_t sf, uint8_t cr) = 0;
+  uint32_t getRngSeed();
+  void setTxPower(int8_t dbm);
+
   virtual float getCurrentRSSI() =0;
+  virtual uint8_t getSpreadingFactor() const { return LORA_SF; }
+  static uint16_t preambleLengthForSF(uint8_t sf) { return sf <= 8 ? 32 : 16; }
+  void updatePreamble(uint8_t sf) { _preamble_sf = sf; _radio->setPreambleLength(preambleLengthForSF(sf)); }
 
   int getNoiseFloor() const override { return _noise_floor; }
   void triggerNoiseFloorCalibrate(int threshold) override;
diff --git a/src/helpers/ui/buzzer.cpp b/src/helpers/ui/buzzer.cpp
index ca469d17..eb9b695b 100644
--- a/src/helpers/ui/buzzer.cpp
+++ b/src/helpers/ui/buzzer.cpp
@@ -12,7 +12,6 @@ void genericBuzzer::begin() {
     quiet(false);
     pinMode(PIN_BUZZER, OUTPUT);
     digitalWrite(PIN_BUZZER, LOW); // need to pull low by default to avoid extreme power draw
-    startup();
 }
 
 void genericBuzzer::play(const char *melody) {
diff --git a/test/mocks/AES.h b/test/mocks/AES.h
new file mode 100644
index 00000000..678b7c13
--- /dev/null
+++ b/test/mocks/AES.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+
+// Mock AES128 class for testing
+// Provides minimal interface to allow Utils.cpp to compile
+class AES128 {
+public:
+  void setKey(const uint8_t* key, size_t keySize) {}
+  void encryptBlock(uint8_t* output, const uint8_t* input) {}
+  void decryptBlock(uint8_t* output, const uint8_t* input) {}
+};
diff --git a/test/mocks/SHA256.h b/test/mocks/SHA256.h
new file mode 100644
index 00000000..b6e551a0
--- /dev/null
+++ b/test/mocks/SHA256.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <stdint.h>
+#include <stddef.h>
+
+// Mock SHA256 class for testing
+// Provides minimal interface to allow Utils.cpp to compile
+class SHA256 {
+public:
+  void update(const uint8_t* data, size_t len) {}
+  void finalize(uint8_t* hash, size_t hashLen) {}
+  void resetHMAC(const uint8_t* key, size_t keyLen) {}
+  void finalizeHMAC(const uint8_t* key, size_t keyLen, uint8_t* hash, size_t hashLen) {}
+};
diff --git a/test/mocks/Stream.h b/test/mocks/Stream.h
new file mode 100644
index 00000000..195a3029
--- /dev/null
+++ b/test/mocks/Stream.h
@@ -0,0 +1,10 @@
+#pragma once
+
+// Mock Stream class for native testing
+// Provides minimal interface needed by Utils.h
+
+class Stream {
+public:
+    virtual void print(char c) {}
+    virtual void print(const char* str) {}
+};
diff --git a/test/test_utils/test_tohex.cpp b/test/test_utils/test_tohex.cpp
new file mode 100644
index 00000000..fec3ae48
--- /dev/null
+++ b/test/test_utils/test_tohex.cpp
@@ -0,0 +1,57 @@
+#include <gtest/gtest.h>
+#include "Utils.h"
+
+using namespace mesh;
+
+#define HEX_BUFFER_SIZE(input) (sizeof(input) * 2 + 1)
+
+TEST(UtilsToHex, ConvertSingleByte) {
+    uint8_t input[] = {0xAB};
+    char output[HEX_BUFFER_SIZE(input)];
+
+    Utils::toHex(output, input, sizeof(input));
+
+    EXPECT_STREQ("AB", output);
+}
+
+TEST(UtilsToHex, ConvertMultipleBytes) {
+    uint8_t input[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF};
+    char output[HEX_BUFFER_SIZE(input)];
+
+    Utils::toHex(output, input, sizeof(input));
+
+    EXPECT_STREQ("0123456789ABCDEF", output);
+}
+
+TEST(UtilsToHex, ConvertZeroByte) {
+    uint8_t input[] = {0x00};
+    char output[HEX_BUFFER_SIZE(input)];
+
+    Utils::toHex(output, input, sizeof(input));
+
+    EXPECT_STREQ("00", output);
+}
+
+TEST(UtilsToHex, ConvertMaxByte) {
+    uint8_t input[] = {0xFF};
+    char output[HEX_BUFFER_SIZE(input)];
+
+    Utils::toHex(output, input, sizeof(input));
+
+    EXPECT_STREQ("FF", output);
+}
+
+TEST(UtilsToHex, NullTerminatesOnEmptyInput) {
+    uint8_t input[] = {0xAB};
+    char output[] = "X";  // Pre-fill with X.
+
+    Utils::toHex(output, input, 0);
+
+    // Should just null-terminate at position 0
+    EXPECT_EQ('\0', output[0]);
+}
+
+int main(int argc, char **argv) {
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini
index d807b978..15fe761b 100644
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -135,3 +135,8 @@ build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
 lib_deps =
   ${Ebyte_EoRa-S3.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Ebyte_EoRa-S3_kiss_modem]
+extends = Ebyte_EoRa-S3
+build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/ebyte_eora_s3/target.cpp b/variants/ebyte_eora_s3/target.cpp
index 501f560b..91d851ff 100644
--- a/variants/ebyte_eora_s3/target.cpp
+++ b/variants/ebyte_eora_s3/target.cpp
@@ -64,21 +64,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/ebyte_eora_s3/target.h b/variants/ebyte_eora_s3/target.h
index 892c3de3..b64694f5 100644
--- a/variants/ebyte_eora_s3/target.h
+++ b/variants/ebyte_eora_s3/target.h
@@ -23,7 +23,4 @@ extern SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini
index 1467f0fa..2baac256 100644
--- a/variants/gat562_30s_mesh_kit/platformio.ini
+++ b/variants/gat562_30s_mesh_kit/platformio.ini
@@ -112,3 +112,7 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
 
+[env:GAT562_30S_Mesh_Kit_kiss_modem]
+extends = GAT562_30S_Mesh_Kit
+build_src_filter = ${GAT562_30S_Mesh_Kit.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/gat562_30s_mesh_kit/target.cpp b/variants/gat562_30s_mesh_kit/target.cpp
index 66723b44..8f84a7a1 100644
--- a/variants/gat562_30s_mesh_kit/target.cpp
+++ b/variants/gat562_30s_mesh_kit/target.cpp
@@ -38,21 +38,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/gat562_30s_mesh_kit/target.h b/variants/gat562_30s_mesh_kit/target.h
index c112fd6c..d526a5d0 100644
--- a/variants/gat562_30s_mesh_kit/target.h
+++ b/variants/gat562_30s_mesh_kit/target.h
@@ -24,7 +24,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini
index cede9c97..b3e89417 100644
--- a/variants/gat562_mesh_evb_pro/platformio.ini
+++ b/variants/gat562_mesh_evb_pro/platformio.ini
@@ -50,3 +50,8 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter}
   +<../examples/simple_room_server>
+
+[env:GAT562_Mesh_EVB_Pro_kiss_modem]
+extends = GAT562_Mesh_EVB_Pro
+build_src_filter = ${GAT562_Mesh_EVB_Pro.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/gat562_mesh_evb_pro/target.cpp b/variants/gat562_mesh_evb_pro/target.cpp
index 368b5fa1..8dc203de 100644
--- a/variants/gat562_mesh_evb_pro/target.cpp
+++ b/variants/gat562_mesh_evb_pro/target.cpp
@@ -37,21 +37,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/gat562_mesh_evb_pro/target.h b/variants/gat562_mesh_evb_pro/target.h
index 2a3c6f87..9111704f 100644
--- a/variants/gat562_mesh_evb_pro/target.h
+++ b/variants/gat562_mesh_evb_pro/target.h
@@ -23,7 +23,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini
index 8a947bce..af153b8f 100644
--- a/variants/gat562_mesh_tracker_pro/platformio.ini
+++ b/variants/gat562_mesh_tracker_pro/platformio.ini
@@ -106,3 +106,7 @@ lib_deps =
   ${GAT562_Mesh_Tracker_Pro.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+[env:GAT562_Mesh_Tracker_Pro_kiss_modem]
+extends = GAT562_Mesh_Tracker_Pro
+build_src_filter = ${GAT562_Mesh_Tracker_Pro.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/gat562_mesh_tracker_pro/target.cpp b/variants/gat562_mesh_tracker_pro/target.cpp
index 8ef0ecd3..d16b4538 100644
--- a/variants/gat562_mesh_tracker_pro/target.cpp
+++ b/variants/gat562_mesh_tracker_pro/target.cpp
@@ -38,21 +38,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/gat562_mesh_tracker_pro/target.h b/variants/gat562_mesh_tracker_pro/target.h
index d43c5f25..0d3b7d76 100644
--- a/variants/gat562_mesh_tracker_pro/target.h
+++ b/variants/gat562_mesh_tracker_pro/target.h
@@ -24,7 +24,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini
index ef30829d..f3510b74 100644
--- a/variants/gat562_mesh_watch13/platformio.ini
+++ b/variants/gat562_mesh_watch13/platformio.ini
@@ -87,3 +87,7 @@ lib_deps =
   ${GAT562_Mesh_Watch13.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+[env:GAT562_Mesh_Watch13_kiss_modem]
+extends = GAT562_Mesh_Watch13
+build_src_filter = ${GAT562_Mesh_Watch13.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/gat562_mesh_watch13/target.cpp b/variants/gat562_mesh_watch13/target.cpp
index 87f65dd9..95bcf6dc 100644
--- a/variants/gat562_mesh_watch13/target.cpp
+++ b/variants/gat562_mesh_watch13/target.cpp
@@ -29,21 +29,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/gat562_mesh_watch13/target.h b/variants/gat562_mesh_watch13/target.h
index a9a71ce4..9ed5cda7 100644
--- a/variants/gat562_mesh_watch13/target.h
+++ b/variants/gat562_mesh_watch13/target.h
@@ -25,7 +25,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini
index 6b7bfd4e..dfa2ff64 100644
--- a/variants/generic-e22/platformio.ini
+++ b/variants/generic-e22/platformio.ini
@@ -95,6 +95,11 @@ lib_deps =
   ${Generic_E22.lib_deps}
   ${esp32_ota.lib_deps}
 
+[env:Generic_E22_kiss_modem]
+extends = Generic_E22
+build_src_filter = ${Generic_E22.build_src_filter}
+  +<../examples/kiss_modem/>
+
 [env:Generic_E22_sx1268_repeater]
 extends = Generic_E22
 build_src_filter = ${Generic_E22.build_src_filter}
diff --git a/variants/generic-e22/target.cpp b/variants/generic-e22/target.cpp
index d4169b09..26bba1c0 100644
--- a/variants/generic-e22/target.cpp
+++ b/variants/generic-e22/target.cpp
@@ -27,21 +27,6 @@ bool radio_init() {
   #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/generic-e22/target.h b/variants/generic-e22/target.h
index 6504078c..16612f67 100644
--- a/variants/generic-e22/target.h
+++ b/variants/generic-e22/target.h
@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/generic_espnow/target.cpp b/variants/generic_espnow/target.cpp
index f42085c0..f447523e 100644
--- a/variants/generic_espnow/target.cpp
+++ b/variants/generic_espnow/target.cpp
@@ -17,18 +17,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return millis() + radio_driver.intID();  // TODO: where to get some entropy?
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  // no-op
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio_driver.setTxPower(dbm);
-}
-
 // NOTE: as we are using the WiFi radio, the ESP_IDF will have enabled hardware RNG:
 //    https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/random.html
 class ESP_RNG : public mesh::RNG {
diff --git a/variants/generic_espnow/target.h b/variants/generic_espnow/target.h
index 1ebd0837..884f4969 100644
--- a/variants/generic_espnow/target.h
+++ b/variants/generic_espnow/target.h
@@ -10,7 +10,4 @@ extern ESP32RTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini
index 910385ec..0179d965 100644
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@@ -150,3 +150,8 @@ build_src_filter = ${Heltec_ct62.build_src_filter}
 lib_deps =
   ${Heltec_ct62.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_ct62_kiss_modem]
+extends = Heltec_ct62
+build_src_filter = ${Heltec_ct62.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_ct62/target.cpp b/variants/heltec_ct62/target.cpp
index 0d5e1b12..522c3199 100644
--- a/variants/heltec_ct62/target.cpp
+++ b/variants/heltec_ct62/target.cpp
@@ -16,21 +16,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_ct62/target.h b/variants/heltec_ct62/target.h
index 1bd525e1..214a6e0f 100644
--- a/variants/heltec_ct62/target.h
+++ b/variants/heltec_ct62/target.h
@@ -14,7 +14,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini
index 395e22ea..123edd91 100644
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -166,3 +166,8 @@ lib_deps =
   ${Heltec_E213_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_E213_kiss_modem]
+extends = Heltec_E213_base
+build_src_filter = ${Heltec_E213_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_e213/target.cpp b/variants/heltec_e213/target.cpp
index 69c832fc..6914769d 100644
--- a/variants/heltec_e213/target.cpp
+++ b/variants/heltec_e213/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_e213/target.h b/variants/heltec_e213/target.h
index c23ac1fa..6f2c291b 100644
--- a/variants/heltec_e213/target.h
+++ b/variants/heltec_e213/target.h
@@ -23,7 +23,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini
index 475ae868..6e0eaffc 100644
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -162,3 +162,8 @@ lib_deps =
   ${Heltec_E290_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_E290_kiss_modem]
+extends = Heltec_E290_base
+build_src_filter = ${Heltec_E290_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_e290/target.cpp b/variants/heltec_e290/target.cpp
index c2220b15..f2327954 100644
--- a/variants/heltec_e290/target.cpp
+++ b/variants/heltec_e290/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_e290/target.h b/variants/heltec_e290/target.h
index b0900302..d78521fc 100644
--- a/variants/heltec_e290/target.h
+++ b/variants/heltec_e290/target.h
@@ -23,7 +23,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini
index 7bfbac85..92d641a3 100644
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@@ -92,4 +92,9 @@ build_src_filter = ${Heltec_mesh_solar.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps =
   ${Heltec_mesh_solar.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_mesh_solar_kiss_modem]
+extends = Heltec_mesh_solar
+build_src_filter = ${Heltec_mesh_solar.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp
index 1ea33e1f..d140864c 100644
--- a/variants/heltec_mesh_solar/target.cpp
+++ b/variants/heltec_mesh_solar/target.cpp
@@ -23,21 +23,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_mesh_solar/target.h b/variants/heltec_mesh_solar/target.h
index f1921abf..1956f50e 100644
--- a/variants/heltec_mesh_solar/target.h
+++ b/variants/heltec_mesh_solar/target.h
@@ -40,7 +40,4 @@ extern SolarSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_t096/LoRaFEMControl.cpp b/variants/heltec_t096/LoRaFEMControl.cpp
index 9aeb8385..fb60a8f7 100644
--- a/variants/heltec_t096/LoRaFEMControl.cpp
+++ b/variants/heltec_t096/LoRaFEMControl.cpp
@@ -9,7 +9,7 @@ void LoRaFEMControl::init(void)
     pinMode(P_LORA_KCT8103L_PA_CSD, OUTPUT);
     digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
     pinMode(P_LORA_KCT8103L_PA_CTX, OUTPUT);
-    digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+    digitalWrite(P_LORA_KCT8103L_PA_CTX, lna_enabled ? LOW : HIGH);
     setLnaCanControl(true);
 }
 
diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini
index 19b05f3c..14155f5e 100644
--- a/variants/heltec_t096/platformio.ini
+++ b/variants/heltec_t096/platformio.ini
@@ -92,7 +92,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
 [env:Heltec_t096_room_server]
 extends = Heltec_t096
 build_src_filter = ${Heltec_t096.build_src_filter}
-  +<../examples/simple_room_server> 
+  +<../examples/simple_room_server>
 build_flags =
   ${Heltec_t096.build_flags}
   -D ADVERT_NAME='"Heltec_t096 Room"'
@@ -145,4 +145,9 @@ build_src_filter = ${Heltec_t096.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Heltec_t096.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_t096_kiss_modem]
+extends = Heltec_t096
+build_src_filter = ${Heltec_t096.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_t096/target.cpp b/variants/heltec_t096/target.cpp
index 09609b87..30509977 100644
--- a/variants/heltec_t096/target.cpp
+++ b/variants/heltec_t096/target.cpp
@@ -43,21 +43,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_t096/target.h b/variants/heltec_t096/target.h
index 8c704b23..137d8db5 100644
--- a/variants/heltec_t096/target.h
+++ b/variants/heltec_t096/target.h
@@ -27,7 +27,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini
index b985030f..135babb1 100644
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -50,7 +50,6 @@ upload_protocol = nrfutil
 extends = Heltec_t114
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_repeater>
-
 build_flags =
   ${Heltec_t114.build_flags}
   -D ADVERT_NAME='"Heltec_T114 Repeater"'
@@ -127,10 +126,6 @@ build_flags =
   -D DISPLAY_CLASS=NullDisplayDriver
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<helpers/nrf52/*.cpp>
   +<../examples/companion_radio/*.cpp>
@@ -251,4 +246,9 @@ build_src_filter = ${Heltec_t114_with_display.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Heltec_t114_with_display.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_t114_kiss_modem]
+extends = Heltec_t114
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_t114/target.cpp b/variants/heltec_t114/target.cpp
index 6a30a4d1..cb8f75db 100644
--- a/variants/heltec_t114/target.cpp
+++ b/variants/heltec_t114/target.cpp
@@ -43,21 +43,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_t114/target.h b/variants/heltec_t114/target.h
index 612161fe..5aac84db 100644
--- a/variants/heltec_t114/target.h
+++ b/variants/heltec_t114/target.h
@@ -29,7 +29,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini
index 4b034032..411fee85 100644
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -153,3 +153,8 @@ build_src_filter = ${Heltec_T190_base.build_src_filter}
 lib_deps =
   ${Heltec_T190_base.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_T190_kiss_modem]
+extends = Heltec_T190_base
+build_src_filter = ${Heltec_T190_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_t190/target.cpp b/variants/heltec_t190/target.cpp
index d22f8b8c..6a2eab7d 100644
--- a/variants/heltec_t190/target.cpp
+++ b/variants/heltec_t190/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_t190/target.h b/variants/heltec_t190/target.h
index 9a6e4d96..cde63220 100644
--- a/variants/heltec_t190/target.h
+++ b/variants/heltec_t190/target.h
@@ -23,7 +23,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
index e0a8f5fa..69293d70 100644
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -186,3 +186,8 @@ build_src_filter = ${Heltec_tracker_base.build_src_filter}
 lib_deps =
   ${Heltec_tracker_base.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Heltec_Wireless_Tracker_kiss_modem]
+extends = Heltec_tracker_base
+build_src_filter = ${Heltec_tracker_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp
index f801bacb..f32c41ff 100644
--- a/variants/heltec_tracker/target.cpp
+++ b/variants/heltec_tracker/target.cpp
@@ -37,21 +37,6 @@ bool radio_init() {
 
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h
index 29099f46..2931eda8 100644
--- a/variants/heltec_tracker/target.h
+++ b/variants/heltec_tracker/target.h
@@ -42,7 +42,4 @@ extern HWTSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_tracker_v2/LoRaFEMControl.cpp b/variants/heltec_tracker_v2/LoRaFEMControl.cpp
index 3cf6c311..b846465d 100644
--- a/variants/heltec_tracker_v2/LoRaFEMControl.cpp
+++ b/variants/heltec_tracker_v2/LoRaFEMControl.cpp
@@ -14,7 +14,7 @@ void LoRaFEMControl::init(void)
     pinMode(P_LORA_KCT8103L_PA_CSD, OUTPUT);
     digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
     pinMode(P_LORA_KCT8103L_PA_CTX, OUTPUT);
-    digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+    digitalWrite(P_LORA_KCT8103L_PA_CTX, lna_enabled ? LOW : HIGH);
     setLnaCanControl(true);
 }
 
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index 956b1ec7..d57c2113 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -187,7 +187,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_v2.build_src_filter}
@@ -217,3 +217,8 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter}
 lib_deps =
   ${Heltec_tracker_v2.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:heltec_tracker_v2_kiss_modem]
+extends = Heltec_tracker_v2
+build_src_filter = ${Heltec_tracker_v2.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_tracker_v2/target.cpp b/variants/heltec_tracker_v2/target.cpp
index a5aecabe..c48a29f6 100644
--- a/variants/heltec_tracker_v2/target.cpp
+++ b/variants/heltec_tracker_v2/target.cpp
@@ -39,21 +39,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_tracker_v2/target.h b/variants/heltec_tracker_v2/target.h
index 62f31c95..240d9d4c 100644
--- a/variants/heltec_tracker_v2/target.h
+++ b/variants/heltec_tracker_v2/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index 99f6f7e1..c103dd8d 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -195,3 +195,8 @@ build_src_filter = ${Heltec_lora32_v2.build_src_filter}
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_v2_kiss_modem]
+extends = Heltec_lora32_v2
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_v2/target.cpp b/variants/heltec_v2/target.cpp
index 2dfb4c6e..2bc57b8c 100644
--- a/variants/heltec_v2/target.cpp
+++ b/variants/heltec_v2/target.cpp
@@ -32,21 +32,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_v2/target.h b/variants/heltec_v2/target.h
index 788dac72..cdffc18a 100644
--- a/variants/heltec_v2/target.h
+++ b/variants/heltec_v2/target.h
@@ -23,7 +23,4 @@ extern SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index fd50b549..573a6e9e 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -371,8 +371,6 @@ lib_deps =
 
 [env:Heltec_v3_kiss_modem]
 extends = Heltec_lora32_v3
-build_flags =
-  ${Heltec_lora32_v3.build_flags}
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<../examples/kiss_modem/>
 lib_deps =
diff --git a/variants/heltec_v3/target.cpp b/variants/heltec_v3/target.cpp
index 207962f3..e6af466a 100644
--- a/variants/heltec_v3/target.cpp
+++ b/variants/heltec_v3/target.cpp
@@ -39,21 +39,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_v3/target.h b/variants/heltec_v3/target.h
index 21a209f9..2944b384 100644
--- a/variants/heltec_v3/target.h
+++ b/variants/heltec_v3/target.h
@@ -24,7 +24,4 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/heltec_v4/HeltecV4Board.cpp b/variants/heltec_v4/HeltecV4Board.cpp
index 49580d2e..8f013797 100644
--- a/variants/heltec_v4/HeltecV4Board.cpp
+++ b/variants/heltec_v4/HeltecV4Board.cpp
@@ -73,7 +73,7 @@ void HeltecV4Board::begin() {
 
     digitalWrite(PIN_ADC_CTRL, LOW);
 
-    return (5.42 * (3.3 / 1024.0) * raw) * 1000;
+    return (adc_mult * (3.3 / 1024.0) * raw) * 1000;
   }
 
   const char* HeltecV4Board::getManufacturerName() const {
diff --git a/variants/heltec_v4/HeltecV4Board.h b/variants/heltec_v4/HeltecV4Board.h
index 4d5ee461..95def06c 100644
--- a/variants/heltec_v4/HeltecV4Board.h
+++ b/variants/heltec_v4/HeltecV4Board.h
@@ -5,8 +5,16 @@
 #include <helpers/ESP32Board.h>
 #include <driver/rtc_io.h>
 #include "LoRaFEMControl.h"
+
+#ifndef ADC_MULTIPLIER
+  #define ADC_MULTIPLIER 5.42
+#endif
+
 class HeltecV4Board : public ESP32Board {
 
+protected:
+  float adc_mult = ADC_MULTIPLIER;
+
 public:
   RefCountedDigitalPin periph_power;
   LoRaFEMControl loRaFEMControl;
@@ -18,6 +26,14 @@ public:
   void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
   void powerOff() override;
   uint16_t getBattMilliVolts() override;
-  const char* getManufacturerName() const override ;
-
+  bool setAdcMultiplier(float multiplier) override {
+    if (multiplier == 0.0f) {
+      adc_mult = ADC_MULTIPLIER;
+    } else {
+      adc_mult = multiplier;
+    }
+    return true;
+  }
+  float getAdcMultiplier() const override { return adc_mult; }
+  const char* getManufacturerName() const override;
 };
diff --git a/variants/heltec_v4/LoRaFEMControl.h b/variants/heltec_v4/LoRaFEMControl.h
index 75452965..13225bd5 100644
--- a/variants/heltec_v4/LoRaFEMControl.h
+++ b/variants/heltec_v4/LoRaFEMControl.h
@@ -23,7 +23,7 @@ class LoRaFEMControl
     LoRaFEMType getFEMType(void) const { return fem_type; }
   private:
     LoRaFEMType fem_type=OTHER_FEM_TYPES;
-    bool lna_enabled=true;
+    bool lna_enabled=false;
     bool lna_can_control=false;
 };
 
diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini
index 6f6bf2b5..fabf3827 100644
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -102,6 +102,28 @@ lib_deps =
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
 
+[env:heltec_v4_expansionkit_repeater]
+extends = heltec_v4_oled
+build_flags =
+  ${heltec_v4_oled.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"Heltec Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+  -D ENV_PIN_SDA=4
+  -D ENV_PIN_SCL=3
+build_src_filter = ${heltec_v4_oled.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/simple_repeater>
+lib_deps =
+  ${heltec_v4_oled.lib_deps}
+  ${esp32_ota.lib_deps}
+  bakercp/CRC32 @ ^2.0.0
+
 [env:heltec_v4_repeater_bridge_espnow]
 extends = heltec_v4_oled
 build_flags =
@@ -407,3 +429,8 @@ build_src_filter = ${heltec_v4_tft.build_src_filter}
 lib_deps =
   ${heltec_v4_tft.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:heltec_v4_kiss_modem]
+extends = Heltec_lora32_v4
+build_src_filter = ${Heltec_lora32_v4.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_v4/target.cpp b/variants/heltec_v4/target.cpp
index d9f53596..8483f276 100644
--- a/variants/heltec_v4/target.cpp
+++ b/variants/heltec_v4/target.cpp
@@ -39,21 +39,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/heltec_v4/target.h b/variants/heltec_v4/target.h
index 47d493cb..5d668186 100644
--- a/variants/heltec_v4/target.h
+++ b/variants/heltec_v4/target.h
@@ -28,8 +28,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index c6fe657d..48723d16 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -165,3 +165,8 @@ lib_deps =
   ${Heltec_Wireless_Paper_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
+
+[env:Heltec_Wireless_Paper_kiss_modem]
+extends = Heltec_Wireless_Paper_base
+build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/heltec_wireless_paper/target.cpp b/variants/heltec_wireless_paper/target.cpp
index ffb042cf..be21695e 100644
--- a/variants/heltec_wireless_paper/target.cpp
+++ b/variants/heltec_wireless_paper/target.cpp
@@ -1,7 +1,7 @@
 #include "target.h"
 #include <Arduino.h>
 
-HeltecV3Board board;
+HeltecWirelessPaperBoard board;
 
 #if defined(P_LORA_SCLK)
   static SPIClass spi;
@@ -32,21 +32,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/heltec_wireless_paper/target.h b/variants/heltec_wireless_paper/target.h
index 661da5e4..72066781 100644
--- a/variants/heltec_wireless_paper/target.h
+++ b/variants/heltec_wireless_paper/target.h
@@ -4,6 +4,12 @@
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
 #include <../heltec_v3/HeltecV3Board.h>
+class HeltecWirelessPaperBoard : public HeltecV3Board {
+public:
+  const char* getManufacturerName() const override {
+    return "Heltec Wireless Paper";
+  }
+};
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>
@@ -12,7 +18,7 @@
 #include <helpers/ui/MomentaryButton.h>
 #endif
 
-extern HeltecV3Board board;
+extern HeltecWirelessPaperBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
@@ -23,7 +29,4 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini
index 9f48cd41..51b602e4 100644
--- a/variants/ikoka_handheld_nrf/platformio.ini
+++ b/variants/ikoka_handheld_nrf/platformio.ini
@@ -86,8 +86,7 @@ build_src_filter = ${ikoka_handheld_nrf_ssd1306_companion.build_src_filter}
 
 [env:ikoka_handheld_nrf_e22_30dbm_repeater]
 extends = ikoka_handheld_nrf
-build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+build_flags = ${ikoka_handheld_nrf.build_flags}
   -D ADVERT_NAME='"ikoka_handheld Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -99,8 +98,7 @@ build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
 
 [env:ikoka_handheld_nrf_e22_30dbm_room_server]
 extends = ikoka_handheld_nrf
-build_flags =
-  ${ikoka_handheld_nrf.build_flags}
+build_flags = ${ikoka_handheld_nrf.build_flags}
   -D ADVERT_NAME='"ikoka_handheld Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -108,3 +106,10 @@ build_flags =
   -D LORA_TX_POWER=20
 build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
   +<../examples/simple_room_server/*.cpp>
+
+[env:ikoka_handheld_nrf_kiss_modem]
+extends = ikoka_handheld_nrf
+build_flags = ${ikoka_handheld_nrf.build_flags}
+  -D LORA_TX_POWER=20
+build_src_filter = ${ikoka_handheld_nrf.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/ikoka_handheld_nrf/target.cpp b/variants/ikoka_handheld_nrf/target.cpp
index f1d00f89..6c53c5e3 100644
--- a/variants/ikoka_handheld_nrf/target.cpp
+++ b/variants/ikoka_handheld_nrf/target.cpp
@@ -25,21 +25,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/ikoka_handheld_nrf/target.h b/variants/ikoka_handheld_nrf/target.h
index 9afe937a..18f7c9c5 100644
--- a/variants/ikoka_handheld_nrf/target.h
+++ b/variants/ikoka_handheld_nrf/target.h
@@ -23,8 +23,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini
index d631174d..e72f83ce 100644
--- a/variants/ikoka_nano_nrf/platformio.ini
+++ b/variants/ikoka_nano_nrf/platformio.ini
@@ -279,3 +279,18 @@ build_flags =
 build_src_filter =
    ${ikoka_nano_nrf_room_server.build_src_filter}
    ${ikoka_nano_nrf_e22_33dbm.build_src_filter}
+
+[env:ikoka_nano_nrf_22dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_22dbm
+build_src_filter = ${ikoka_nano_nrf_e22_22dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_nano_nrf_30dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_30dbm
+build_src_filter = ${ikoka_nano_nrf_e22_30dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_nano_nrf_33dbm_kiss_modem]
+extends = ikoka_nano_nrf_e22_33dbm
+build_src_filter = ${ikoka_nano_nrf_e22_33dbm.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/ikoka_nano_nrf/target.cpp b/variants/ikoka_nano_nrf/target.cpp
index c66bb23f..baf02c3d 100644
--- a/variants/ikoka_nano_nrf/target.cpp
+++ b/variants/ikoka_nano_nrf/target.cpp
@@ -23,21 +23,6 @@ bool radio_init() {
     return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/ikoka_nano_nrf/target.h b/variants/ikoka_nano_nrf/target.h
index b85b8d93..30ee5cb6 100644
--- a/variants/ikoka_nano_nrf/target.h
+++ b/variants/ikoka_nano_nrf/target.h
@@ -22,8 +22,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini
index e95c6375..06e39e84 100644
--- a/variants/ikoka_stick_nrf/platformio.ini
+++ b/variants/ikoka_stick_nrf/platformio.ini
@@ -290,3 +290,18 @@ build_flags =
 build_src_filter =
    ${ikoka_stick_nrf_room_server.build_src_filter}
    ${ikoka_stick_nrf_e22_33dbm.build_src_filter}
+
+[env:ikoka_stick_nrf_22dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_22dbm
+build_src_filter = ${ikoka_stick_nrf_e22_22dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_stick_nrf_30dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_30dbm
+build_src_filter = ${ikoka_stick_nrf_e22_30dbm.build_src_filter}
+  +<../examples/kiss_modem/>
+
+[env:ikoka_stick_nrf_33dbm_kiss_modem]
+extends = ikoka_stick_nrf_e22_33dbm
+build_src_filter = ${ikoka_stick_nrf_e22_33dbm.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/ikoka_stick_nrf/target.cpp b/variants/ikoka_stick_nrf/target.cpp
index d9eab82e..bb140505 100644
--- a/variants/ikoka_stick_nrf/target.cpp
+++ b/variants/ikoka_stick_nrf/target.cpp
@@ -23,21 +23,6 @@ bool radio_init() {
     return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/ikoka_stick_nrf/target.h b/variants/ikoka_stick_nrf/target.h
index b36c8393..46b05e8b 100644
--- a/variants/ikoka_stick_nrf/target.h
+++ b/variants/ikoka_stick_nrf/target.h
@@ -22,8 +22,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini
index b82ceb7e..27cf809e 100644
--- a/variants/keepteen_lt1/platformio.ini
+++ b/variants/keepteen_lt1/platformio.ini
@@ -17,7 +17,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/sensors>
   +<../variants/keepteen_lt1>
 lib_deps= ${nrf52_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit SSD1306 @ ^2.5.13
   stevemarple/MicroNMEA @ ^2.0.6
 
 [env:KeepteenLT1_repeater]
@@ -99,4 +99,9 @@ build_src_filter = ${KeepteenLT1.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps = ${KeepteenLT1.lib_deps}
   adafruit/RTClib @ ^2.1.3
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:KeepteenLT1_kiss_modem]
+extends = KeepteenLT1
+build_src_filter = ${KeepteenLT1.build_src_filter}
+  +<../examples/kiss_modem/>
\ No newline at end of file
diff --git a/variants/keepteen_lt1/target.cpp b/variants/keepteen_lt1/target.cpp
index 762419c3..f1879ac5 100644
--- a/variants/keepteen_lt1/target.cpp
+++ b/variants/keepteen_lt1/target.cpp
@@ -29,21 +29,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/keepteen_lt1/target.h b/variants/keepteen_lt1/target.h
index a37ac8ff..5b73bb66 100644
--- a/variants/keepteen_lt1/target.h
+++ b/variants/keepteen_lt1/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
index 1fefcece..54990117 100644
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -173,3 +173,8 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
 lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T3S3_sx1262_kiss_modem]
+extends = LilyGo_T3S3_sx1262
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_t3s3/target.cpp b/variants/lilygo_t3s3/target.cpp
index a6a24369..34df31c3 100644
--- a/variants/lilygo_t3s3/target.cpp
+++ b/variants/lilygo_t3s3/target.cpp
@@ -27,21 +27,6 @@ bool radio_init() {
   return radio.std_init(&spi);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h
index 7db1b664..965cdd1a 100644
--- a/variants/lilygo_t3s3/target.h
+++ b/variants/lilygo_t3s3/target.h
@@ -23,8 +23,5 @@ extern SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini
index 5a7ece2c..5df63202 100644
--- a/variants/lilygo_t3s3_sx1276/platformio.ini
+++ b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -168,4 +168,9 @@ build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${LilyGo_T3S3_sx1276.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T3S3_sx1276_kiss_modem]
+extends = LilyGo_T3S3_sx1276
+build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_t3s3_sx1276/target.cpp b/variants/lilygo_t3s3_sx1276/target.cpp
index e7fe07a0..020ef54a 100644
--- a/variants/lilygo_t3s3_sx1276/target.cpp
+++ b/variants/lilygo_t3s3_sx1276/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_t3s3_sx1276/target.h b/variants/lilygo_t3s3_sx1276/target.h
index 2df4b3ed..460b7ac1 100644
--- a/variants/lilygo_t3s3_sx1276/target.h
+++ b/variants/lilygo_t3s3_sx1276/target.h
@@ -23,7 +23,4 @@ extern SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
\ No newline at end of file
diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini
index 947d7bd4..1debbeb8 100644
--- a/variants/lilygo_tbeam_1w/platformio.ini
+++ b/variants/lilygo_tbeam_1w/platformio.ini
@@ -195,3 +195,8 @@ build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_1W.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:LilyGo_TBeam_1W_kiss_modem]
+extends = LilyGo_TBeam_1W
+build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tbeam_1w/target.cpp b/variants/lilygo_tbeam_1w/target.cpp
index 99a80e89..6ec6fba7 100644
--- a/variants/lilygo_tbeam_1w/target.cpp
+++ b/variants/lilygo_tbeam_1w/target.cpp
@@ -47,21 +47,6 @@ bool radio_init() {
   return success;
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);
diff --git a/variants/lilygo_tbeam_1w/target.h b/variants/lilygo_tbeam_1w/target.h
index 70d2744e..07d60cab 100644
--- a/variants/lilygo_tbeam_1w/target.h
+++ b/variants/lilygo_tbeam_1w/target.h
@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 SPIClass* getBoardSharedArchiveSPI();
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini
index d3bc7c99..77b39304 100644
--- a/variants/lilygo_tbeam_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_SX1262/platformio.ini
@@ -133,3 +133,8 @@ build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_SX1262.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Tbeam_SX1262_kiss_modem]
+extends = LilyGo_TBeam_SX1262
+build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp
index 91a1ed9b..6e5292a7 100644
--- a/variants/lilygo_tbeam_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_SX1262/target.cpp
@@ -34,21 +34,6 @@ bool radio_init() {
   return radio.std_init(&spi);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h
index 691c01d4..c532a73a 100644
--- a/variants/lilygo_tbeam_SX1262/target.h
+++ b/variants/lilygo_tbeam_SX1262/target.h
@@ -23,8 +23,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini
index 3562c40e..6853a232 100644
--- a/variants/lilygo_tbeam_SX1276/platformio.ini
+++ b/variants/lilygo_tbeam_SX1276/platformio.ini
@@ -131,3 +131,8 @@ build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_SX1276.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Tbeam_SX1276_kiss_modem]
+extends = LilyGo_TBeam_SX1276
+build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tbeam_SX1276/target.cpp b/variants/lilygo_tbeam_SX1276/target.cpp
index 495337b8..94cc3d6d 100644
--- a/variants/lilygo_tbeam_SX1276/target.cpp
+++ b/variants/lilygo_tbeam_SX1276/target.cpp
@@ -39,21 +39,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_tbeam_SX1276/target.h b/variants/lilygo_tbeam_SX1276/target.h
index ad385645..1c709905 100644
--- a/variants/lilygo_tbeam_SX1276/target.h
+++ b/variants/lilygo_tbeam_SX1276/target.h
@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
\ No newline at end of file
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
index ffee37a9..845dd415 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -158,3 +158,8 @@ build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
 lib_deps =
   ${T_Beam_S3_Supreme_SX1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:T_Beam_S3_Supreme_SX1262_kiss_modem]
+extends = T_Beam_S3_Supreme_SX1262
+build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp
index 589a4348..cfb3e620 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp
@@ -32,21 +32,6 @@ bool radio_init() {
   return radio.std_init(&spi);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.h b/variants/lilygo_tbeam_supreme_SX1262/target.h
index 901c0715..25caa711 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/target.h
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.h
@@ -21,7 +21,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini
index a8408afa..745d8ff5 100644
--- a/variants/lilygo_tdeck/platformio.ini
+++ b/variants/lilygo_tdeck/platformio.ini
@@ -57,6 +57,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_tdeck>
   +<helpers/sensors/*.cpp>
+  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   ${sensor_base.lib_deps}
@@ -75,7 +76,6 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -94,7 +94,6 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-  +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -113,4 +112,9 @@ build_src_filter = ${LilyGo_TDeck.build_src_filter}
   +<helpers/ui/ST7789LCDDisplay.cpp>
 lib_deps =
   ${LilyGo_TDeck.lib_deps}
-  ${esp32_ota.lib_deps}
\ No newline at end of file
+  ${esp32_ota.lib_deps}
+
+[env:LilyGo_TDeck_kiss_modem]
+extends = LilyGo_TDeck
+build_src_filter = ${LilyGo_TDeck.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tdeck/target.cpp b/variants/lilygo_tdeck/target.cpp
index 32586a16..d20c56a3 100644
--- a/variants/lilygo_tdeck/target.cpp
+++ b/variants/lilygo_tdeck/target.cpp
@@ -34,21 +34,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/lilygo_tdeck/target.h b/variants/lilygo_tdeck/target.h
index 75247734..9d35af9b 100644
--- a/variants/lilygo_tdeck/target.h
+++ b/variants/lilygo_tdeck/target.h
@@ -25,7 +25,4 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini
index e2172b1d..5df77f95 100644
--- a/variants/lilygo_techo/platformio.ini
+++ b/variants/lilygo_techo/platformio.ini
@@ -126,3 +126,8 @@ build_src_filter = ${LilyGo_T-Echo.build_src_filter}
 lib_deps =
   ${LilyGo_T-Echo.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo_kiss_modem]
+extends = LilyGo_T-Echo
+build_src_filter = ${LilyGo_T-Echo.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_techo/target.cpp b/variants/lilygo_techo/target.cpp
index 1dfa9164..278fc76d 100644
--- a/variants/lilygo_techo/target.cpp
+++ b/variants/lilygo_techo/target.cpp
@@ -31,21 +31,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_techo/target.h b/variants/lilygo_techo/target.h
index 12b67c1c..2b8a1783 100644
--- a/variants/lilygo_techo/target.h
+++ b/variants/lilygo_techo/target.h
@@ -25,8 +25,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_techo_lite/TechoBoard.cpp b/variants/lilygo_techo_lite/TechoBoard.cpp
index 81d3d0c9..a11d31b2 100644
--- a/variants/lilygo_techo_lite/TechoBoard.cpp
+++ b/variants/lilygo_techo_lite/TechoBoard.cpp
@@ -8,24 +8,47 @@
 void TechoBoard::begin() {
   NRF52Board::begin();
 
+  // Configure battery measurement control BEFORE Wire.begin()
+  // to ensure P0.02 is not claimed by another peripheral
+  pinMode(PIN_VBAT_MEAS_EN, OUTPUT);
+  digitalWrite(PIN_VBAT_MEAS_EN, LOW);
+  pinMode(PIN_VBAT_READ, INPUT);
+
   Wire.begin();
 
   pinMode(SX126X_POWER_EN, OUTPUT);
   digitalWrite(SX126X_POWER_EN, HIGH);
-  delay(10);   // give sx1262 some time to power up
+  delay(10);
 }
 
 uint16_t TechoBoard::getBattMilliVolts() {
-  int adcvalue = 0;
-
+  // Use LilyGo's exact ADC configuration
   analogReference(AR_INTERNAL_3_0);
   analogReadResolution(12);
-  delay(10);
 
-  // ADC range is 0..3000mV and resolution is 12-bit (0..4095)
-  adcvalue = analogRead(PIN_VBAT_READ);
-  // Convert the raw value to compensated mv, taking the resistor-
-  // divider into account (providing the actual LIPO voltage)
-  return (uint16_t)((float)adcvalue * REAL_VBAT_MV_PER_LSB);
+  // Enable battery voltage divider (MOSFET gate on P0.31)
+  pinMode(PIN_VBAT_MEAS_EN, OUTPUT);
+  digitalWrite(PIN_VBAT_MEAS_EN, HIGH);
+
+  // Reclaim P0.02 for analog input (in case another peripheral touched it)
+  pinMode(PIN_VBAT_READ, INPUT);
+  delay(10);  // let divider + ADC settle
+
+  // Read and average (matching LilyGo's approach)
+  uint32_t sum = 0;
+  for (int i = 0; i < 8; i++) {
+    sum += analogRead(PIN_VBAT_READ);
+    delayMicroseconds(100);
+  }
+  uint16_t adc = sum / 8;
+
+  // Disable divider to save power
+  digitalWrite(PIN_VBAT_MEAS_EN, LOW);
+
+  // LilyGo's exact formula: adc * (3000.0 / 4096.0) * 2.0
+  // = adc * 0.73242188 * 2.0 = adc * 1.46484375
+  uint16_t millivolts = (uint16_t)((float)adc * (3000.0f / 4096.0f) * 2.0f);
+
+  return millivolts;
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/variants/lilygo_techo_lite/TechoBoard.h b/variants/lilygo_techo_lite/TechoBoard.h
index fda393e7..7a43fd83 100644
--- a/variants/lilygo_techo_lite/TechoBoard.h
+++ b/variants/lilygo_techo_lite/TechoBoard.h
@@ -4,14 +4,12 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-// built-ins
-#define VBAT_MV_PER_LSB   (0.73242188F)   // 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
-
-#define VBAT_DIVIDER      (0.5F)          // 150K + 150K voltage divider on VBAT
-#define VBAT_DIVIDER_COMP (2.0F)          // Compensation factor for the VBAT divider
-
-#define PIN_VBAT_READ     (4)
-#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+// ============================================================
+// T-Echo Lite battery pins — hardcoded from LilyGo t_echo_lite_config.h
+// NOT using any defines from variant.h for battery measurement
+// ============================================================
+#define PIN_VBAT_READ         _PINNUM(0, 2)   // BATTERY_ADC_DATA
+#define PIN_VBAT_MEAS_EN      _PINNUM(0, 31)  // BATTERY_MEASUREMENT_CONTROL
 
 class TechoBoard : public NRF52BoardDCDC {
 public:
@@ -20,10 +18,11 @@ public:
   uint16_t getBattMilliVolts() override;
 
   const char* getManufacturerName() const override {
-    return "LilyGo T-Echo";
+    return "LilyGo T-Echo Lite";
   }
 
   void powerOff() override {
+    digitalWrite(PIN_VBAT_MEAS_EN, LOW);
     #ifdef LED_RED
     digitalWrite(LED_RED, LOW);
     #endif
@@ -41,4 +40,4 @@ public:
     #endif
     sd_power_system_off();
   }
-};
+};
\ No newline at end of file
diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini
index 0ba6a197..d3408f95 100644
--- a/variants/lilygo_techo_lite/platformio.ini
+++ b/variants/lilygo_techo_lite/platformio.ini
@@ -96,3 +96,52 @@ build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter}
 lib_deps =
   ${LilyGo_T-Echo-Lite.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo-Lite_non_shell_companion_radio_ble]
+extends = LilyGo_T-Echo-Lite
+upload_protocol = nrfutil
+board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
+board_upload.maximum_size = 712704
+build_flags =
+  ${nrf52_base.build_flags}
+  -I variants/lilygo_techo_lite
+  -I src/helpers/nrf52
+  -I lib/nrf52/s140_nrf52_6.1.1_API/include
+  -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
+  -I src/helpers/ui
+  -I examples/companion_radio/ui-new
+  -D LILYGO_TECHO
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+  -D SX126X_POWER_EN=30
+  -D SX126X_CURRENT_LIMIT=140
+  -D SX126X_RX_BOOSTED_GAIN=1
+  -D P_LORA_TX_LED=LED_GREEN
+  -D DISABLE_DIAGNOSTIC_OUTPUT
+  -D ENV_INCLUDE_GPS=1
+  -D GPS_BAUD_RATE=9600
+  -D PIN_GPS_EN=GPS_EN
+  -D AUTO_OFF_MILLIS=0
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D BLE_PIN_CODE=123456
+  -D OFFLINE_QUEUE_SIZE=256
+  -D UI_RECENT_LIST_SIZE=9
+  -D AUTO_SHUTDOWN_MILLIVOLTS=3300
+build_src_filter = ${nrf52_base.build_src_filter}
+  +<helpers/*.cpp>
+  +<TechoBoard.cpp>
+  +<helpers/sensors/EnvironmentSensorManager.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../variants/lilygo_techo_lite>
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio/*.cpp>
+lib_deps =
+  ${LilyGo_T-Echo-Lite.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo-Lite_kiss_modem]
+extends = LilyGo_T-Echo-Lite
+build_src_filter = ${LilyGo_T-Echo-Lite.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_techo_lite/target.cpp b/variants/lilygo_techo_lite/target.cpp
index dbb61b19..95a62fcd 100644
--- a/variants/lilygo_techo_lite/target.cpp
+++ b/variants/lilygo_techo_lite/target.cpp
@@ -30,21 +30,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_techo_lite/target.h b/variants/lilygo_techo_lite/target.h
index 12b67c1c..2b8a1783 100644
--- a/variants/lilygo_techo_lite/target.h
+++ b/variants/lilygo_techo_lite/target.h
@@ -25,8 +25,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_techo_lite/variant.h b/variants/lilygo_techo_lite/variant.h
index 16e0b5cb..07202165 100644
--- a/variants/lilygo_techo_lite/variant.h
+++ b/variants/lilygo_techo_lite/variant.h
@@ -24,7 +24,7 @@
 #define PIN_PWR_EN              _PINNUM(0, 30) // RT9080_EN
 
 #define BATTERY_PIN             _PINNUM(0, 2)
-#define ADC_MULTIPLIER          (4.90F)
+#define ADC_MULTIPLIER          (2.0F)
 
 #define ADC_RESOLUTION          (14)
 #define BATTERY_SENSE_RES       (12)
@@ -47,13 +47,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 // I2C pin definition
 
-#define PIN_WIRE_SDA            _PINNUM(0, 4) // (SDA)
-#define PIN_WIRE_SCL            _PINNUM(0, 2) // (SCL)
+#define PIN_WIRE_SDA            _PINNUM(1, 4) // (SDA) - per LilyGo IIC_1_SDA
+#define PIN_WIRE_SCL            _PINNUM(1, 2) // (SCL) - per LilyGo IIC_1_SCL
 
 ////////////////////////////////////////////////////////////////////////////////
 // SPI pin definition
 
-#define SPI_INTERFACES_COUNT    _PINNUM(0, 2)
+#define SPI_INTERFACES_COUNT    (2)
 
 #define PIN_SPI_MISO            _PINNUM(0, 17) // (MISO)
 #define PIN_SPI_MOSI            _PINNUM(0, 15) // (MOSI)
@@ -149,10 +149,11 @@ extern const int SCK;
 #define PIN_DISPLAY_BUSY        DISP_BUSY
 
 ////////////////////////////////////////////////////////////////////////////////
-// GPS
+// GPS — per LilyGo t_echo_lite_config.h
+// PIN_GPS_TX/RX named from GPS module's perspective
 
-#define PIN_GPS_RX              _PINNUM(1, 13) // RXD
-#define PIN_GPS_TX              _PINNUM(1, 15) // TXD
-#define GPS_EN                  _PINNUM(1, 11) // POWER_RT9080_EN
-#define PIN_GPS_STANDBY         _PINNUM(1, 10)
-#define PIN_GPS_PPS             _PINNUM(0, 29) // 1PPS
+#define PIN_GPS_TX              _PINNUM(0, 29) // GPS UART TX → MCU RX
+#define PIN_GPS_RX              _PINNUM(1, 10) // GPS UART RX ← MCU TX
+#define GPS_EN                  _PINNUM(1, 11) // GPS RT9080 power enable
+#define PIN_GPS_STANDBY         _PINNUM(1, 13) // GPS wake-up
+#define PIN_GPS_PPS             _PINNUM(1, 15) // GPS 1PPS
\ No newline at end of file
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
index b06a0b7c..3acfa761 100644
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -84,3 +84,8 @@ build_src_filter = ${tlora_c6.build_src_filter}
 lib_deps =
   ${tlora_c6.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_Tlora_C6_kiss_modem]
+extends = tlora_c6
+build_src_filter = ${tlora_c6.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tlora_c6/target.cpp b/variants/lilygo_tlora_c6/target.cpp
index a73c1c99..d70e9b79 100644
--- a/variants/lilygo_tlora_c6/target.cpp
+++ b/variants/lilygo_tlora_c6/target.cpp
@@ -27,21 +27,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_tlora_c6/target.h b/variants/lilygo_tlora_c6/target.h
index 0946b58b..81e99ee3 100644
--- a/variants/lilygo_tlora_c6/target.h
+++ b/variants/lilygo_tlora_c6/target.h
@@ -14,8 +14,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini
index 3641f127..f710d070 100644
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -192,3 +192,8 @@ build_flags =
 lib_deps =
   ${LilyGo_TLora_V2_1_1_6.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:LilyGo_TLora_V2_1_1_6_kiss_modem]
+extends = LilyGo_TLora_V2_1_1_6
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/lilygo_tlora_v2_1/target.cpp b/variants/lilygo_tlora_v2_1/target.cpp
index a82c1339..8c120161 100644
--- a/variants/lilygo_tlora_v2_1/target.cpp
+++ b/variants/lilygo_tlora_v2_1/target.cpp
@@ -28,21 +28,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/lilygo_tlora_v2_1/target.h b/variants/lilygo_tlora_v2_1/target.h
index 75823113..fa954b32 100644
--- a/variants/lilygo_tlora_v2_1/target.h
+++ b/variants/lilygo_tlora_v2_1/target.h
@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
\ No newline at end of file
diff --git a/variants/m5stack_unit_c6l/UnitC6LBoard.cpp b/variants/m5stack_unit_c6l/UnitC6LBoard.cpp
index 08c76660..ab192ebe 100644
--- a/variants/m5stack_unit_c6l/UnitC6LBoard.cpp
+++ b/variants/m5stack_unit_c6l/UnitC6LBoard.cpp
@@ -28,21 +28,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini
index 84c6562a..94083eb4 100644
--- a/variants/m5stack_unit_c6l/platformio.ini
+++ b/variants/m5stack_unit_c6l/platformio.ini
@@ -105,3 +105,8 @@ lib_deps =
   ${M5Stack_Unit_C6L.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:M5Stack_Unit_C6L_kiss_modem]
+extends = M5Stack_Unit_C6L
+build_src_filter = ${M5Stack_Unit_C6L.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/m5stack_unit_c6l/target.h b/variants/m5stack_unit_c6l/target.h
index 665850dd..0a959b97 100644
--- a/variants/m5stack_unit_c6l/target.h
+++ b/variants/m5stack_unit_c6l/target.h
@@ -15,7 +15,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
 mesh::LocalIdentity radio_new_identity();
\ No newline at end of file
diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini
index 015c2ca4..52a0d835 100644
--- a/variants/mesh_pocket/platformio.ini
+++ b/variants/mesh_pocket/platformio.ini
@@ -109,4 +109,9 @@ build_src_filter = ${Mesh_pocket.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Mesh_pocket.lib_deps}
-  densaugeo/base64 @ ~1.4.0
\ No newline at end of file
+  densaugeo/base64 @ ~1.4.0
+
+[env:Mesh_pocket_kiss_modem]
+extends = Mesh_pocket
+build_src_filter = ${Mesh_pocket.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/mesh_pocket/target.cpp b/variants/mesh_pocket/target.cpp
index 3ca71463..ee8f944d 100644
--- a/variants/mesh_pocket/target.cpp
+++ b/variants/mesh_pocket/target.cpp
@@ -23,21 +23,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/mesh_pocket/target.h b/variants/mesh_pocket/target.h
index 233721fe..244fe7d2 100644
--- a/variants/mesh_pocket/target.h
+++ b/variants/mesh_pocket/target.h
@@ -24,9 +24,6 @@ extern AutoDiscoverRTCClock rtc_clock;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
 extern SensorManager sensors;
diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini
index 18b64ac3..2006a180 100644
--- a/variants/meshadventurer/platformio.ini
+++ b/variants/meshadventurer/platformio.ini
@@ -29,6 +29,7 @@ build_flags =
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/meshadventurer>
   +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${esp32_base.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
@@ -38,7 +39,6 @@ lib_deps =
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1262
@@ -60,7 +60,6 @@ lib_deps =
 ; build_src_filter = ${Meshadventurer.build_src_filter}
 ;   +<helpers/bridges/RS232Bridge.cpp>
 ;   +<../examples/simple_repeater>
-;   +<helpers/ui/SSD1306Display.cpp>
 ; build_flags =
 ;   ${Meshadventurer.build_flags}
 ;   -D RADIO_CLASS=CustomSX1262
@@ -86,7 +85,6 @@ extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/bridges/ESPNowBridge.cpp>
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1262
@@ -109,7 +107,6 @@ lib_deps =
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1268
@@ -157,7 +154,6 @@ extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/bridges/ESPNowBridge.cpp>
   +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
   -D RADIO_CLASS=CustomSX1268
@@ -179,8 +175,6 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -200,9 +194,7 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -235,7 +227,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -256,7 +247,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   ${esp32_ota.lib_deps}
@@ -264,8 +254,6 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -285,9 +273,7 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio/*.cpp>
   +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
 build_flags =
@@ -320,7 +306,6 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -341,7 +326,24 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Meshadventurer.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/SSD1306Display.cpp>
 lib_deps =
   ${Meshadventurer.lib_deps}
-  ${esp32_ota.lib_deps}
\ No newline at end of file
+  ${esp32_ota.lib_deps}
+
+[env:Meshadventurer_sx1262_kiss_modem]
+extends = Meshadventurer
+build_src_filter = ${Meshadventurer.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags = ${Meshadventurer.build_flags}
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+
+[env:Meshadventurer_sx1268_kiss_modem]
+extends = Meshadventurer
+build_src_filter = ${Meshadventurer.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags = ${Meshadventurer.build_flags}
+  -D RADIO_CLASS=CustomSX1268
+  -D WRAPPER_CLASS=CustomSX1268Wrapper
+  -D LORA_TX_POWER=22
diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp
index c79b0a6e..8795a4cb 100644
--- a/variants/meshadventurer/target.cpp
+++ b/variants/meshadventurer/target.cpp
@@ -30,21 +30,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/meshadventurer/target.h b/variants/meshadventurer/target.h
index f91d2fa7..d59b3aee 100644
--- a/variants/meshadventurer/target.h
+++ b/variants/meshadventurer/target.h
@@ -43,8 +43,5 @@ extern MASensorManager sensors;
 
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini
index 0d5de517..c5439c88 100644
--- a/variants/meshtiny/platformio.ini
+++ b/variants/meshtiny/platformio.ini
@@ -67,3 +67,8 @@ build_src_filter = ${Meshtiny.build_src_filter}
 lib_deps =
   ${Meshtiny.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Meshtiny_kiss_modem]
+extends = Meshtiny
+build_src_filter = ${Meshtiny.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/meshtiny/target.cpp b/variants/meshtiny/target.cpp
index 953c8b3f..50d67826 100644
--- a/variants/meshtiny/target.cpp
+++ b/variants/meshtiny/target.cpp
@@ -26,21 +26,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/meshtiny/target.h b/variants/meshtiny/target.h
index 6dadd566..3987e18c 100644
--- a/variants/meshtiny/target.h
+++ b/variants/meshtiny/target.h
@@ -27,8 +27,5 @@ extern MomentaryButton back_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini
index dacd8d34..49ee9b4d 100644
--- a/variants/minewsemi_me25ls01/platformio.ini
+++ b/variants/minewsemi_me25ls01/platformio.ini
@@ -1,171 +1,151 @@
-; ----------------- NRF52 me25ls01---------------------
-[nrf52840_me25ls01]
-extends = nrf52_base
-platform_packages = framework-arduinoadafruitnrf52
-build_flags = ${nrf52_base.build_flags}
-  -I src/helpers/nrf52
-  -I lib/nrf52/s140_nrf52_7.3.0_API/include
-  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
-lib_ignore =
-  BluetoothOTA
-  lib5b4
-lib_deps =
-  ${nrf52_base.lib_deps}
-  rweather/Crypto @ ^0.4.0
-
-[me25ls01]
-extends = nrf52840_me25ls01
-board = minewsemi_me25ls01
-board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52840_me25ls01.build_flags}
-  -I variants/minewsemi_me25ls01
-  -D me25ls01
-  -D PIN_USER_BTN=27
-  -D PIN_STATUS_LED=39
-  -D P_LORA_TX_LED=22
-  -D RADIO_CLASS=CustomLR1110
-  -D WRAPPER_CLASS=CustomLR1110Wrapper
-  -D LORA_TX_POWER=22
-  -D ENV_INCLUDE_GPS=0
-  -D ENV_INCLUDE_AHTX0=1
-  -D ENV_INCLUDE_BME280=1
-  -D ENV_INCLUDE_INA3221=1
-  -D ENV_INCLUDE_INA219=1
-build_src_filter = ${nrf52840_me25ls01.build_src_filter}
-  +<helpers/*.cpp>
-  +<../variants/minewsemi_me25ls01>
-  +<helpers/sensors>
-debug_tool = jlink
-upload_protocol = nrfutil
-lib_deps = ${nrf52840_me25ls01.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-  stevemarple/MicroNMEA @ ^2.0.6
-  end2endzone/NonBlockingRTTTL@^1.3.0
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-  adafruit/Adafruit INA3221 Library @ ^1.0.1
-  adafruit/Adafruit INA219 @ ^1.2.3
-  adafruit/Adafruit AHTX0 @ ^2.0.5
-  adafruit/Adafruit BME280 Library @ ^2.3.0  
-
-[env:Minewsemi_me25ls01_companion_radio_ble]
-extends = me25ls01
-board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
-board_upload.maximum_size = 708608
-build_flags = ${me25ls01.build_flags}
-  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D RX_BOOSTED_GAIN=true
-  -D RF_SWITCH_TABLE
-  -D DISPLAY_CLASS=NullDisplayDriver
-  ;-D PIN_BUZZER=25
-  ;-D PIN_BUZZER_EN=37      
-build_src_filter = ${me25ls01.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
-lib_deps = ${me25ls01.lib_deps}
-  adafruit/RTClib @ ^2.1.3
- 
-
-[env:Minewsemi_me25ls01_repeater]
-extends = me25ls01
-build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D RX_BOOSTED_GAIN=true
-  -D RF_SWITCH_TABLE
-  -D ADVERT_NAME='"ME25LS01 Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D DISPLAY_CLASS=NullDisplayDriver
-build_src_filter = ${me25ls01.build_src_filter}
-  +<../examples/simple_repeater>
-lib_deps = ${me25ls01.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
-
-
-[env:Minewsemi_me25ls01_room_server]
-extends = me25ls01
-build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D RX_BOOSTED_GAIN=true
-  -D RF_SWITCH_TABLE
-  -D ADVERT_NAME='"ME25LS01 Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D MAX_NEIGHBOURS=50
-  -D DISPLAY_CLASS=NullDisplayDriver
-build_src_filter = ${me25ls01.build_src_filter}
-  +<../examples/simple_room_server>
-lib_deps = ${me25ls01.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
-[env:Minewsemi_me25ls01_terminal_chat]
-extends = me25ls01
-build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D RX_BOOSTED_GAIN=true
-  -D RF_SWITCH_TABLE
-  -D ADVERT_NAME='"ME25LS01 Chat"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D MAX_NEIGHBOURS=50
-  -D DISPLAY_CLASS=NullDisplayDriver
-build_src_filter = ${me25ls01.build_src_filter}
-  +<../examples/simple_secure_chat/main.cpp>
-lib_deps = ${me25ls01.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
-[env:Minewsemi_me25ls01_companion_radio_usb]
-extends = me25ls01
-board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
-board_upload.maximum_size = 708608
-build_flags = ${me25ls01.build_flags}
-  -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  ;-D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D RX_BOOSTED_GAIN=true
-  -D RF_SWITCH_TABLE
-  -D DISPLAY_CLASS=NullDisplayDriver
-build_src_filter = ${me25ls01.build_src_filter}
-  +<helpers/nrf52/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-orig/*.cpp>
-lib_deps = ${me25ls01.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
+[me25ls01]
+extends = nrf52_base
+board = minewsemi_me25ls01
+board_build.ldscript = boards/nrf52840_s140_v7.ld
+build_flags = ${nrf52_base.build_flags}
+  -I src/helpers/nrf52
+  -I lib/nrf52/s140_nrf52_7.3.0_API/include
+  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
+  -I variants/minewsemi_me25ls01
+  -D me25ls01
+  -D PIN_USER_BTN=27
+  -D PIN_STATUS_LED=39
+  -D P_LORA_TX_LED=22
+  -D RADIO_CLASS=CustomLR1110
+  -D WRAPPER_CLASS=CustomLR1110Wrapper
+  -D LORA_TX_POWER=22
+  -D ENV_INCLUDE_GPS=0
+  -D ENV_INCLUDE_AHTX0=1
+  -D ENV_INCLUDE_BME280=1
+  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_INA219=1
+build_src_filter = ${nrf52_base.build_src_filter}
+  +<helpers/*.cpp>
+  +<../variants/minewsemi_me25ls01>
+  +<helpers/sensors>
+debug_tool = jlink
+upload_protocol = nrfutil
+lib_deps = ${nrf52_base.lib_deps}
+  adafruit/RTClib @ ^2.1.3
+  densaugeo/base64 @ ~1.4.0
+  stevemarple/MicroNMEA @ ^2.0.6
+  end2endzone/NonBlockingRTTTL@^1.3.0
+  adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit INA3221 Library @ ^1.0.1
+  adafruit/Adafruit INA219 @ ^1.2.3
+  adafruit/Adafruit AHTX0 @ ^2.0.5
+  adafruit/Adafruit BME280 Library @ ^2.3.0
+
+[env:Minewsemi_me25ls01_companion_radio_ble]
+extends = me25ls01
+board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
+board_upload.maximum_size = 708608
+build_flags = ${me25ls01.build_flags}
+  -I examples/companion_radio/ui-orig
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D RX_BOOSTED_GAIN=true
+  -D RF_SWITCH_TABLE
+  -D DISPLAY_CLASS=NullDisplayDriver
+  ;-D PIN_BUZZER=25
+  ;-D PIN_BUZZER_EN=37
+build_src_filter = ${me25ls01.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-orig/*.cpp>
+
+[env:Minewsemi_me25ls01_repeater]
+extends = me25ls01
+build_flags = ${me25ls01.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D RX_BOOSTED_GAIN=true
+  -D RF_SWITCH_TABLE
+  -D ADVERT_NAME='"ME25LS01 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+  -D DISPLAY_CLASS=NullDisplayDriver
+build_src_filter = ${me25ls01.build_src_filter}
+  +<../examples/simple_repeater>
+
+[env:Minewsemi_me25ls01_room_server]
+extends = me25ls01
+build_flags = ${me25ls01.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+;  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D RX_BOOSTED_GAIN=true
+  -D RF_SWITCH_TABLE
+  -D ADVERT_NAME='"ME25LS01 Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+  -D MAX_NEIGHBOURS=50
+  -D DISPLAY_CLASS=NullDisplayDriver
+build_src_filter = ${me25ls01.build_src_filter}
+  +<../examples/simple_room_server>
+
+[env:Minewsemi_me25ls01_terminal_chat]
+extends = me25ls01
+build_flags = ${me25ls01.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D RX_BOOSTED_GAIN=true
+  -D RF_SWITCH_TABLE
+  -D ADVERT_NAME='"ME25LS01 Chat"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+  -D MAX_NEIGHBOURS=50
+  -D DISPLAY_CLASS=NullDisplayDriver
+build_src_filter = ${me25ls01.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
+
+[env:Minewsemi_me25ls01_companion_radio_usb]
+extends = me25ls01
+board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
+board_upload.maximum_size = 708608
+build_flags = ${me25ls01.build_flags}
+  -I examples/companion_radio/ui-orig
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  ;-D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D RX_BOOSTED_GAIN=true
+  -D RF_SWITCH_TABLE
+  -D DISPLAY_CLASS=NullDisplayDriver
+build_src_filter = ${me25ls01.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-orig/*.cpp>
+
+[env:Minewsemi_me25ls01_kiss_modem]
+extends = me25ls01
+build_src_filter = ${me25ls01.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp
index fcec1941..9944a38b 100644
--- a/variants/minewsemi_me25ls01/target.cpp
+++ b/variants/minewsemi_me25ls01/target.cpp
@@ -77,21 +77,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/minewsemi_me25ls01/target.h b/variants/minewsemi_me25ls01/target.h
index ea7383e2..f8d42863 100644
--- a/variants/minewsemi_me25ls01/target.h
+++ b/variants/minewsemi_me25ls01/target.h
@@ -23,7 +23,4 @@ extern VolatileRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/muziworks_r1_neo/R1NeoBoard.cpp b/variants/muziworks_r1_neo/R1NeoBoard.cpp
index 616d255a..89cde02a 100644
--- a/variants/muziworks_r1_neo/R1NeoBoard.cpp
+++ b/variants/muziworks_r1_neo/R1NeoBoard.cpp
@@ -14,9 +14,12 @@ const PowerMgtConfig power_config = {
 
 void R1NeoBoard::initiateShutdown(uint8_t reason) {
   // Disable LoRa module power before shutdown
-  MESH_DEBUG_PRINTLN("R1Neo: shutting down");
   digitalWrite(SX126X_POWER_EN, LOW);
 
+  // Signal IO controller that MCU is off, then release DCDC latch
+  digitalWrite(PIN_SOFT_SHUTDOWN, LOW);
+  digitalWrite(PIN_DCDC_EN_MCU_HOLD, LOW);
+
   if (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
       reason == SHUTDOWN_REASON_BOOT_PROTECT) {
     configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
diff --git a/variants/muziworks_r1_neo/R1NeoBoard.h b/variants/muziworks_r1_neo/R1NeoBoard.h
index c27ea232..c56f1f5c 100644
--- a/variants/muziworks_r1_neo/R1NeoBoard.h
+++ b/variants/muziworks_r1_neo/R1NeoBoard.h
@@ -18,6 +18,12 @@ public:
   R1NeoBoard() : NRF52Board("R1NEO_OTA") {}
   void begin();
 
+#ifdef NRF52_POWER_MANAGEMENT
+  void powerOff() override {
+    initiateShutdown(SHUTDOWN_REASON_USER);
+  }
+#endif
+
 #if defined(P_LORA_TX_LED)
   void onBeforeTransmit() override {
     digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini
index 39ef8728..3dbecf1e 100644
--- a/variants/muziworks_r1_neo/platformio.ini
+++ b/variants/muziworks_r1_neo/platformio.ini
@@ -130,3 +130,8 @@ build_flags =
   -D MESH_DEBUG=1
 build_src_filter = ${R1Neo.build_src_filter}
   +<../examples/simple_sensor>
+
+[env:R1Neo_kiss_modem]
+extends = R1Neo
+build_src_filter = ${R1Neo.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/muziworks_r1_neo/target.cpp b/variants/muziworks_r1_neo/target.cpp
index de889d43..68655c5d 100644
--- a/variants/muziworks_r1_neo/target.cpp
+++ b/variants/muziworks_r1_neo/target.cpp
@@ -26,21 +26,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/muziworks_r1_neo/target.h b/variants/muziworks_r1_neo/target.h
index 53d7e03b..5bf3f268 100644
--- a/variants/muziworks_r1_neo/target.h
+++ b/variants/muziworks_r1_neo/target.h
@@ -16,7 +16,4 @@ extern DISPLAY_CLASS display;
 extern MomentaryButton user_btn;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini
index 116a1f25..3cdc29ff 100644
--- a/variants/nano_g2_ultra/platformio.ini
+++ b/variants/nano_g2_ultra/platformio.ini
@@ -1,20 +1,11 @@
-[nrf52840_g2_ultra]
+[Nano_G2_Ultra]
 extends = nrf52_base
-platform_packages = framework-arduinoadafruitnrf52
+board = nano-g2-ultra
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
-lib_deps =
-  ${nrf52_base.lib_deps}
-  rweather/Crypto @ ^0.4.0
-  lewisxhe/PCF8563_Library@^1.0.1
-
-[Nano_G2_Ultra]
-extends = nrf52840_g2_ultra
-board = nano-g2-ultra
-board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52840_g2_ultra.build_flags}
   -I variants/nano_g2_ultra
   -D NANO_G2_ULTRA
   -D RADIO_CLASS=CustomSX1262
@@ -23,11 +14,47 @@ build_flags = ${nrf52840_g2_ultra.build_flags}
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D PIN_USER_BTN=38
-build_src_filter = ${nrf52840_g2_ultra.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<../variants/nano_g2_ultra>
 debug_tool = jlink
 upload_protocol = nrfutil
+lib_deps = ${nrf52_base.lib_deps}
+  adafruit/Adafruit SH110X @ ~2.1.13
+  adafruit/Adafruit GFX Library @ ^1.12.1
+  stevemarple/MicroNMEA @ ^2.0.6
+
+[env:Nano_G2_Ultra_repeater]
+extends = Nano_G2_Ultra
+build_flags =
+  ${Nano_G2_Ultra.build_flags}
+  -D DISPLAY_CLASS=SH1106Display
+  -D ADVERT_NAME='"Nano G2 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<helpers/ui/SH1106Display.cpp>
+  +<../examples/simple_repeater>
+
+[env:Nano_G2_Ultra_room_server]
+extends = Nano_G2_Ultra
+build_flags =
+  ${Nano_G2_Ultra.build_flags}
+  -D DISPLAY_CLASS=SH1106Display
+  -D ADVERT_NAME='"Nano G2 Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<helpers/ui/SH1106Display.cpp>
+  +<../examples/simple_room_server>
 
 [env:Nano_G2_Ultra_companion_radio_ble]
 extends = Nano_G2_Ultra
@@ -54,12 +81,8 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Nano_G2_Ultra.lib_deps}
+lib_deps = ${Nano_G2_Ultra.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  adafruit/Adafruit SH110X @ ~2.1.13
-  adafruit/Adafruit GFX Library @ ^1.12.1
-  stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
 
 [env:Nano_G2_Ultra_companion_radio_usb]
@@ -84,10 +107,11 @@ build_src_filter = ${Nano_G2_Ultra.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Nano_G2_Ultra.lib_deps}
+lib_deps = ${Nano_G2_Ultra.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  adafruit/Adafruit SH110X @ ~2.1.13
-  adafruit/Adafruit GFX Library @ ^1.12.1
-  stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:Nano_G2_Ultra_kiss_modem]
+extends = Nano_G2_Ultra
+build_src_filter = ${Nano_G2_Ultra.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp
index 56245ea5..69a2772c 100644
--- a/variants/nano_g2_ultra/target.cpp
+++ b/variants/nano_g2_ultra/target.cpp
@@ -25,21 +25,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 void NanoG2UltraSensorManager::start_gps() {
   MESH_DEBUG_PRINTLN("Starting GPS");
   if (!gps_active) {
diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h
index dcd63791..5c6ebee1 100644
--- a/variants/nano_g2_ultra/target.h
+++ b/variants/nano_g2_ultra/target.h
@@ -43,8 +43,5 @@ extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini
index 80437124..054e9c8b 100644
--- a/variants/nibble_screen_connect/platformio.ini
+++ b/variants/nibble_screen_connect/platformio.ini
@@ -159,3 +159,8 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
+
+[env:nibble_screen_connect_kiss_modem]
+extends = nibble_screen_connect_base
+build_src_filter = ${nibble_screen_connect_base.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/nibble_screen_connect/target.cpp b/variants/nibble_screen_connect/target.cpp
index 5aadd8b2..5011045d 100644
--- a/variants/nibble_screen_connect/target.cpp
+++ b/variants/nibble_screen_connect/target.cpp
@@ -1,49 +1,34 @@
-#include <Arduino.h>
-#include "target.h"
-
-ESP32Board board;
-
-static SPIClass spi;
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
-WRAPPER_CLASS radio_driver(radio, board);
-
-ESP32RTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-#ifndef LORA_CR
-  #define LORA_CR      5
-#endif
-
-bool radio_init() {
-  fallback_clock.begin();
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&spi);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
+#include <Arduino.h>
+#include "target.h"
+
+ESP32Board board;
+
+static SPIClass spi;
+RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;
+
+#ifdef DISPLAY_CLASS
+  DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
+#endif
+
+#ifndef LORA_CR
+  #define LORA_CR      5
+#endif
+
+bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+
+  return radio.std_init(&spi);
+}
+
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);
 }
-
+
diff --git a/variants/nibble_screen_connect/target.h b/variants/nibble_screen_connect/target.h
index 020cd434..965cdd1a 100644
--- a/variants/nibble_screen_connect/target.h
+++ b/variants/nibble_screen_connect/target.h
@@ -1,30 +1,27 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/ESP32Board.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/SensorManager.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-#endif
-
-extern ESP32Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
+#pragma once
+
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/radiolib/RadioLibWrappers.h>
+#include <helpers/ESP32Board.h>
+#include <helpers/radiolib/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>
+#ifdef DISPLAY_CLASS
+  #include <helpers/ui/SSD1306Display.h>
+  #include <helpers/ui/MomentaryButton.h>
+#endif
+
+extern ESP32Board board;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;
+
+#ifdef DISPLAY_CLASS
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+#endif
+
+bool radio_init();
 mesh::LocalIdentity radio_new_identity();
-
+
diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index 317537a9..5415e158 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -27,7 +27,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/sensors>
   +<../variants/promicro>
 lib_deps= ${nrf52_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
+  adafruit/Adafruit SSD1306 @ ^2.5.13
   adafruit/Adafruit INA3221 Library @ ^1.0.1
   adafruit/Adafruit INA219 @ ^1.2.3
   adafruit/Adafruit AHTX0 @ ^2.0.5
@@ -171,3 +171,8 @@ build_src_filter = ${Promicro.build_src_filter}
   +<../examples/simple_sensor>
 lib_deps =
   ${Promicro.lib_deps}
+
+[env:ProMicro_kiss_modem]
+extends = Promicro
+build_src_filter = ${Promicro.build_src_filter}
+  +<../examples/kiss_modem/>
\ No newline at end of file
diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp
index 66c9031a..b5a74c90 100644
--- a/variants/promicro/target.cpp
+++ b/variants/promicro/target.cpp
@@ -29,21 +29,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/promicro/target.h b/variants/promicro/target.h
index 4b3de981..e577ab4e 100644
--- a/variants/promicro/target.h
+++ b/variants/promicro/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index d5537627..3019f9c5 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -132,3 +132,8 @@ build_src_filter = ${rak11310.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${rak11310.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:RAK_11310_kiss_modem]
+extends = rak11310
+build_src_filter = ${rak11310.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rak11310/target.cpp b/variants/rak11310/target.cpp
index 3441a316..1edd315e 100644
--- a/variants/rak11310/target.cpp
+++ b/variants/rak11310/target.cpp
@@ -12,23 +12,6 @@ VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 SensorManager sensors;
 
-bool radio_init() {
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&SPI1);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
 void radio_set_tx_power(int8_t dbm) {
   radio.setOutputPower(dbm);
 }
diff --git a/variants/rak11310/target.h b/variants/rak11310/target.h
index c21274b9..fd38e7ca 100644
--- a/variants/rak11310/target.h
+++ b/variants/rak11310/target.h
@@ -14,8 +14,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini
index b4165bb2..9cd32c4b 100644
--- a/variants/rak3112/platformio.ini
+++ b/variants/rak3112/platformio.ini
@@ -204,3 +204,8 @@ build_src_filter = ${rak3112.build_src_filter}
 lib_deps =
   ${rak3112.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:RAK_3112_kiss_modem]
+extends = rak3112
+build_src_filter = ${rak3112.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rak3112/target.cpp b/variants/rak3112/target.cpp
index a4098601..9df1bf8f 100644
--- a/variants/rak3112/target.cpp
+++ b/variants/rak3112/target.cpp
@@ -39,21 +39,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/rak3112/target.h b/variants/rak3112/target.h
index 72f13f32..f93cd539 100644
--- a/variants/rak3112/target.h
+++ b/variants/rak3112/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini
index 3d2d4a3e..7de3f176 100644
--- a/variants/rak3401/platformio.ini
+++ b/variants/rak3401/platformio.ini
@@ -6,6 +6,7 @@ build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/rak3401
   -D RAK_3401
+  -D RAK_BOARD
   -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
@@ -63,6 +64,8 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak3401.build_flags}
   -I examples/companion_radio/ui-new
+  -D PIN_USER_BTN_ANA=31
+  -D PIN_GPS_EN=-1
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -82,6 +85,8 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak3401.build_flags}
   -I examples/companion_radio/ui-new
+  -D PIN_USER_BTN_ANA=31
+  -D PIN_GPS_EN=-1
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -126,3 +131,8 @@ build_flags =
 build_src_filter = ${rak3401.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_sensor>
+
+[env:RAK_3401_kiss_modem]
+extends = rak3401
+build_src_filter = ${rak3401.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rak3401/target.cpp b/variants/rak3401/target.cpp
index cf7d08ad..5309e6b2 100644
--- a/variants/rak3401/target.cpp
+++ b/variants/rak3401/target.cpp
@@ -37,21 +37,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/rak3401/target.h b/variants/rak3401/target.h
index 215be38c..00653e90 100644
--- a/variants/rak3401/target.h
+++ b/variants/rak3401/target.h
@@ -24,8 +24,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rak3x72/platformio.ini b/variants/rak3x72/platformio.ini
index 12ea413a..f9667860 100644
--- a/variants/rak3x72/platformio.ini
+++ b/variants/rak3x72/platformio.ini
@@ -41,3 +41,8 @@ build_src_filter = ${rak3x72.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps = ${rak3x72.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:RAK_3x72_kiss_modem]
+extends = rak3x72
+build_src_filter = ${rak3x72.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rak3x72/target.cpp b/variants/rak3x72/target.cpp
index 48e7f422..e55543a3 100644
--- a/variants/rak3x72/target.cpp
+++ b/variants/rak3x72/target.cpp
@@ -55,21 +55,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/rak3x72/target.h b/variants/rak3x72/target.h
index 3ba1cf42..566f4fa0 100644
--- a/variants/rak3x72/target.h
+++ b/variants/rak3x72/target.h
@@ -50,7 +50,4 @@ extern VolatileRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/rak4631/target.cpp b/variants/rak4631/target.cpp
index 016e3982..a41ba720 100644
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@@ -37,23 +37,7 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
-
diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h
index 51337c53..1529f904 100644
--- a/variants/rak4631/target.h
+++ b/variants/rak4631/target.h
@@ -24,8 +24,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
index 142d93e9..38cc8868 100644
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -147,7 +147,7 @@ extern "C"
 // LoRa radio module pins for RAK4631
 #define  P_LORA_DIO_1 (47)
 #define  P_LORA_NSS (42)
-#define  P_LORA_RESET (-1)
+#define  P_LORA_RESET (38)
 #define  P_LORA_BUSY (46)
 #define  P_LORA_SCLK (43)
 #define  P_LORA_MISO (45)
diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini
index 081cb0d0..29124daf 100644
--- a/variants/rak_wismesh_tag/platformio.ini
+++ b/variants/rak_wismesh_tag/platformio.ini
@@ -118,4 +118,9 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/simple_sensor>
\ No newline at end of file
+  +<../examples/simple_sensor>
+
+[env:RAK_WisMesh_Tag_kiss_modem]
+extends = rak_wismesh_tag
+build_src_filter = ${rak_wismesh_tag.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rak_wismesh_tag/target.cpp b/variants/rak_wismesh_tag/target.cpp
index 7aa20c1d..cdf81f4f 100644
--- a/variants/rak_wismesh_tag/target.cpp
+++ b/variants/rak_wismesh_tag/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/rak_wismesh_tag/target.h b/variants/rak_wismesh_tag/target.h
index bc5a4921..fbe18d2d 100644
--- a/variants/rak_wismesh_tag/target.h
+++ b/variants/rak_wismesh_tag/target.h
@@ -21,8 +21,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini
index 2d261b25..9253d36f 100644
--- a/variants/rpi_picow/platformio.ini
+++ b/variants/rpi_picow/platformio.ini
@@ -106,3 +106,8 @@ build_src_filter = ${rpi_picow.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${rpi_picow.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:PicoW_kiss_modem]
+extends = rpi_picow
+build_src_filter = ${rpi_picow.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/rpi_picow/target.cpp b/variants/rpi_picow/target.cpp
index 1166dc46..9318b7f0 100644
--- a/variants/rpi_picow/target.cpp
+++ b/variants/rpi_picow/target.cpp
@@ -18,21 +18,6 @@ bool radio_init() {
   return radio.std_init(&SPI1);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/rpi_picow/target.h b/variants/rpi_picow/target.h
index 255d3067..eb918441 100644
--- a/variants/rpi_picow/target.h
+++ b/variants/rpi_picow/target.h
@@ -14,8 +14,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/sensecap_indicator-espnow/target.cpp b/variants/sensecap_indicator-espnow/target.cpp
index 6674c180..c84d1883 100644
--- a/variants/sensecap_indicator-espnow/target.cpp
+++ b/variants/sensecap_indicator-espnow/target.cpp
@@ -29,18 +29,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return millis() + radio_driver.intID();  // TODO: where to get some entropy?
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  // no-op
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio_driver.setTxPower(dbm);
-}
-
 // NOTE: as we are using the WiFi radio, the ESP_IDF will have enabled hardware RNG:
 //    https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/random.html
 class ESP_RNG : public mesh::RNG {
diff --git a/variants/sensecap_indicator-espnow/target.h b/variants/sensecap_indicator-espnow/target.h
index a56dec7b..dab4575e 100644
--- a/variants/sensecap_indicator-espnow/target.h
+++ b/variants/sensecap_indicator-espnow/target.h
@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/sensecap_solar/SenseCapSolarBoard.cpp b/variants/sensecap_solar/SenseCapSolarBoard.cpp
index d713176d..da7964c9 100644
--- a/variants/sensecap_solar/SenseCapSolarBoard.cpp
+++ b/variants/sensecap_solar/SenseCapSolarBoard.cpp
@@ -49,7 +49,7 @@ void SenseCapSolarBoard::begin() {
 
 #ifdef LED_WHITE
   pinMode(LED_WHITE, OUTPUT);
-  digitalWrite(LED_WHITE, HIGH);
+  digitalWrite(LED_WHITE, LOW);
 #endif
 #ifdef LED_BLUE
   pinMode(LED_BLUE, OUTPUT);
diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini
index aabbcf00..effef38c 100644
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@@ -13,7 +13,7 @@ build_flags = ${nrf52_base.build_flags}
   -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D P_LORA_TX_LED=11
+  -D P_LORA_TX_LED=12
   -D P_LORA_DIO_1=1
   -D P_LORA_RESET=2
   -D P_LORA_BUSY=3
diff --git a/variants/sensecap_solar/target.cpp b/variants/sensecap_solar/target.cpp
index ff706a94..46641517 100644
--- a/variants/sensecap_solar/target.cpp
+++ b/variants/sensecap_solar/target.cpp
@@ -25,21 +25,6 @@ bool radio_init() {
     return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/sensecap_solar/target.h b/variants/sensecap_solar/target.h
index 243c4440..a1c01f13 100644
--- a/variants/sensecap_solar/target.h
+++ b/variants/sensecap_solar/target.h
@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 87e77152..6432b523 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -238,3 +238,8 @@ build_src_filter = ${Station_G2.build_src_filter}
 lib_deps =
   ${Station_G2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Station_G2_kiss_modem]
+extends = Station_G2
+build_src_filter = ${Station_G2.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/station_g2/target.cpp b/variants/station_g2/target.cpp
index 40fa8005..8018c20e 100644
--- a/variants/station_g2/target.cpp
+++ b/variants/station_g2/target.cpp
@@ -40,21 +40,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/station_g2/target.h b/variants/station_g2/target.h
index 9a361025..b4eadbba 100644
--- a/variants/station_g2/target.h
+++ b/variants/station_g2/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini
index 429390c4..fb88e334 100644
--- a/variants/t1000-e/platformio.ini
+++ b/variants/t1000-e/platformio.ini
@@ -117,3 +117,10 @@ lib_deps = ${t1000-e.lib_deps}
   densaugeo/base64 @ ~1.4.0
   stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:t1000e_kiss_modem]
+extends = t1000-e
+build_src_filter = ${t1000-e.build_src_filter}
+  +<../examples/kiss_modem/>
+lib_deps = ${t1000-e.lib_deps}
+  stevemarple/MicroNMEA @ ^2.0.6
diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp
index da8fa48b..42532827 100644
--- a/variants/t1000-e/target.cpp
+++ b/variants/t1000-e/target.cpp
@@ -74,21 +74,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h
index d4e3c02c..db003cc5 100644
--- a/variants/t1000-e/target.h
+++ b/variants/t1000-e/target.h
@@ -41,7 +41,4 @@ extern VolatileRTCClock rtc_clock;
 extern T1000SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini
index 183a5684..e7988823 100644
--- a/variants/tenstar_c3/platformio.ini
+++ b/variants/tenstar_c3/platformio.ini
@@ -161,3 +161,23 @@ build_flags =
 lib_deps =
   ${Tenstar_esp32_C3.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Tenstar_C3_sx1262_kiss_modem]
+extends = Tenstar_esp32_C3
+build_src_filter = ${Tenstar_esp32_C3.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags =
+  ${Tenstar_esp32_C3.build_flags}
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+
+[env:Tenstar_C3_sx1268_kiss_modem]
+extends = Tenstar_esp32_C3
+build_src_filter = ${Tenstar_esp32_C3.build_src_filter}
+  +<../examples/kiss_modem/>
+build_flags =
+  ${Tenstar_esp32_C3.build_flags}
+  -D RADIO_CLASS=CustomSX1268
+  -D WRAPPER_CLASS=CustomSX1268Wrapper
+  -D LORA_TX_POWER=22
diff --git a/variants/tenstar_c3/target.cpp b/variants/tenstar_c3/target.cpp
index 8a0f3f07..909625ed 100644
--- a/variants/tenstar_c3/target.cpp
+++ b/variants/tenstar_c3/target.cpp
@@ -27,21 +27,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/tenstar_c3/target.h b/variants/tenstar_c3/target.h
index c8b49404..a27efac3 100644
--- a/variants/tenstar_c3/target.h
+++ b/variants/tenstar_c3/target.h
@@ -15,7 +15,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini
index 397bf8e3..356edfee 100644
--- a/variants/thinknode_m1/platformio.ini
+++ b/variants/thinknode_m1/platformio.ini
@@ -127,4 +127,9 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   zinggjm/GxEPD2 @ 1.6.2
   bakercp/CRC32 @ ^2.0.0
-  end2endzone/NonBlockingRTTTL@^1.3.0
\ No newline at end of file
+  end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:ThinkNode_M1_kiss_modem]
+extends = ThinkNode_M1
+build_src_filter = ${ThinkNode_M1.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/thinknode_m1/target.cpp b/variants/thinknode_m1/target.cpp
index b2e16283..69306fc0 100644
--- a/variants/thinknode_m1/target.cpp
+++ b/variants/thinknode_m1/target.cpp
@@ -24,21 +24,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h
index 3882202b..ec1297be 100644
--- a/variants/thinknode_m1/target.h
+++ b/variants/thinknode_m1/target.h
@@ -43,8 +43,5 @@ extern ThinkNodeM1SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini
index b65ad41b..dd24e700 100644
--- a/variants/thinknode_m2/platformio.ini
+++ b/variants/thinknode_m2/platformio.ini
@@ -210,3 +210,10 @@ build_src_filter = ${ThinkNode_M2.build_src_filter}
 lib_deps =
   ${ThinkNode_M2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:ThinkNode_M2_kiss_modem]
+extends = ThinkNode_M2
+build_flags = ${ThinkNode_M2.build_flags}
+  -UPIN_BUZZER
+build_src_filter = ${ThinkNode_M2.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/thinknode_m2/target.cpp b/variants/thinknode_m2/target.cpp
index 52afba9c..ff0dd6cf 100644
--- a/variants/thinknode_m2/target.cpp
+++ b/variants/thinknode_m2/target.cpp
@@ -34,22 +34,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/thinknode_m2/target.h b/variants/thinknode_m2/target.h
index ddaaeff7..37ede89e 100644
--- a/variants/thinknode_m2/target.h
+++ b/variants/thinknode_m2/target.h
@@ -24,9 +24,6 @@ extern SensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
 
diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini
index 88fd487a..0a3d4eda 100644
--- a/variants/thinknode_m3/platformio.ini
+++ b/variants/thinknode_m3/platformio.ini
@@ -17,11 +17,11 @@ build_flags = ${nrf52_base.build_flags}
   -D RF_SWITCH_TABLE
   -D RX_BOOSTED_GAIN=true
   -D P_LORA_BUSY=43
-  -D P_LORA_SCLK=45 
+  -D P_LORA_SCLK=45
   -D P_LORA_NSS=44
   -D P_LORA_DIO_1=40
   -D P_LORA_MISO=47
-  -D P_LORA_MOSI=46 
+  -D P_LORA_MOSI=46
   -D P_LORA_RESET=42
   -D P_LORA_TX_LED=PIN_LED_BLUE
   -D P_LORA_TX_LED_ON=LOW
@@ -119,3 +119,10 @@ lib_deps = ${ThinkNode_M3.lib_deps}
   densaugeo/base64 @ ~1.4.0
   stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:ThinkNode_M3_kiss_modem]
+extends = ThinkNode_M3
+build_src_filter = ${ThinkNode_M3.build_src_filter}
+  +<../examples/kiss_modem/>
+lib_deps = ${ThinkNode_M3.lib_deps}
+  stevemarple/MicroNMEA @ ^2.0.6
diff --git a/variants/thinknode_m3/target.cpp b/variants/thinknode_m3/target.cpp
index 7303eb4c..1e6c2ad1 100644
--- a/variants/thinknode_m3/target.cpp
+++ b/variants/thinknode_m3/target.cpp
@@ -78,21 +78,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/thinknode_m3/target.h b/variants/thinknode_m3/target.h
index 4124761c..f2d34328 100644
--- a/variants/thinknode_m3/target.h
+++ b/variants/thinknode_m3/target.h
@@ -23,7 +23,4 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini
index 16df472a..8572d1eb 100644
--- a/variants/thinknode_m5/platformio.ini
+++ b/variants/thinknode_m5/platformio.ini
@@ -227,3 +227,8 @@ lib_deps =
   ${ThinkNode_M5.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:ThinkNode_M5_kiss_modem]
+extends = ThinkNode_M5
+build_src_filter = ${ThinkNode_M5.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/thinknode_m5/target.cpp b/variants/thinknode_m5/target.cpp
index f5f3ecd3..be534f67 100644
--- a/variants/thinknode_m5/target.cpp
+++ b/variants/thinknode_m5/target.cpp
@@ -41,22 +41,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/thinknode_m5/target.h b/variants/thinknode_m5/target.h
index d10760e2..a613e390 100644
--- a/variants/thinknode_m5/target.h
+++ b/variants/thinknode_m5/target.h
@@ -27,9 +27,6 @@ extern PCA9557 expander;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
 
diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini
index 2bd34f31..6fe90436 100644
--- a/variants/thinknode_m6/platformio.ini
+++ b/variants/thinknode_m6/platformio.ini
@@ -116,4 +116,9 @@ build_src_filter = ${ThinkNode_M6.build_src_filter}
 lib_deps =
   ${ThinkNode_M6.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  end2endzone/NonBlockingRTTTL@^1.3.0
\ No newline at end of file
+  end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:ThinkNode_M6_kiss_modem]
+extends = ThinkNode_M6
+build_src_filter = ${ThinkNode_M6.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/thinknode_m6/target.cpp b/variants/thinknode_m6/target.cpp
index b690df18..de167194 100644
--- a/variants/thinknode_m6/target.cpp
+++ b/variants/thinknode_m6/target.cpp
@@ -28,21 +28,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/thinknode_m6/target.h b/variants/thinknode_m6/target.h
index 221e0a7c..76188e58 100644
--- a/variants/thinknode_m6/target.h
+++ b/variants/thinknode_m6/target.h
@@ -25,8 +25,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/tiny_relay/platformio.ini b/variants/tiny_relay/platformio.ini
index ed178727..82cb251f 100644
--- a/variants/tiny_relay/platformio.ini
+++ b/variants/tiny_relay/platformio.ini
@@ -48,3 +48,8 @@ build_src_filter = ${Tiny_Relay.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps = ${Tiny_Relay.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Tiny_Relay_kiss_modem]
+extends = Tiny_Relay
+build_src_filter = ${Tiny_Relay.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/tiny_relay/target.cpp b/variants/tiny_relay/target.cpp
index 313dfaa9..aed8a67c 100644
--- a/variants/tiny_relay/target.cpp
+++ b/variants/tiny_relay/target.cpp
@@ -57,24 +57,6 @@ bool radio_init()
     return true; // success
 }
 
-uint32_t radio_get_rng_seed()
-{
-    return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr)
-{
-    radio.setFrequency(freq);
-    radio.setSpreadingFactor(sf);
-    radio.setBandwidth(bw);
-    radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm)
-{
-    radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity()
 {
     RadioNoiseListener rng(radio);
diff --git a/variants/tiny_relay/target.h b/variants/tiny_relay/target.h
index d1583712..4e2e4afa 100644
--- a/variants/tiny_relay/target.h
+++ b/variants/tiny_relay/target.h
@@ -53,7 +53,4 @@ extern VolatileRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini
index 880f238f..36658d82 100644
--- a/variants/waveshare_rp2040_lora/platformio.ini
+++ b/variants/waveshare_rp2040_lora/platformio.ini
@@ -131,3 +131,8 @@ build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${waveshare_rp2040_lora.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:waveshare_rp2040_lora_kiss_modem]
+extends = waveshare_rp2040_lora
+build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/waveshare_rp2040_lora/target.cpp b/variants/waveshare_rp2040_lora/target.cpp
index 459bf82c..ef47708f 100644
--- a/variants/waveshare_rp2040_lora/target.cpp
+++ b/variants/waveshare_rp2040_lora/target.cpp
@@ -28,21 +28,6 @@ bool radio_init() {
   return radio.std_init(NULL);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/waveshare_rp2040_lora/target.h b/variants/waveshare_rp2040_lora/target.h
index 4590f0d1..a090931c 100644
--- a/variants/waveshare_rp2040_lora/target.h
+++ b/variants/waveshare_rp2040_lora/target.h
@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/wio-e5-dev/platformio.ini b/variants/wio-e5-dev/platformio.ini
index d7e63c83..22bdc3c8 100644
--- a/variants/wio-e5-dev/platformio.ini
+++ b/variants/wio-e5-dev/platformio.ini
@@ -5,6 +5,8 @@ board_upload.maximum_size = 229376 ; 32kb for FS
 build_flags = ${stm32_base.build_flags}
   -D RADIO_CLASS=CustomSTM32WLx
   -D WRAPPER_CLASS=CustomSTM32WLxWrapper
+  -D LORA_TX_POWER=22
+  -D SX126X_CURRENT_LIMIT=140
   -D SPI_INTERFACES_COUNT=0
   -D RX_BOOSTED_GAIN=true
   -D PIN_SERIAL_RX=PB7
@@ -48,3 +50,8 @@ build_src_filter = ${lora_e5.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps = ${lora_e5.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:wio-e5_kiss_modem]
+extends = lora_e5
+build_src_filter = ${lora_e5.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/wio-e5-dev/target.cpp b/variants/wio-e5-dev/target.cpp
index 3e59b6ce..680da631 100644
--- a/variants/wio-e5-dev/target.cpp
+++ b/variants/wio-e5-dev/target.cpp
@@ -52,21 +52,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/wio-e5-dev/target.h b/variants/wio-e5-dev/target.h
index 1d1fc5cb..5cb2a840 100644
--- a/variants/wio-e5-dev/target.h
+++ b/variants/wio-e5-dev/target.h
@@ -27,7 +27,4 @@ extern VolatileRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini
index f589ea03..82f01331 100644
--- a/variants/wio-e5-mini/platformio.ini
+++ b/variants/wio-e5-mini/platformio.ini
@@ -7,6 +7,8 @@ build_flags = ${stm32_base.build_flags}
   -D WRAPPER_CLASS=CustomSTM32WLxWrapper
   -D SPI_INTERFACES_COUNT=0
   -D RX_BOOSTED_GAIN=true
+  -D LORA_TX_POWER=22
+  -D SX126X_CURRENT_LIMIT=140
   -D P_LORA_TX_LED=LED_RED
   -D PIN_USER_BTN=USER_BTN
   -I variants/wio-e5-mini
@@ -40,10 +42,15 @@ build_flags = ${lora_e5_mini.build_flags}
   -I examples/companion_radio/ui-orig
   -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8  
+  -D MAX_GROUP_CHANNELS=8
   -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${lora_e5_mini.build_src_filter}
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${lora_e5_mini.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:wio-e5-mini_kiss_modem]
+extends = lora_e5_mini
+build_src_filter = ${lora_e5_mini.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/wio-e5-mini/target.cpp b/variants/wio-e5-mini/target.cpp
index 2e95ad6d..92775d55 100644
--- a/variants/wio-e5-mini/target.cpp
+++ b/variants/wio-e5-mini/target.cpp
@@ -50,21 +50,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/wio-e5-mini/target.h b/variants/wio-e5-mini/target.h
index a4e5fb60..4807e0f7 100644
--- a/variants/wio-e5-mini/target.h
+++ b/variants/wio-e5-mini/target.h
@@ -58,7 +58,4 @@ extern VolatileRTCClock rtc_clock;
 extern WIOE5SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini
index 42c83477..2c74bade 100644
--- a/variants/wio-tracker-l1-eink/platformio.ini
+++ b/variants/wio-tracker-l1-eink/platformio.ini
@@ -68,3 +68,8 @@ lib_deps = ${WioTrackerL1Eink.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
 debug_tool=stlink
+
+[env:WioTrackerL1Eink_kiss_modem]
+extends = WioTrackerL1Eink
+build_src_filter = ${WioTrackerL1Eink.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini
index 6c1e8f63..7bb175bb 100644
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@@ -111,3 +111,8 @@ lib_deps = ${WioTrackerL1.lib_deps}
   adafruit/RTClib @ ^2.1.3
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
+
+[env:WioTrackerL1_kiss_modem]
+extends = WioTrackerL1
+build_src_filter = ${WioTrackerL1.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/wio-tracker-l1/target.cpp b/variants/wio-tracker-l1/target.cpp
index 896ead26..7a573258 100644
--- a/variants/wio-tracker-l1/target.cpp
+++ b/variants/wio-tracker-l1/target.cpp
@@ -33,21 +33,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/wio-tracker-l1/target.h b/variants/wio-tracker-l1/target.h
index 72766e77..05bc7ff1 100644
--- a/variants/wio-tracker-l1/target.h
+++ b/variants/wio-tracker-l1/target.h
@@ -31,8 +31,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/wio_wm1110/platformio.ini b/variants/wio_wm1110/platformio.ini
index ec65e706..a7eac916 100644
--- a/variants/wio_wm1110/platformio.ini
+++ b/variants/wio_wm1110/platformio.ini
@@ -84,3 +84,8 @@ build_src_filter = ${wio_wm1110.build_src_filter}
 lib_deps =
   ${wio_wm1110.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:wio_wm1110_kiss_modem]
+extends = wio_wm1110
+build_src_filter = ${wio_wm1110.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/wio_wm1110/target.cpp b/variants/wio_wm1110/target.cpp
index 457d5bda..1bb7cec8 100644
--- a/variants/wio_wm1110/target.cpp
+++ b/variants/wio_wm1110/target.cpp
@@ -70,21 +70,6 @@ bool radio_init() {
   return true;  // success
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/wio_wm1110/target.h b/variants/wio_wm1110/target.h
index 8712a0ef..79504ab8 100644
--- a/variants/wio_wm1110/target.h
+++ b/variants/wio_wm1110/target.h
@@ -14,8 +14,5 @@ extern VolatileRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index c5254b46..c0e8458d 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -128,3 +128,8 @@ lib_deps =
   ${Xiao_esp32_C3.lib_deps}
   ${esp32_ota.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Xiao_C3_kiss_modem]
+extends = Xiao_esp32_C3
+build_src_filter = ${Xiao_esp32_C3.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/xiao_c3/target.cpp b/variants/xiao_c3/target.cpp
index d6645f87..7f30dc8b 100644
--- a/variants/xiao_c3/target.cpp
+++ b/variants/xiao_c3/target.cpp
@@ -35,21 +35,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/xiao_c3/target.h b/variants/xiao_c3/target.h
index 54a389f0..32f11862 100644
--- a/variants/xiao_c3/target.h
+++ b/variants/xiao_c3/target.h
@@ -14,8 +14,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/xiao_c6/XiaoC6Board.cpp b/variants/xiao_c6/XiaoC6Board.cpp
index 5710c4cc..dc62c20e 100644
--- a/variants/xiao_c6/XiaoC6Board.cpp
+++ b/variants/xiao_c6/XiaoC6Board.cpp
@@ -37,6 +37,7 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
   radio.setSpreadingFactor(sf);
   radio.setBandwidth(bw);
   radio.setCodingRate(cr);
+  radio_driver.updatePreamble(sf);
 }
 
 void radio_set_tx_power(int8_t dbm) {
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index 717be7b9..9f504b8e 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -184,3 +184,8 @@ build_src_filter = ${WHY2025_badge.build_src_filter}
 lib_deps =
   ${WHY2025_badge.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Xiao_C6_kiss_modem]
+extends = Xiao_C6
+build_src_filter = ${Xiao_C6.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/xiao_c6/target.h b/variants/xiao_c6/target.h
index 4ec06ee1..c4cec063 100644
--- a/variants/xiao_c6/target.h
+++ b/variants/xiao_c6/target.h
@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/xiao_nrf52/target.cpp b/variants/xiao_nrf52/target.cpp
index 4d7d5912..ab6fe279 100644
--- a/variants/xiao_nrf52/target.cpp
+++ b/variants/xiao_nrf52/target.cpp
@@ -23,21 +23,6 @@ bool radio_init() {
   return radio.std_init(&SPI);
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/xiao_nrf52/target.h b/variants/xiao_nrf52/target.h
index 956e8362..bb3d2a81 100644
--- a/variants/xiao_nrf52/target.h
+++ b/variants/xiao_nrf52/target.h
@@ -20,8 +20,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini
index e5d652c3..9a0fdaf4 100644
--- a/variants/xiao_rp2040/platformio.ini
+++ b/variants/xiao_rp2040/platformio.ini
@@ -108,3 +108,8 @@ build_src_filter = ${Xiao_rp2040.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
 lib_deps = ${Xiao_rp2040.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Xiao_rp2040_kiss_modem]
+extends = Xiao_rp2040
+build_src_filter = ${Xiao_rp2040.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/xiao_rp2040/target.cpp b/variants/xiao_rp2040/target.cpp
index b3756480..fe2c62c3 100644
--- a/variants/xiao_rp2040/target.cpp
+++ b/variants/xiao_rp2040/target.cpp
@@ -28,21 +28,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
diff --git a/variants/xiao_rp2040/target.h b/variants/xiao_rp2040/target.h
index 94629b7c..6f035bda 100644
--- a/variants/xiao_rp2040/target.h
+++ b/variants/xiao_rp2040/target.h
@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
diff --git a/variants/xiao_s3/XiaoS3Board.h b/variants/xiao_s3/XiaoS3Board.h
new file mode 100644
index 00000000..288fcf62
--- /dev/null
+++ b/variants/xiao_s3/XiaoS3Board.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Arduino.h>
+#include <helpers/ESP32Board.h>
+
+class XiaoS3Board : public ESP32Board {
+public:
+  XiaoS3Board() { }
+
+  const char* getManufacturerName() const override {
+    return "Xiao S3";
+  }
+};
diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini
new file mode 100644
index 00000000..bc000220
--- /dev/null
+++ b/variants/xiao_s3/platformio.ini
@@ -0,0 +1,154 @@
+[Xiao_S3]
+extends = esp32_base
+board = seeed_xiao_esp32s3
+board_check = true
+board_build.mcu = esp32s3
+build_flags = ${esp32_base.build_flags}
+  ${sensor_base.build_flags}
+  -I variants/xiao_s3
+  -UENV_INCLUDE_GPS
+  -D SEEED_XIAO_S3
+  -D PIN_VBAT_READ=1   ; D0
+  -D P_LORA_DIO_1=2    ; D1
+  -D P_LORA_NSS=5      ; D4
+  -D P_LORA_RESET=3    ; D2
+  -D P_LORA_BUSY=4     ; D3
+  -D P_LORA_SCLK=7     ; D8
+  -D P_LORA_MISO=8     ; D0
+  -D P_LORA_MOSI=9     ; D10
+  -D PIN_USER_BTN=-1   ; NC
+  -D PIN_STATUS_LED=21 ; Orange user led, LOW=On
+  -D PIN_BOARD_SDA=D6  ; D6=43
+  -D PIN_BOARD_SCL=D7  ; D7=44
+  -D SX126X_RXEN=6     ; D5
+  -D SX126X_TXEN=RADIOLIB_NC
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  -D SX126X_CURRENT_LIMIT=140
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+  -D SX126X_RX_BOOSTED_GAIN=1
+build_src_filter = ${esp32_base.build_src_filter}
+  +<../variants/xiao_s3>
+  +<helpers/sensors>
+lib_deps =
+  ${esp32_base.lib_deps}
+  ${sensor_base.lib_deps}
+
+[env:Xiao_S3_repeater]
+extends = Xiao_S3
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<../examples/simple_repeater/*.cpp>
+build_flags =
+  ${Xiao_S3.build_flags}
+  -D ADVERT_NAME='"Xiao S3 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Xiao_S3_repeater_bridge_espnow]
+extends = Xiao_S3
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<helpers/bridges/ESPNowBridge.cpp>
+  +<../examples/simple_repeater/*.cpp>
+build_flags =
+  ${Xiao_S3.build_flags}
+  -D ADVERT_NAME='"ESPNow Bridge"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+  -D WITH_ESPNOW_BRIDGE=1
+;  -D BRIDGE_DEBUG=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Xiao_S3_room_server]
+extends = Xiao_S3
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<../examples/simple_room_server>
+build_flags =
+  ${Xiao_S3.build_flags}
+  -D ADVERT_NAME='"Xiao S3 Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Xiao_S3_companion_radio_ble]
+extends = Xiao_S3
+build_flags =
+  ${Xiao_S3.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D BLE_PIN_CODE=123456
+  -D DISPLAY_CLASS=SSD1306Display
+  -D OFFLINE_QUEUE_SIZE=256
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  adafruit/Adafruit SSD1306 @ ^2.5.13
+
+[env:Xiao_S3_companion_radio_usb]
+extends = Xiao_S3
+build_flags =
+  ${Xiao_S3.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D DISPLAY_CLASS=SSD1306Display
+  -D OFFLINE_QUEUE_SIZE=256
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+  adafruit/Adafruit SSD1306 @ ^2.5.13
+
+[env:Xiao_S3_sensor]
+extends = Xiao_S3
+build_src_filter = ${Xiao_S3.build_src_filter}
+  +<../examples/simple_sensor>
+build_flags =
+  ${Xiao_S3.build_flags}
+  -D ADVERT_NAME='"Xiao S3 Sensor"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+lib_deps =
+  ${Xiao_S3.lib_deps}
+  ${esp32_ota.lib_deps}
\ No newline at end of file
diff --git a/variants/xiao_s3/target.cpp b/variants/xiao_s3/target.cpp
new file mode 100644
index 00000000..a7ae7dd8
--- /dev/null
+++ b/variants/xiao_s3/target.cpp
@@ -0,0 +1,41 @@
+#include <Arduino.h>
+#include "target.h"
+
+XiaoS3Board board;
+
+#if defined(P_LORA_SCLK)
+  static SPIClass spi;
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
+#else
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
+#endif
+
+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+EnvironmentSensorManager sensors;
+
+#ifdef DISPLAY_CLASS
+  DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
+#endif
+
+bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  pinMode(21, INPUT);
+  pinMode(48, OUTPUT);
+
+  #if defined(P_LORA_SCLK)
+  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
+  return radio.std_init(&spi);
+#else
+  return radio.std_init();
+#endif
+}
+
+mesh::LocalIdentity radio_new_identity() {
+  RadioNoiseListener rng(radio);
+  return mesh::LocalIdentity(&rng);  // create new random identity
+}
diff --git a/variants/xiao_s3/target.h b/variants/xiao_s3/target.h
new file mode 100644
index 00000000..27eddd84
--- /dev/null
+++ b/variants/xiao_s3/target.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/radiolib/RadioLibWrappers.h>
+#include <helpers/ESP32Board.h>
+#include <helpers/radiolib/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/sensors/EnvironmentSensorManager.h>
+#ifdef DISPLAY_CLASS
+  #include <helpers/ui/SSD1306Display.h>
+  #include <helpers/ui/MomentaryButton.h>
+#endif
+#include "XiaoS3Board.h"
+
+extern XiaoS3Board board;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;
+extern EnvironmentSensorManager sensors;
+
+#ifdef DISPLAY_CLASS
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+#endif
+
+bool radio_init();
+mesh::LocalIdentity radio_new_identity();
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index 13d40679..db8c5a94 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -234,3 +234,8 @@ build_flags =
 lib_deps =
   ${Xiao_S3_WIO.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:Xiao_S3_WIO_kiss_modem]
+extends = Xiao_S3_WIO
+build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+  +<../examples/kiss_modem/>
diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp
index 42356b0e..8a975959 100644
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@@ -35,21 +35,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h
index d8502863..29c5f281 100644
--- a/variants/xiao_s3_wio/target.h
+++ b/variants/xiao_s3_wio/target.h
@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();