diff --git a/src/Power.cpp b/src/Power.cpp
index b2a4ddaaf..b211d760e 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -816,6 +816,9 @@ void Power::shutdown()
 #endif
 #ifdef PIN_LED3
     ledOff(PIN_LED3);
+#endif
+#ifdef LED_NOTIFICATION
+    ledOff(LED_NOTIFICATION);
 #endif
     doDeepSleep(DELAY_FOREVER, true, true);
 #elif defined(ARCH_PORTDUINO)
diff --git a/src/configuration.h b/src/configuration.h
index f7b438272..0a0525fe5 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -428,12 +428,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define HAS_RGB_LED
 #endif
 
-#ifndef LED_STATE_OFF
-#define LED_STATE_OFF 0
-#endif
 #ifndef LED_STATE_ON
 #define LED_STATE_ON 1
 #endif
+#ifndef LED_STATE_OFF
+#define LED_STATE_OFF (LED_STATE_ON ^ 1)
+#endif
 
 // default mapping of pins
 #if defined(PIN_BUTTON2) && !defined(CANCEL_BUTTON_PIN)
diff --git a/src/main.cpp b/src/main.cpp
index 68eda2d0d..d9773dfb9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -354,9 +354,9 @@ void setup()
     digitalWrite(LED_POWER, LED_STATE_ON);
 #endif
 
-#ifdef USER_LED
-    pinMode(USER_LED, OUTPUT);
-    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+#ifdef LED_NOTIFICATION
+    pinMode(LED_NOTIFICATION, OUTPUT);
+    digitalWrite(LED_NOTIFICATION, HIGH ^ LED_STATE_ON);
 #endif
 
 #ifdef WIFI_LED
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 30d1633d5..0ba60f1e2 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -824,16 +824,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 500;
     moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3) ||          \
-    defined(ELECROW_ThinkNode_M4) || defined(ELECROW_ThinkNode_M6)
-    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
+#if defined(LED_NOTIFICATION)
     moduleConfig.external_notification.enabled = true;
-    moduleConfig.external_notification.output = PIN_LED2;
-#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    moduleConfig.external_notification.active = false;
-#else
-    moduleConfig.external_notification.active = true;
-#endif
+    moduleConfig.external_notification.output = LED_NOTIFICATION;
+    moduleConfig.external_notification.active = LED_STATE_ON;
     moduleConfig.external_notification.alert_message = true;
     moduleConfig.external_notification.output_ms = 1000;
     moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
@@ -857,15 +851,6 @@ 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 T_LORA_PAGER
     moduleConfig.canned_message.updown1_enabled = true;
     moduleConfig.canned_message.inputbroker_pin_a = ROTARY_A;
diff --git a/variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini
index 809599212..2ddc5a2db 100644
--- a/variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini
+++ b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini
@@ -10,3 +10,6 @@ build_flags =
   -D EBYTE_E22
   -D EBYTE_E22_900M30S ; Assume Tx power curve is identical to 900M30S as there is no documentation
   -I variants/esp32/diy/9m2ibr_aprs_lora_tracker
+build_src_filter =
+  ${esp32_base.build_src_filter}
+  +<../variants/esp32/diy/9m2ibr_aprs_lora_tracker>
\ No newline at end of file
diff --git a/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.cpp b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.cpp
new file mode 100644
index 000000000..ef90d5a54
--- /dev/null
+++ b/variants/esp32/diy/9m2ibr_aprs_lora_tracker/variant.cpp
@@ -0,0 +1,8 @@
+#include "variant.h"
+#include "Arduino.h"
+
+void earlyInitVariant()
+{
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+}
\ No newline at end of file
diff --git a/variants/esp32s3/hackaday-communicator/variant.h b/variants/esp32s3/hackaday-communicator/variant.h
index 7e048d72c..cca408622 100644
--- a/variants/esp32s3/hackaday-communicator/variant.h
+++ b/variants/esp32s3/hackaday-communicator/variant.h
@@ -46,4 +46,5 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
-// #define LED_PIN 1
\ No newline at end of file
+#define LED_NOTIFICATION 1
+#define LED_STATE_ON 0
diff --git a/variants/esp32s3/rak3312/variant.h b/variants/esp32s3/rak3312/variant.h
index 4d860e476..6431f1fd0 100644
--- a/variants/esp32s3/rak3312/variant.h
+++ b/variants/esp32s3/rak3312/variant.h
@@ -22,7 +22,7 @@
 #define LED_BLUE 45
 
 #define PIN_LED1 LED_GREEN
-#define PIN_LED2 LED_BLUE
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_PIN LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
diff --git a/variants/esp32s3/rak_wismesh_tap_v2/variant.h b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
index f94b7ca4e..7d263165c 100644
--- a/variants/esp32s3/rak_wismesh_tap_v2/variant.h
+++ b/variants/esp32s3/rak_wismesh_tap_v2/variant.h
@@ -30,7 +30,7 @@
 #define LED_BLUE 45
 
 #define PIN_LED1 LED_GREEN
-#define PIN_LED2 LED_BLUE
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_PIN LED_GREEN
 #define ledOff(pin) pinMode(pin, INPUT)
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp
index 1560cde73..04f86e2d4 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.cpp
@@ -32,15 +32,8 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
-    pinMode(PIN_LED3, OUTPUT);
-    ledOff(PIN_LED3);
 }
 
 void variant_shutdown()
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
index a8c7b42b5..e00e56785 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
@@ -41,20 +41,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-#define PIN_LED2 -1
-#define PIN_LED3 -1
-
 // LED
 #define PIN_LED1 (32 + 6) // red
 #define LED_POWER (32 + 4)
-#define USER_LED (0 + 13) // green
+#define LED_NOTIFICATION (0 + 13) // green
 // USB_CHECK
 #define EXT_PWR_DETECT (32 + 3)
 #define ADC_V (0 + 8)
 
-#define LED_RED PIN_LED3
 #define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
 #define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
 #define PIN_BUZZER (0 + 6)
 /*
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
index 955a16a88..197b72cc9 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -54,7 +54,7 @@ extern "C" {
 #define LED_POWER LED_RED
 #define LED_CHARGE LED_POWER // Signals the Status LED Module to handle this LED
 #define LED_GREEN 35
-#define PIN_LED2 LED_GREEN
+#define LED_NOTIFICATION LED_GREEN
 #define LED_BLUE 37
 #define LED_PAIRING LED_BLUE // Signals the Status LED Module to handle this LED
 
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp
index 5c4b6215b..999f326db 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.cpp
@@ -32,9 +32,6 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     pinMode(LED_PAIRING, OUTPUT);
     ledOff(LED_PAIRING);
 
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h
index 0d905c2c1..2cfe948e3 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M4/variant.h
@@ -41,7 +41,7 @@ extern "C" {
 
 // LEDs
 #define LED_BLUE -1
-#define PIN_LED2 (32 + 9)
+#define LED_NOTIFICATION (32 + 9)
 #define LED_PAIRING (13)
 
 #define Battery_LED_1 (15)
diff --git a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
index 2461d73d2..387f4122b 100644
--- a/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M6/variant.h
@@ -43,7 +43,7 @@ extern "C" {
 #define LED_BLUE -1
 #define LED_CHARGE (12)
 #define LED_PAIRING (7)
-#define PIN_LED2 LED_PAIRING
+#define LED_NOTIFICATION LED_PAIRING
 
 #define LED_STATE_ON HIGH
 #define LED_STATE_OFF LOW
diff --git a/variants/nrf52840/MakePython_nRF52840_eink/variant.cpp b/variants/nrf52840/MakePython_nRF52840_eink/variant.cpp
index 8c6bf039c..04cda84ac 100644
--- a/variants/nrf52840/MakePython_nRF52840_eink/variant.cpp
+++ b/variants/nrf52840/MakePython_nRF52840_eink/variant.cpp
@@ -32,7 +32,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }
diff --git a/variants/nrf52840/MakePython_nRF52840_eink/variant.h b/variants/nrf52840/MakePython_nRF52840_eink/variant.h
index 48256e65f..64cca4916 100644
--- a/variants/nrf52840/MakePython_nRF52840_eink/variant.h
+++ b/variants/nrf52840/MakePython_nRF52840_eink/variant.h
@@ -27,12 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 10) // LED        P1.15
-#define PIN_LED2 (-1)      //
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
-#define LED_STATE_ON 0 // State when LED is litted
+#define LED_STATE_ON 0 // State when LED is lit
 
 /*
  * Buttons
diff --git a/variants/nrf52840/MakePython_nRF52840_oled/variant.cpp b/variants/nrf52840/MakePython_nRF52840_oled/variant.cpp
index 8c6bf039c..04cda84ac 100644
--- a/variants/nrf52840/MakePython_nRF52840_oled/variant.cpp
+++ b/variants/nrf52840/MakePython_nRF52840_oled/variant.cpp
@@ -32,7 +32,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }
diff --git a/variants/nrf52840/MakePython_nRF52840_oled/variant.h b/variants/nrf52840/MakePython_nRF52840_oled/variant.h
index 025324037..2f035e7da 100644
--- a/variants/nrf52840/MakePython_nRF52840_oled/variant.h
+++ b/variants/nrf52840/MakePython_nRF52840_oled/variant.h
@@ -27,12 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 10) // LED        P1.15
-#define PIN_LED2 (-1)      //
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
-#define LED_STATE_ON 0 // State when LED is litted
+#define LED_STATE_ON 0 // State when LED is lit
 
 /*
  * Buttons
diff --git a/variants/nrf52840/feather_diy/variant.h b/variants/nrf52840/feather_diy/variant.h
index a9782a8ee..a816e7867 100644
--- a/variants/nrf52840/feather_diy/variant.h
+++ b/variants/nrf52840/feather_diy/variant.h
@@ -52,7 +52,7 @@ extern "C" {
 #define LED_GREEN PIN_LED2 // Actually red
 #define LED_BLUE PIN_LED1
 
-#define LED_STATE_ON 1 // State when LED is litted
+#define LED_STATE_ON 1 // State when LED is lit
 
 #define BUTTON_PIN (32 + 2) // P1.02 7
 
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp b/variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
index 0e37eeeff..2795a6141 100644
--- a/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
+++ b/variants/nrf52840/gat562_mesh_trial_tracker/variant.h
@@ -46,10 +46,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/meshtiny/variant.cpp b/variants/nrf52840/meshtiny/variant.cpp
index 2e8b00e4b..aae3da9f2 100644
--- a/variants/nrf52840/meshtiny/variant.cpp
+++ b/variants/nrf52840/meshtiny/variant.cpp
@@ -32,12 +32,12 @@ const uint32_t g_ADigitalPinMap[] = {
 
 void initVariant()
 {
-    // LED1 & LED2
+    // LED1 & LED_BLUE
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
+    pinMode(LED_BLUE, OUTPUT);
+    ledOff(LED_BLUE);
 
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
diff --git a/variants/nrf52840/meshtiny/variant.h b/variants/nrf52840/meshtiny/variant.h
index 4a99def7d..4289fef4c 100644
--- a/variants/nrf52840/meshtiny/variant.h
+++ b/variants/nrf52840/meshtiny/variant.h
@@ -47,10 +47,9 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/monteops_hw1/variant.cpp b/variants/nrf52840/monteops_hw1/variant.cpp
index 75cca1dc3..81ae9f482 100644
--- a/variants/nrf52840/monteops_hw1/variant.cpp
+++ b/variants/nrf52840/monteops_hw1/variant.cpp
@@ -35,7 +35,4 @@ void initVariant()
     // LED1 & LED2
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
-
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
 }
diff --git a/variants/nrf52840/monteops_hw1/variant.h b/variants/nrf52840/monteops_hw1/variant.h
index 9560d076b..b5411bf04 100644
--- a/variants/nrf52840/monteops_hw1/variant.h
+++ b/variants/nrf52840/monteops_hw1/variant.h
@@ -50,10 +50,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36) // Connected to WWAN host LED (if present)
+#define LED_BLUE (36) // Connected to WWAN host LED (if present)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/muzi_base/variant.cpp b/variants/nrf52840/muzi_base/variant.cpp
index da01de974..e6178a968 100644
--- a/variants/nrf52840/muzi_base/variant.cpp
+++ b/variants/nrf52840/muzi_base/variant.cpp
@@ -63,8 +63,8 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     digitalWrite(PIN_LED1, HIGH);
 
-    pinMode(PIN_LED2, OUTPUT);
-    digitalWrite(PIN_LED2, HIGH);
+    pinMode(LED_BLUE, OUTPUT);
+    digitalWrite(LED_BLUE, HIGH);
 
     // Initialize LoRa pins
     pinMode(SX126X_RESET, OUTPUT);
diff --git a/variants/nrf52840/muzi_base/variant.h b/variants/nrf52840/muzi_base/variant.h
index 1ac8d9c27..b82382314 100644
--- a/variants/nrf52840/muzi_base/variant.h
+++ b/variants/nrf52840/muzi_base/variant.h
@@ -43,9 +43,9 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 3) // P1.03, Green
-#define PIN_LED2 (32 + 4) // P1.04, Blue
+#define LED_BLUE (32 + 4) // P1.04, Blue
 
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 #define LED_STATE_ON 0 // State when LED is lit
 
 // Buttons
diff --git a/variants/nrf52840/nano-g2-ultra/variant.h b/variants/nrf52840/nano-g2-ultra/variant.h
index 6e7cbdc45..5fa6ed9dd 100644
--- a/variants/nrf52840/nano-g2-ultra/variant.h
+++ b/variants/nrf52840/nano-g2-ultra/variant.h
@@ -41,15 +41,6 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)
 
-// LEDs
-#define PIN_LED1 (-1)
-#define PIN_LED2 (-1)
-#define PIN_LED3 (-1)
-
-#define LED_RED PIN_LED3
-#define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-
 #define LED_STATE_ON 0 // State when LED is lit
 
 /*
diff --git a/variants/nrf52840/nrf52.ini b/variants/nrf52840/nrf52.ini
index a07fefb2f..727d2c741 100644
--- a/variants/nrf52840/nrf52.ini
+++ b/variants/nrf52840/nrf52.ini
@@ -7,7 +7,7 @@ extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
   # TODO renovate
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#c770c8a16a351b55b86e347a3d9d7b74ad0bbf39
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#74096746e5f167a2ff22e483d8e79bb1aef00591
   ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
diff --git a/variants/nrf52840/r1-neo/variant.cpp b/variants/nrf52840/r1-neo/variant.cpp
index d87b88c85..c36e88602 100644
--- a/variants/nrf52840/r1-neo/variant.cpp
+++ b/variants/nrf52840/r1-neo/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     // pinMode(PIN_3V3_EN, OUTPUT);
     // digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/r1-neo/variant.h b/variants/nrf52840/r1-neo/variant.h
index acad61a51..1d2bc9bab 100644
--- a/variants/nrf52840/r1-neo/variant.h
+++ b/variants/nrf52840/r1-neo/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (32 + 4) // P1.04 Controls Green LED
-#define PIN_LED2 (28)     // P0.28 Controls Blue LED
+#define LED_BLUE (28)     // P0.28 Controls Blue LED
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak2560/variant.cpp b/variants/nrf52840/rak2560/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak2560/variant.cpp
+++ b/variants/nrf52840/rak2560/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak2560/variant.h b/variants/nrf52840/rak2560/variant.h
index b6b8f0d6d..0038f295d 100644
--- a/variants/nrf52840/rak2560/variant.h
+++ b/variants/nrf52840/rak2560/variant.h
@@ -46,10 +46,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak3401_1watt/variant.cpp b/variants/nrf52840/rak3401_1watt/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak3401_1watt/variant.cpp
+++ b/variants/nrf52840/rak3401_1watt/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak3401_1watt/variant.h b/variants/nrf52840/rak3401_1watt/variant.h
index f98f7c400..8df0faccb 100644
--- a/variants/nrf52840/rak3401_1watt/variant.h
+++ b/variants/nrf52840/rak3401_1watt/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak4631/variant.cpp b/variants/nrf52840/rak4631/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak4631/variant.cpp
+++ b/variants/nrf52840/rak4631/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak4631/variant.h b/variants/nrf52840/rak4631/variant.h
index fd1e7cc4b..edf4205f7 100644
--- a/variants/nrf52840/rak4631/variant.h
+++ b/variants/nrf52840/rak4631/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak4631_epaper/variant.cpp b/variants/nrf52840/rak4631_epaper/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak4631_epaper/variant.cpp
+++ b/variants/nrf52840/rak4631_epaper/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak4631_epaper/variant.h b/variants/nrf52840/rak4631_epaper/variant.h
index 8029baf81..19a2615f9 100644
--- a/variants/nrf52840/rak4631_epaper/variant.h
+++ b/variants/nrf52840/rak4631_epaper/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp b/variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak4631_epaper_onrxtx/variant.h b/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
index 9e57f9503..f1a1c58eb 100644
--- a/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
+++ b/variants/nrf52840/rak4631_epaper_onrxtx/variant.h
@@ -27,10 +27,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak4631_eth_gw/variant.cpp b/variants/nrf52840/rak4631_eth_gw/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak4631_eth_gw/variant.cpp
+++ b/variants/nrf52840/rak4631_eth_gw/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak4631_eth_gw/variant.h b/variants/nrf52840/rak4631_eth_gw/variant.h
index 0fcffe5b6..24e0c0cd3 100644
--- a/variants/nrf52840/rak4631_eth_gw/variant.h
+++ b/variants/nrf52840/rak4631_eth_gw/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
index 50c6ab573..655cea6e4 100644
--- a/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
+++ b/variants/nrf52840/rak4631_nomadstar_meteor_pro/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak_wismeshtag/variant.cpp b/variants/nrf52840/rak_wismeshtag/variant.cpp
index e84b60b3b..a035fbaf0 100644
--- a/variants/nrf52840/rak_wismeshtag/variant.cpp
+++ b/variants/nrf52840/rak_wismeshtag/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak_wismeshtag/variant.h b/variants/nrf52840/rak_wismeshtag/variant.h
index 354772e66..5b20e4d93 100644
--- a/variants/nrf52840/rak_wismeshtag/variant.h
+++ b/variants/nrf52840/rak_wismeshtag/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/rak_wismeshtap/variant.cpp b/variants/nrf52840/rak_wismeshtap/variant.cpp
index 36572b074..73d2fac04 100644
--- a/variants/nrf52840/rak_wismeshtap/variant.cpp
+++ b/variants/nrf52840/rak_wismeshtap/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/rak_wismeshtap/variant.h b/variants/nrf52840/rak_wismeshtap/variant.h
index 2cd7279f9..a31bc7b15 100644
--- a/variants/nrf52840/rak_wismeshtap/variant.h
+++ b/variants/nrf52840/rak_wismeshtap/variant.h
@@ -45,10 +45,10 @@ extern "C" {
 
 // LEDs
 #define PIN_LED1 (35)
-#define PIN_LED2 (36)
+#define LED_BLUE (36)
 
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
+#define LED_NOTIFICATION LED_BLUE
 
 #define LED_STATE_ON 1 // State when LED is litted
 
diff --git a/variants/nrf52840/seeed_solar_node/variant.h b/variants/nrf52840/seeed_solar_node/variant.h
index cbc8181a9..69736a9e0 100644
--- a/variants/nrf52840/seeed_solar_node/variant.h
+++ b/variants/nrf52840/seeed_solar_node/variant.h
@@ -25,7 +25,6 @@
 
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
-// #define LED_PIN PIN_LED2
 #define LED_STATE_ON 1 // State when LED is litted
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
diff --git a/variants/nrf52840/seeed_wio_tracker_L1/variant.h b/variants/nrf52840/seeed_wio_tracker_L1/variant.h
index 2d0ff2020..a1ec2508a 100644
--- a/variants/nrf52840/seeed_wio_tracker_L1/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1/variant.h
@@ -25,8 +25,7 @@
 
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
-// #define LED_PIN PIN_LED2
-#define LED_STATE_ON 1 // State when LED is litted
+#define LED_STATE_ON 1 // State when LED is lit
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
diff --git a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
index 3dd1ca21b..495c4ace8 100644
--- a/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+++ b/variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
@@ -25,8 +25,7 @@
 
 #define LED_GREEN PIN_LED1
 #define LED_BLUE PIN_LED2
-// #define LED_PIN PIN_LED2
-#define LED_STATE_ON 1 // State when LED is litted
+#define LED_STATE_ON 1 // State when LED is lit
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  Button Configuration
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
diff --git a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
index a9ccb2aae..0d599d313 100644
--- a/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
@@ -69,8 +69,6 @@ static const uint8_t A5 = PIN_A5;
 #define PIN_LED2 LED_BLUE
 #define PIN_LED3 LED_RED
 
-#define USER_LED LED_BLUE
-
 /*
  * Buttons
  */
diff --git a/variants/nrf52840/wio-tracker-wm1110/variant.cpp b/variants/nrf52840/wio-tracker-wm1110/variant.cpp
index 5a3587982..0d0856773 100644
--- a/variants/nrf52840/wio-tracker-wm1110/variant.cpp
+++ b/variants/nrf52840/wio-tracker-wm1110/variant.cpp
@@ -36,9 +36,6 @@ void initVariant()
     pinMode(PIN_LED1, OUTPUT);
     ledOff(PIN_LED1);
 
-    pinMode(PIN_LED2, OUTPUT);
-    ledOff(PIN_LED2);
-
     // 3V3 Power Rail
     pinMode(PIN_3V3_EN, OUTPUT);
     digitalWrite(PIN_3V3_EN, HIGH);
diff --git a/variants/nrf52840/wio-tracker-wm1110/variant.h b/variants/nrf52840/wio-tracker-wm1110/variant.h
index 145750da5..647bd47d8 100644
--- a/variants/nrf52840/wio-tracker-wm1110/variant.h
+++ b/variants/nrf52840/wio-tracker-wm1110/variant.h
@@ -51,11 +51,8 @@ extern "C" {
 #define PIN_WIRE_SDA (0 + 5) // P0.05
 #define PIN_WIRE_SCL (0 + 4) // P0.04
 
-#define PIN_LED1 (0 + 6)      // P0.06
-#define PIN_LED2 (PINS_COUNT) // P0.14
-
+#define PIN_LED1 (0 + 6) // P0.06
 #define LED_GREEN PIN_LED1
-#define LED_BLUE PIN_LED2
 
 #define LED_STATE_ON 0
 
diff --git a/variants/rp2040/rak11310/pins_arduino.h b/variants/rp2040/rak11310/pins_arduino.h
index 95ee308bc..56214a947 100644
--- a/variants/rp2040/rak11310/pins_arduino.h
+++ b/variants/rp2040/rak11310/pins_arduino.h
@@ -25,7 +25,7 @@ static const uint8_t A3 = PIN_A3;
 // LEDs
 #define PIN_LED (23u)
 #define PIN_LED1 PIN_LED
-#define PIN_LED2 (24u)
+#define LED_NOTIFICATION (24u)
 
 #define ADC_RESOLUTION 12
 
diff --git a/variants/stm32/milesight_gs301/platformio.ini b/variants/stm32/milesight_gs301/platformio.ini
index a1d3fb34e..73b9cf7ea 100644
--- a/variants/stm32/milesight_gs301/platformio.ini
+++ b/variants/stm32/milesight_gs301/platformio.ini
@@ -15,6 +15,9 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR=1
 build_unflags =
   -DDEBUG_MUTE # We have space for debug output until sensor support is added
+build_src_filter =
+  ${stm32_base.build_src_filter}
+  +<../variants/stm32/milesight_gs301>
 lib_deps =
   ${stm32_base.lib_deps}
 
diff --git a/variants/stm32/milesight_gs301/variant.cpp b/variants/stm32/milesight_gs301/variant.cpp
new file mode 100644
index 000000000..ef90d5a54
--- /dev/null
+++ b/variants/stm32/milesight_gs301/variant.cpp
@@ -0,0 +1,8 @@
+#include "variant.h"
+#include "Arduino.h"
+
+void earlyInitVariant()
+{
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, HIGH ^ LED_STATE_ON);
+}
\ No newline at end of file