diff --git a/.github/actions/build-variant/action.yml b/.github/actions/build-variant/action.yml
index 2f0883fad..67d002eea 100644
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -43,6 +43,13 @@ runs:
       id: base
       uses: ./.github/actions/setup-base
 
+    - name: Get web ui version
+      if: inputs.include-web-ui == 'true'
+      id: webver
+      shell: bash
+      run: |
+        echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
+
     - name: Pull web ui
       if: inputs.include-web-ui == 'true'
       uses: dsaltares/fetch-gh-release-asset@master
@@ -51,7 +58,7 @@ runs:
         file: build.tar
         target: build.tar
         token: ${{ inputs.github_token }}
-        version: tags/v2.5.3
+        version: tags/v${{ steps.webver.outputs.ver }}
 
     - name: Unpack web ui
       if: inputs.include-web-ui == 'true'
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index aeb0a1b43..3aa9628fc 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,14 +9,14 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.20
+    - trufflehog@3.88.23
     - yamllint@1.37.0
     - bandit@1.8.3
-    - checkov@3.2.396
+    - checkov@3.2.398
     - terrascan@1.19.9
     - trivy@0.61.0
     - taplo@0.9.3
-    - ruff@0.11.2
+    - ruff@0.11.4
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4
diff --git a/Dockerfile b/Dockerfile
index 733a46325..55580c579 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV TZ=Etc/UTC
 # Install Dependencies
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
-        wget g++ zip git ca-certificates \
+        curl wget g++ zip git ca-certificates \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
@@ -27,6 +27,12 @@ COPY . /tmp/firmware
 RUN bash ./bin/build-native.sh && \
     cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"
 
+# Fetch web assets
+RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/firmware/bin/web.version)/build.tar" -o /tmp/web.tar \
+    && mkdir -p /tmp/web \
+    && tar -xf /tmp/web.tar -C /tmp/web/ \
+    && gzip -dr /tmp/web \
+    && rm /tmp/web.tar
 
 ##### PRODUCTION BUILD #############
 
@@ -46,6 +52,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
 
 # Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
+COPY --from=builder /tmp/web /usr/share/meshtasticd/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d
 
@@ -54,7 +61,9 @@ VOLUME /var/lib/meshtasticd
 
 # Expose Meshtastic TCP API port from the host
 EXPOSE 4403
+# Expose Meshtastic Web UI port from the host
+EXPOSE 443
 
 CMD [ "sh", "-cx", "meshtasticd -d /var/lib/meshtasticd" ]
 
-HEALTHCHECK NONE
\ No newline at end of file
+HEALTHCHECK NONE
diff --git a/bin/device-install.sh b/bin/device-install.sh
index bacf48f69..796626a9d 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -138,7 +138,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 
 	# littlefs* offset for BigDB 8mb and OTA OFFSET.
 	for variant in "${BIGDB_8MB[@]}"; do
-		if [ -n "${FILENAME##*"$variant"*}" ]; then
+		if [ -z "${FILENAME##*"$variant"*}" ]; then
 			OFFSET=0x670000
 			OTA_OFFSET=0x340000
 		fi
@@ -146,7 +146,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 
 	# littlefs* offset for BigDB 16mb and OTA OFFSET.
 	for variant in "${BIGDB_16MB[@]}"; do
-		if [ -n "${FILENAME##*"$variant"*}" ]; then
+		if [ -z "${FILENAME##*"$variant"*}" ]; then
 			OFFSET=0xc90000
 			OTA_OFFSET=0x650000
 		fi
@@ -155,7 +155,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 	# Account for S3 board's different OTA partition
 	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
 	for variant in "${S3_VARIANTS[@]}"; do
-		if [ -n "${FILENAME##*"$variant"*}" ]; then
+		if [ -z "${FILENAME##*"$variant"*}" ]; then
 			MCU="esp32s3"
 		fi
 	done
diff --git a/bin/rpkg.macros b/bin/rpkg.macros
index 2bbb203de..aa036fc33 100644
--- a/bin/rpkg.macros
+++ b/bin/rpkg.macros
@@ -2,6 +2,10 @@ function meshtastic_version {
     meshtastic_version=$(python3 bin/buildinfo.py short)
     echo -n "$meshtastic_version"
 }
+function web_version {
+    web_version=$(cat bin/web.version)
+    echo -n "$web_version"
+}
 function git_commits_num {
     total_commits=$(git rev-list --all --count)
     echo -n "$total_commits"
diff --git a/bin/web.version b/bin/web.version
new file mode 100644
index 000000000..914ec9671
--- /dev/null
+++ b/bin/web.version
@@ -0,0 +1 @@
+2.6.0
\ No newline at end of file
diff --git a/boards/heltec_vision_master_e213.json b/boards/heltec_vision_master_e213.json
index bf5fe15ad..152515cf3 100644
--- a/boards/heltec_vision_master_e213.json
+++ b/boards/heltec_vision_master_e213.json
@@ -2,7 +2,8 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv"
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -15,6 +16,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]
diff --git a/boards/heltec_vision_master_e290.json b/boards/heltec_vision_master_e290.json
index 70f7d5f02..b7cbac878 100644
--- a/boards/heltec_vision_master_e290.json
+++ b/boards/heltec_vision_master_e290.json
@@ -2,7 +2,8 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv"
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -15,6 +16,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]
diff --git a/boards/heltec_vision_master_t190.json b/boards/heltec_vision_master_t190.json
index 341e70218..440f76ad0 100644
--- a/boards/heltec_vision_master_t190.json
+++ b/boards/heltec_vision_master_t190.json
@@ -2,7 +2,8 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv"
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_opi"
     },
     "core": "esp32",
     "extra_flags": [
@@ -15,6 +16,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]
diff --git a/boards/seeed-sensecap-indicator.json b/boards/seeed-sensecap-indicator.json
index 0a02fc882..03bff35b5 100644
--- a/boards/seeed-sensecap-indicator.json
+++ b/boards/seeed-sensecap-indicator.json
@@ -18,6 +18,7 @@
     "f_boot": "120000000L",
     "boot": "qio",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [["0x1A86", "0x7523"]],
     "mcu": "esp32s3",
     "variant": "esp32s3"
diff --git a/boards/seeed-xiao-s3.json b/boards/seeed-xiao-s3.json
index 0b7b432a0..6981085dd 100644
--- a/boards/seeed-xiao-s3.json
+++ b/boards/seeed-xiao-s3.json
@@ -15,6 +15,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [["0x2886", "0x0059"]],
     "mcu": "esp32s3",
     "variant": "seeed-xiao-s3"
diff --git a/boards/t-watch-s3.json b/boards/t-watch-s3.json
index 5d4afd322..51bb7cf4b 100644
--- a/boards/t-watch-s3.json
+++ b/boards/t-watch-s3.json
@@ -16,6 +16,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "opi",
     "hwids": [
       ["0x303A", "0x1001"],
       ["0x303A", "0x0002"]
diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh
index a8b2252ae..c0cea0010 100755
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -10,8 +10,9 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
-# Download the latest meshtastic/web release build.tar to `web.tar`
-curl -L https://github.com/meshtastic/web/releases/latest/download/build.tar -o web.tar
+# Download the meshtastic/web release build.tar to `web.tar`
+web_ver=$(cat bin/web.version)
+curl -L "https://github.com/meshtastic/web/releases/download/v$web_ver/build.tar" -o web.tar
 
 package=$(dpkg-parsechangelog --show-field Source)
 
diff --git a/meshtasticd.spec.rpkg b/meshtasticd.spec.rpkg
index a09261056..4d6c9d6f5 100644
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -21,7 +21,7 @@ Summary:        Meshtastic daemon for communicating with Meshtastic devices
 License:        GPL-3.0
 URL:            https://github.com/meshtastic/firmware
 Source0:        {{{ git_dir_pack }}}
-Source1:        https://github.com/meshtastic/web/releases/latest/download/build.tar
+Source1:        https://github.com/meshtastic/web/releases/download/v{{{ web_version }}}/build.tar
 
 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
diff --git a/platformio.ini b/platformio.ini
index 377635873..749aa94c7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui/archive/99171e87a70452395b56cce713a951c1c2964370.zip
+	https://github.com/meshtastic/device-ui/archive/56ef8db7eb4dda44dc0c1ec5828044debbbc6d33.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
diff --git a/protobufs b/protobufs
index 13a3e5dce..5a5ab103d 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 13a3e5dcee25a2d2d4f1fbaba4c091c66d698ca5
+Subproject commit 5a5ab103d2f6aa071fca29417475681a2cec5dcf
diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
index 2363f804c..04200a7df 100644
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -116,46 +116,55 @@ ButtonThread::ButtonThread() : OSThread("Button")
 #endif
 }
 
+void ButtonThread::switchPage()
+{
+#ifdef BUTTON_PIN
+#if !defined(USERPREFS_BUTTON_PIN)
+    if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
+         moduleConfig.canned_message.inputbroker_pin_press) ||
+        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
+        !moduleConfig.canned_message.enabled) {
+        powerFSM.trigger(EVENT_PRESS);
+    }
+#endif
+#if defined(USERPREFS_BUTTON_PIN)
+    if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
+         moduleConfig.canned_message.inputbroker_pin_press) ||
+        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
+        !moduleConfig.canned_message.enabled) {
+        powerFSM.trigger(EVENT_PRESS);
+    }
+#endif
+
+#endif
+#if defined(ARCH_PORTDUINO)
+    if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
+            (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
+        !moduleConfig.canned_message.enabled) {
+        powerFSM.trigger(EVENT_PRESS);
+    }
+#endif
+}
+
+void ButtonThread::sendAdHocPosition()
+{
+    service->refreshLocalMeshNode();
+    auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
+    if (screen) {
+        if (sentPosition)
+            screen->print("Sent ad-hoc position\n");
+        else
+            screen->print("Sent ad-hoc nodeinfo\n");
+        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
+    }
+}
+
 int32_t ButtonThread::runOnce()
 {
     // If the button is pressed we suppress CPU sleep until release
     canSleep = true; // Assume we should not keep the board awake
 
 #if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
-    // #if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
-    //     buzzer_updata();
-    //     if (buttonPressed) {
-    //         buttonPressed = false;            // 清除标志
-    //         LOG_INFO("PIN_BUTTON2 pressed!"); // 串口打印信息
-    //         // off_currentTime = millis();
-    //         while (digitalRead(PIN_BUTTON2) == HIGH) {
-    //             if (cont < 40) {
-    //                 //     unsigned long currentTime = millis(); // 获取当前时间
-    //                 //     if (currentTime - off_currentTime >= 1000) {
-    //                 cont++;
-    //                 //         off_currentTime = currentTime;
-    //                 //     }
-    //                 delay(100);
-    //             } else {
-
-    //                 currentState = OFF;
-    //                 isBuzzing = false;
-    //                 cont = 0;
-    //                 BEEP_STATE = false;
-    //                 analogWrite(M2_buzzer, 0);
-    //                 pinMode(M2_buzzer, INPUT);
-    //                 screen->setOn(false);
-    //                 cont = 0;
-    //                 LOG_INFO("GGGGGGGGGGGGGGGGGGGGGGGGG");
-    //                 pinMode(1, OUTPUT);
-    //                 digitalWrite(1, LOW);
-    //                 pinMode(6, OUTPUT);
-    //                 digitalWrite(6, LOW);
-    //             }
-    //         }
-    //     }
-
-    // #endif
     userButton.tick();
     canSleep &= userButton.isIdle();
 #elif defined(ARCH_PORTDUINO)
@@ -180,32 +189,27 @@ int32_t ButtonThread::runOnce()
             // If a nag notification is running, stop it and prevent other actions
             if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
                 externalNotificationModule->stopNow();
-                return 50;
-            }
-#ifdef BUTTON_PIN
-#if !defined(USERPREFS_BUTTON_PIN)
-            if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-            if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
-#endif
-                 moduleConfig.canned_message.inputbroker_pin_press) ||
-                !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-                !moduleConfig.canned_message.enabled) {
-                powerFSM.trigger(EVENT_PRESS);
-            }
-#endif
-#if defined(ARCH_PORTDUINO)
-            if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
-                    (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
-                !moduleConfig.canned_message.enabled) {
-                powerFSM.trigger(EVENT_PRESS);
+                break;
             }
+#ifdef ELECROW_ThinkNode_M1
+            sendAdHocPosition();
+            break;
 #endif
+            switchPage();
             break;
         }
 
         case BUTTON_EVENT_PRESSED_SCREEN: {
+            LOG_BUTTON("AltPress!");
+#ifdef ELECROW_ThinkNode_M1
+            // If a nag notification is running, stop it and prevent other actions
+            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
+                externalNotificationModule->stopNow();
+                break;
+            }
+            switchPage();
+            break;
+#endif
             // turn screen on or off
             screen_flag = !screen_flag;
             if (screen)
@@ -215,22 +219,18 @@ int32_t ButtonThread::runOnce()
 
         case BUTTON_EVENT_DOUBLE_PRESSED: {
             LOG_BUTTON("Double press!");
-            service->refreshLocalMeshNode();
-            auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
-            if (screen) {
-                if (sentPosition)
-                    screen->print("Sent ad-hoc position\n");
-                else
-                    screen->print("Sent ad-hoc nodeinfo\n");
-                screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-            }
+#ifdef ELECROW_ThinkNode_M1
+            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
+            break;
+#endif
+            sendAdHocPosition();
             break;
         }
 
         case BUTTON_EVENT_MULTI_PRESSED: {
             LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
             switch (multipressClickCount) {
-#if HAS_GPS
+#if HAS_GPS && !defined(ELECROW_ThinkNode_M1)
             // 3 clicks: toggle GPS
             case 3:
                 if (!config.device.disable_triple_click && (gps != nullptr)) {
@@ -239,17 +239,17 @@ int32_t ButtonThread::runOnce()
                         screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
                 }
                 break;
-#elif defined(ELECROW_ThinkNode_M2)
+#elif defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
             case 3:
                 LOG_INFO("3 clicks: toggle buzzer");
                 buzzer_flag = !buzzer_flag;
-                if (buzzer_flag) {
-                    playBeep();
-                }
+                if (!buzzer_flag)
+                    noTone(PIN_BUZZER);
                 break;
+
 #endif
 
-#if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo
+#if defined(USE_EINK) && defined(PIN_EINK_EN) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo
             // 4 clicks: toggle backlight
             case 4:
                 digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
@@ -349,8 +349,12 @@ void ButtonThread::attachButtonInterrupts()
 #endif
 
 #ifdef BUTTON_PIN_ALT
+#ifdef ELECROW_ThinkNode_M2
+    wakeOnIrq(BUTTON_PIN_ALT, RISING);
+#else
     wakeOnIrq(BUTTON_PIN_ALT, FALLING);
 #endif
+#endif
 
 #ifdef BUTTON_PIN_TOUCH
     wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
diff --git a/src/ButtonThread.h b/src/ButtonThread.h
index a8f1f77c3..3af700dd0 100644
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -37,6 +37,9 @@ class ButtonThread : public concurrency::OSThread
     void attachButtonInterrupts();
     void detachButtonInterrupts();
     void storeClickCount();
+    bool isBuzzing() { return buzzer_flag; }
+    void setScreenFlag(bool flag) { screen_flag = flag; }
+    bool getScreenFlag() { return screen_flag; }
 
     // Disconnect and reconnect interrupts for light sleep
 #ifdef ARCH_ESP32
@@ -72,14 +75,12 @@ class ButtonThread : public concurrency::OSThread
 
     static void wakeOnIrq(int irq, int mode);
 
+    static void sendAdHocPosition();
+    static void switchPage();
+
     // IRQ callbacks
     static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
-    static void userButtonPressedScreen()
-    {
-        if (millis() > c_holdOffTime) {
-            btnEvent = BUTTON_EVENT_PRESSED_SCREEN;
-        }
-    }
+    static void userButtonPressedScreen() { btnEvent = BUTTON_EVENT_PRESSED_SCREEN; }
     static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
     static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
     static void userButtonPressedLongStart();
diff --git a/src/Power.cpp b/src/Power.cpp
index 0dec0fc21..f11f8eac3 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -380,6 +380,20 @@ class AnalogBatteryLevel : public HasBatteryLevel
     // if we have a integrated device with a battery, we can assume that the battery is always connected
 #ifdef BATTERY_IMMUTABLE
     virtual bool isBatteryConnect() override { return true; }
+#elif defined(ADC_V)
+    virtual bool isBatteryConnect() override
+    {
+        int lastReading = digitalRead(ADC_V);
+        // 判断值是否变化
+        for (int i = 2; i < 500; i++) {
+            int reading = digitalRead(ADC_V);
+            if (reading != lastReading) {
+                return false; // 有变化，USB供电, 没接电池
+            }
+        }
+
+        return true;
+    }
 #else
     virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }
 #endif
@@ -533,9 +547,6 @@ Power::Power() : OSThread("Power")
 {
     statusHandler = {};
     low_voltage_counter = 0;
-#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
-    low_voltage_counter_led3 = 0;
-#endif
 #ifdef DEBUG_HEAP
     lastheap = memGet.getFreeHeap();
 #endif
@@ -716,9 +727,6 @@ void Power::readPowerStatus()
     const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isChargingNow, batteryVoltageMv, batteryChargePercent);
     LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(),
               powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
-#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
-    power_num = powerStatus2.getBatteryVoltageMv();
-#endif
     newStatus.notifyObservers(&powerStatus2);
 #ifdef DEBUG_HEAP
     if (lastheap != memGet.getFreeHeap()) {
@@ -766,9 +774,6 @@ void Power::readPowerStatus()
     if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
         if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) {
             low_voltage_counter++;
-#if defined(ELECROW_ThinkNode_M1)
-            low_voltage_counter_led3 = low_voltage_counter;
-#endif
             LOG_DEBUG("Low voltage counter: %d/10", low_voltage_counter);
             if (low_voltage_counter > 10) {
 #ifdef ARCH_NRF52
@@ -781,13 +786,7 @@ void Power::readPowerStatus()
             }
         } else {
             low_voltage_counter = 0;
-#if defined(ELECROW_ThinkNode_M1)
-            low_voltage_counter_led3 = low_voltage_counter;
-#endif
         }
-#ifdef POWER_CFG
-        low_voltage_counter_led3 = low_voltage_counter;
-#endif
     }
 }
 
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 41a2ff980..689f5e204 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -12,6 +12,7 @@
 #include "RTC.h"
 #include "Throttle.h"
 #include "buzz.h"
+#include "concurrency/Periodic.h"
 #include "meshUtils.h"
 
 #include "main.h" // pmu_found
@@ -89,6 +90,45 @@ static const char *getGPSPowerStateString(GPSPowerState state)
     }
 }
 
+#ifdef PIN_GPS_SWITCH
+// If we have a hardware switch, define a periodic watcher outside of the GPS runOnce thread, since this can be sleeping
+// idefinitely
+
+int lastState = LOW;
+bool firstrun = true;
+
+static int32_t gpsSwitch()
+{
+    if (gps) {
+        int currentState = digitalRead(PIN_GPS_SWITCH);
+
+        // if the switch is set to zero, disable the GPS Thread
+        if (firstrun)
+            if (currentState == LOW)
+                lastState = HIGH;
+
+        if (currentState != lastState) {
+            if (currentState == LOW) {
+                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
+                if (!firstrun)
+                    playGPSDisableBeep();
+                gps->disable();
+            } else {
+                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
+                if (!firstrun)
+                    playGPSEnableBeep();
+                gps->enable();
+            }
+            lastState = currentState;
+        }
+        firstrun = false;
+    }
+    return 1000;
+}
+
+static concurrency::Periodic *gpsPeriodic;
+#endif
+
 static void UBXChecksum(uint8_t *message, size_t length)
 {
     uint8_t CK_A = 0, CK_B = 0;
@@ -1206,7 +1246,8 @@ GnssModel_t GPS::probe(int serialSpeed)
     delay(20);
     std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B},
                                  {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},
-                                 {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B}};
+                                 {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B},
+                                 {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B}};
     PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500);
 
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
@@ -1389,6 +1430,12 @@ GPS *GPS::createGps()
     pinMode(PIN_GPS_PPS, INPUT);
 #endif
 
+#ifdef PIN_GPS_SWITCH
+    // toggle GPS via external GPIO switch
+    pinMode(PIN_GPS_SWITCH, INPUT);
+    gpsPeriodic = new concurrency::Periodic("GPSSwitch", gpsSwitch);
+#endif
+
 // Currently disabled per issue #525 (TinyGPS++ crash bug)
 // when fixed upstream, can be un-disabled to enable 3D FixType and PDOP
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
diff --git a/src/gps/ubx.h b/src/gps/ubx.h
index d674bed51..0fe2f01fb 100644
--- a/src/gps/ubx.h
+++ b/src/gps/ubx.h
@@ -224,7 +224,7 @@ static const uint8_t _message_GSA[] = {
     0x00,       // Rate for DDC
     0x00,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x00,       // Rate for USB usefull for native linux
+    0x00,       // Rate for USB useful for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };
@@ -258,7 +258,7 @@ static const uint8_t _message_RMC[] = {
     0x00,       // Rate for DDC
     0x01,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x01,       // Rate for USB usefull for native linux
+    0x01,       // Rate for USB useful for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };
@@ -269,7 +269,7 @@ static const uint8_t _message_GGA[] = {
     0x00,       // Rate for DDC
     0x01,       // Rate for UART1
     0x00,       // Rate for UART2
-    0x01,       // Rate for USB, usefull for native linux
+    0x01,       // Rate for USB, useful for native linux
     0x00,       // Rate for SPI
     0x00        // Reserved
 };
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index e27495f54..8075dd468 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if !MESHTASTIC_EXCLUDE_GPS
 #include "GPS.h"
 #endif
+#include "ButtonThread.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "error.h"
@@ -1606,6 +1607,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
     if (on != screenOn) {
         if (on) {
             LOG_INFO("Turn on screen");
+            buttonThread->setScreenFlag(true);
             powerMon->setState(meshtastic_PowerMon_State_Screen_On);
 #ifdef T_WATCH_S3
             PMU->enablePowerOutput(XPOWERS_ALDO2);
@@ -1641,6 +1643,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             setScreensaverFrames(einkScreensaver);
 #endif
             LOG_INFO("Turn off screen");
+            buttonThread->setScreenFlag(false);
 #ifdef ELECROW_ThinkNode_M1
             if (digitalRead(PIN_EINK_EN) == HIGH) {
                 digitalWrite(PIN_EINK_EN, LOW);
diff --git a/src/main.cpp b/src/main.cpp
index fd65830ef..bfbd73a43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -212,6 +212,64 @@ const char *getDeviceName()
     return name;
 }
 
+#if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
+static int32_t ledBlinkCount = 0;
+
+static int32_t elecrowLedBlinker()
+{
+    // are we in alert buzzer mode?
+#if HAS_BUTTON
+    if (buttonThread->isBuzzing()) {
+        // blink LED three times for 3 seconds, then 3 times for a second, with one second pause
+        if (ledBlinkCount % 2) { // odd means LED OFF
+            ledBlink.set(false);
+            ledBlinkCount++;
+            if (ledBlinkCount >= 12)
+                ledBlinkCount = 0;
+            noTone(PIN_BUZZER);
+            return 1000;
+        } else {
+            if (ledBlinkCount < 6) {
+                ledBlink.set(true);
+                tone(PIN_BUZZER, 4000, 3000);
+                ledBlinkCount++;
+                return 3000;
+            } else {
+                ledBlink.set(true);
+                tone(PIN_BUZZER, 4000, 1000);
+                ledBlinkCount++;
+                return 1000;
+            }
+        }
+    } else {
+#endif
+        ledBlinkCount = 0;
+        if (config.device.led_heartbeat_disabled)
+            return 1000;
+
+        static bool ledOn;
+        // remain on when fully charged or discharging above 10%
+        if ((powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 100) ||
+            (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 10)) {
+            ledOn = true;
+        } else {
+            ledOn ^= 1;
+        }
+        ledBlink.set(ledOn);
+        // when charging, blink 0.5Hz square wave rate to indicate that
+        if (powerStatus->getIsCharging()) {
+            return 500;
+        }
+        // Blink rapidly when almost empty or if battery is not connected
+        if ((!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) || !powerStatus->getHasBattery()) {
+            return 250;
+        }
+#if HAS_BUTTON
+    }
+#endif
+    return 1000;
+}
+#else
 static int32_t ledBlinker()
 {
     // Still set up the blinking (heartbeat) interval but skip code path below, so LED will blink if
@@ -227,6 +285,7 @@ static int32_t ledBlinker()
     // have a very sparse duty cycle of LED being on, unless charging, then blink 0.5Hz square wave rate to indicate that
     return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000);
 }
+#endif
 
 uint32_t timeLastPowered = 0;
 
@@ -263,11 +322,6 @@ void printInfo()
 void setup()
 {
 
-#ifdef POWER_CHRG
-    pinMode(POWER_CHRG, OUTPUT);
-    digitalWrite(POWER_CHRG, HIGH);
-#endif
-
 #if defined(PIN_POWER_EN)
     pinMode(PIN_POWER_EN, OUTPUT);
     digitalWrite(PIN_POWER_EN, HIGH);
@@ -278,11 +332,6 @@ void setup()
     digitalWrite(LED_POWER, HIGH);
 #endif
 
-#ifdef POWER_LED
-    pinMode(POWER_LED, OUTPUT);
-    digitalWrite(POWER_LED, HIGH);
-#endif
-
 #ifdef USER_LED
     pinMode(USER_LED, OUTPUT);
     digitalWrite(USER_LED, LOW);
@@ -414,7 +463,12 @@ void setup()
 
     OSThread::setup();
 
+#if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
+    // The ThinkNodes have their own blink logic
+    ledPeriodic = new Periodic("Blink", elecrowLedBlinker);
+#else
     ledPeriodic = new Periodic("Blink", ledBlinker);
+#endif
 
     fsInit();
 
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 9bb63652a..c89abbe74 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -743,6 +743,15 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 100;
     moduleConfig.external_notification.active = true;
 #endif
+#ifdef ELECROW_ThinkNode_M1
+    // Default to Elecrow USER_LED (blue)
+    moduleConfig.external_notification.enabled = true;
+    moduleConfig.external_notification.output = USER_LED;
+    moduleConfig.external_notification.active = true;
+    moduleConfig.external_notification.alert_message = true;
+    moduleConfig.external_notification.output_ms = 1000;
+    moduleConfig.external_notification.nag_timeout = 60;
+#endif
 #ifdef BUTTON_SECONDARY_CANNEDMESSAGES
     // Use a board's second built-in button as input source for canned messages
     moduleConfig.canned_message.enabled = true;
diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
index 848f8df86..edcd7b41c 100644
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -180,14 +180,16 @@ typedef enum _meshtastic_Config_DisplayConfig_DisplayUnits {
 
 /* Override OLED outo detect with this if it fails. */
 typedef enum _meshtastic_Config_DisplayConfig_OledType {
-    /* Default / Auto */
+    /* Default / Autodetect */
     meshtastic_Config_DisplayConfig_OledType_OLED_AUTO = 0,
-    /* Default / Auto */
+    /* Default / Autodetect */
     meshtastic_Config_DisplayConfig_OledType_OLED_SSD1306 = 1,
-    /* Default / Auto */
+    /* Default / Autodetect */
     meshtastic_Config_DisplayConfig_OledType_OLED_SH1106 = 2,
     /* Can not be auto detected but set by proto. Used for 128x128 screens */
-    meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3
+    meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3,
+    /* Can not be auto detected but set by proto. Used for 128x64 screens */
+    meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64 = 4
 } meshtastic_Config_DisplayConfig_OledType;
 
 typedef enum _meshtastic_Config_DisplayConfig_DisplayMode {
@@ -639,8 +641,8 @@ extern "C" {
 #define _meshtastic_Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayUnits)(meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL+1))
 
 #define _meshtastic_Config_DisplayConfig_OledType_MIN meshtastic_Config_DisplayConfig_OledType_OLED_AUTO
-#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107
-#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107+1))
+#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64
+#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64+1))
 
 #define _meshtastic_Config_DisplayConfig_DisplayMode_MIN meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT
 #define _meshtastic_Config_DisplayConfig_DisplayMode_MAX meshtastic_Config_DisplayConfig_DisplayMode_COLOR
diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h
index 69cdd33fe..dcc511ea6 100644
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -242,7 +242,7 @@ typedef struct _meshtastic_AirQualityMetrics {
     /* 10.0um Particle Count */
     bool has_particles_100um;
     uint32_t particles_100um;
-    /* 10.0um Particle Count */
+    /* CO2 concentration in ppm */
     bool has_co2;
     uint32_t co2;
 } meshtastic_AirQualityMetrics;
diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
index ab1e5c922..3c4faac3e 100644
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -109,9 +109,8 @@ void esp32Setup()
     randomSeed(seed);
     */
 
-#ifdef POWER_FULL
-    pinMode(POWER_FULL, INPUT);
-    pinMode(7, INPUT);
+#ifdef ADC_V
+    pinMode(ADC_V, INPUT);
 #endif
 
     LOG_DEBUG("Total heap: %d", ESP.getHeapSize());
diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp
index 53971e95a..9accd2a02 100644
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -235,10 +235,6 @@ void nrf52InitSemiHosting()
 
 void nrf52Setup()
 {
-#ifdef USB_CHECK
-    pinMode(USB_CHECK, INPUT);
-#endif
-
 #ifdef ADC_V
     pinMode(ADC_V, INPUT);
 #endif
@@ -288,7 +284,7 @@ void cpuDeepSleep(uint32_t msecToWake)
 #endif
     // This may cause crashes as debug messages continue to flow.
     Serial.end();
-#ifdef PIN_SERIAL_RX1
+#ifdef PIN_SERIAL1_RX
     Serial1.end();
 #endif
     setBluetoothEnable(false);
diff --git a/src/power.h b/src/power.h
index 97944fef7..e9c0deb7c 100644
--- a/src/power.h
+++ b/src/power.h
@@ -84,11 +84,6 @@ class Power : private concurrency::OSThread
     void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; }
     const uint16_t OCV[11] = {OCV_ARRAY};
 
-#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
-    uint8_t low_voltage_counter_led3;
-    int power_num = 0;
-#endif
-
   protected:
     meshtastic::PowerStatus *statusHandler;
 
diff --git a/variants/ELECROW-ThinkNode-M1/variant.h b/variants/ELECROW-ThinkNode-M1/variant.h
index fc2fddbdf..2e91e378d 100644
--- a/variants/ELECROW-ThinkNode-M1/variant.h
+++ b/variants/ELECROW-ThinkNode-M1/variant.h
@@ -41,16 +41,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-#define PIN_LED1 -1
 #define PIN_LED2 -1
 #define PIN_LED3 -1
 
 // LED
-#define POWER_LED (32 + 6) // red
+#define PIN_LED1 (32 + 6) // red
 #define LED_POWER (32 + 4)
 #define USER_LED (0 + 13) // green
 // USB_CHECK
-#define USB_CHECK (32 + 3)
+#define EXT_PWR_DETECT (32 + 3)
 #define ADC_V (0 + 8)
 
 #define LED_RED PIN_LED3
@@ -59,7 +58,7 @@ extern "C" {
 #define LED_BUILTIN LED_BLUE
 #define LED_CONN PIN_GREEN
 #define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
-#define M1_buzzer (0 + 6)
+#define PIN_BUZZER (0 + 6)
 /*
  * Buttons
  */
@@ -82,6 +81,7 @@ extern "C" {
 static const uint8_t A0 = PIN_A0;
 
 #define ADC_RESOLUTION 14
+#define BATTERY_SENSE_SAMPLES 30
 
 #define PIN_NFC1 (9)
 #define PIN_NFC2 (10)
@@ -159,7 +159,7 @@ External serial flash WP25R1635FZUIL0
 
 #define GPS_THREAD_INTERVAL 50
 
-#define PIN_GPS_PPS (32 + 1) // GPS开关判断
+#define PIN_GPS_SWITCH (32 + 1) // GPS开关判断
 
 #define PIN_SERIAL1_RX GPS_TX_PIN
 #define PIN_SERIAL1_TX GPS_RX_PIN
diff --git a/variants/ELECROW-ThinkNode-M2/variant.h b/variants/ELECROW-ThinkNode-M2/variant.h
index 801d5606f..55f35e498 100644
--- a/variants/ELECROW-ThinkNode-M2/variant.h
+++ b/variants/ELECROW-ThinkNode-M2/variant.h
@@ -1,14 +1,13 @@
 // Status
-#define LED_PIN_POWER 1
-#define BIAS_T_ENABLE LED_PIN_POWER
-#define BIAS_T_VALUE HIGH
+#define LED_PIN 1
 
 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键
 
-#define POWER_CFG
-#define POWER_CHRG 6
-#define POWER_FULL 42
+#define LED_PIN_POWER 6
+#define ADC_V 42
+// USB_CHECK
+#define EXT_PWR_DETECT 7
 
 #define PIN_BUZZER 5
 
diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index f1257a979..ebf013f64 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -11,7 +11,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -39,7 +39,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -67,7 +67,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
diff --git a/variants/tbeam/platformio.ini b/variants/tbeam/platformio.ini
index 85e66c2dd..9049836a3 100644
--- a/variants/tbeam/platformio.ini
+++ b/variants/tbeam/platformio.ini
@@ -8,4 +8,6 @@ lib_deps =
 build_flags = 
   ${esp32_base.build_flags} -D TBEAM_V10  -I variants/tbeam
   -DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely.
+  -DBOARD_HAS_PSRAM
+  -mfix-esp32-psram-cache-issue
 upload_speed = 921600
\ No newline at end of file