diff --git a/platformio.ini b/platformio.ini
index 02ce189c..c3b76e6b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -50,10 +50,10 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Heltec_lora32_v2
 build_flags =
   ${Heltec_lora32_v2.build_flags}
-  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_NAME='"Heltec Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
@@ -107,7 +107,6 @@ lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-
 ; ================
 [Heltec_lora32_v3]
 extends = esp32_base
@@ -125,7 +124,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=130.0f  ; for best TX power!
-  -D SX126X_RX_BOOSTED_GAIN=true
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
@@ -136,10 +135,10 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_NAME='"Heltec Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
   -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -154,12 +153,12 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME="\"Heltec Room\""
+  -D ADVERT_NAME='"Heltec Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
-  -D MESH_PACKET_LOGGING=1
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
 [env:Heltec_v3_terminal_chat]
@@ -223,8 +222,8 @@ build_flags =
   -D MAX_GROUP_CHANNELS=1
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID="\"myssid\""
-  -D WIFI_PWD="\"mypwd\""
+  -D WIFI_SSID='"myssid"'
+  -D WIFI_PWD='"mypwd"'
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
@@ -241,10 +240,10 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_NAME='"Heltec Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
   -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -256,11 +255,11 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
   +<../examples/simple_room_server>
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D ADVERT_NAME="\"Heltec Room\""
+  -D ADVERT_NAME='"Heltec Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -310,11 +309,12 @@ build_flags =
   ${Xiao_esp32_C3.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D SX126X_RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
-  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_NAME='"Xiao Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -327,10 +327,10 @@ build_flags =
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
-  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_NAME='"Xiao Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
  ; -D MESH_PACKET_LOGGING=1
  ; -D MESH_DEBUG=1
 
@@ -355,6 +355,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
+  -D SX126X_RX_BOOSTED_GAIN=1
 
 [env:Xiao_S3_WIO_Repeater]
 extends = Xiao_S3_WIO
@@ -362,10 +363,10 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
   +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  -D ADVERT_NAME="\"XiaoS3 Repeater\""
+  -D ADVERT_NAME='"XiaoS3 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -440,10 +441,10 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
   +<../examples/simple_repeater>
 build_flags =
   ${LilyGo_TLora_V2_1_1_6.build_flags}
-  -D ADVERT_NAME="\"TLora-V2.1-1.6 Repeater\""
+  -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 ;  -D CORE_DEBUG_LEVEL=3
@@ -507,11 +508,11 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
   +<../examples/simple_room_server>
 build_flags =
   ${LilyGo_TLora_V2_1_1_6.build_flags}
-  -D ADVERT_NAME="\"TLora-V2.1-1.6 Room\""
+  -D ADVERT_NAME='"TLora-V2.1-1.6 Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -536,6 +537,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
+  -D SX126X_RX_BOOSTED_GAIN=1
 
 ; === LilyGo T3S3 with SX1262 environments ===
 [env:LilyGo_T3S3_sx1262_Repeater]
@@ -544,10 +546,10 @@ build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
   +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
-  -D ADVERT_NAME="\"T3S3-1262 Repeater\""
+  -D ADVERT_NAME='"T3S3-1262 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -616,6 +618,9 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=130.0f  ; for best TX power!
+;  -D SX126X_RX_BOOSTED_GAIN=1 - DO NOT ENABLE THIS!
+;  https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance
+
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
@@ -624,10 +629,10 @@ lib_deps =
 extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
-  -D ADVERT_NAME="\"Station G2 Repeater\""
+  -D ADVERT_NAME='"Station G2 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
   -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
@@ -639,11 +644,11 @@ build_src_filter = ${Station_G2.build_src_filter}
   +<../examples/simple_room_server>
 build_flags =
   ${Station_G2.build_flags}
-  -D ADVERT_NAME="\"Station G2 Room\""
+  -D ADVERT_NAME='"Station G2 Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -675,6 +680,7 @@ build_flags = ${nrf52840_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
 
 [env:RAK_4631_Repeater]
 extends = rak4631
@@ -682,10 +688,10 @@ build_src_filter = ${rak4631.build_src_filter}
   +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${rak4631.build_flags}
-  -D ADVERT_NAME="\"RAK4631 Repeater\""
+  -D ADVERT_NAME='"RAK4631 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -695,11 +701,11 @@ build_src_filter = ${rak4631.build_src_filter}
   +<../examples/simple_room_server/main.cpp>
 build_flags =
   ${rak4631.build_flags}
-  -D ADVERT_NAME="\"Test Room\""
+  -D ADVERT_NAME='"Test Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -823,6 +829,7 @@ build_flags = ${nrf52840_t114.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_t114.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/nrf52/T114Board.cpp>
@@ -836,10 +843,10 @@ build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${Heltec_t114.build_flags}
-  -D ADVERT_NAME="\"Heltec_T114 Repeater\""
+  -D ADVERT_NAME='"Heltec_T114 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -849,11 +856,11 @@ build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_room_server>
 build_flags =
   ${Heltec_t114.build_flags}
-  -D ADVERT_NAME="\"Heltec_T114 Room\""
+  -D ADVERT_NAME='"Heltec_T114 Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -898,6 +905,7 @@ build_flags = ${nrf52840_techo.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_techo.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/nrf52/TechoBoard.cpp>
@@ -910,10 +918,10 @@ extends = LilyGo_Techo
 build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${LilyGo_Techo.build_flags}
-  -D ADVERT_NAME="\"T-Echo Repeater\""
+  -D ADVERT_NAME='"T-Echo Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
@@ -922,10 +930,10 @@ extends = LilyGo_Techo
 build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_room_server/main.cpp>
 build_flags =
   ${LilyGo_Techo.build_flags}
-  -D ADVERT_NAME="\"T-Echo Room\""
+  -D ADVERT_NAME='"T-Echo Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1