diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 7affd8fc1..d329e693a 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -55,11 +55,6 @@ jobs:
       - name: Build base
         id: base
         uses: ./.github/actions/setup-base
-
-      - name: Trunk Check
-        if: ${{ github.event_name != 'workflow_dispatch' }}
-        uses: trunk-io/trunk-action@v1
-
       - name: Check ${{ matrix.board }}
         run: bin/check-all.sh ${{ matrix.board }}
 
diff --git a/boards/tbeam-s3-core.json b/boards/tbeam-s3-core.json
index 4c82a2789..8d2c3eed6 100644
--- a/boards/tbeam-s3-core.json
+++ b/boards/tbeam-s3-core.json
@@ -7,6 +7,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
       "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
diff --git a/platformio.ini b/platformio.ini
index 0f2907dee..c6efc740d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -118,7 +118,7 @@ lib_deps =
   adafruit/Adafruit BMP280 Library@^2.6.8
   adafruit/Adafruit BMP085 Library@^1.2.4
   adafruit/Adafruit BME280 Library@^2.2.2
-  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
+  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
   boschsensortec/BME68x Sensor Library@^1.1.40407
   adafruit/Adafruit MCP9808 Library@^2.0.0
   https://github.com/KodinLanewave/INA3221@^1.0.0
@@ -130,8 +130,8 @@ lib_deps =
   adafruit/Adafruit PM25 AQI Sensor@^1.0.6
   adafruit/Adafruit MPU6050@^2.2.4
   adafruit/Adafruit LIS3DH@^1.2.4
-  https://github.com/lewisxhe/SensorLib#27fd0f721e20cd09e1f81383f0ba58a54fe84a17
+  lewisxhe/SensorLib@^0.2.0
   adafruit/Adafruit LSM6DS@^4.7.2
   mprograms/QMC5883LCompass@^1.2.0
   adafruit/Adafruit VEML7700 Library@^2.1.6
-  https://github.com/adafruit/Adafruit_SHT4X#1.0.4
\ No newline at end of file
+  adafruit/Adafruit SHT4x Library@^1.0.4
\ No newline at end of file
diff --git a/protobufs b/protobufs
index bee9ddc71..5cfadd148 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit bee9ddc71677e974568a5a95362d78acac6bb974
+Subproject commit 5cfadd14890b7723a1fe6e7683f711911154b010
diff --git a/src/mesh/generated/meshtastic/deviceonly.pb.h b/src/mesh/generated/meshtastic/deviceonly.pb.h
index b8cc80633..a5cbc42a5 100644
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -308,7 +308,7 @@ extern const pb_msgdesc_t meshtastic_OEMStore_msg;
 #define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_OEMStore_size
 #define meshtastic_ChannelFile_size              718
 #define meshtastic_NodeInfoLite_size             166
-#define meshtastic_OEMStore_size                 3346
+#define meshtastic_OEMStore_size                 3368
 #define meshtastic_PositionLite_size             28
 
 #ifdef __cplusplus
diff --git a/src/mesh/generated/meshtastic/localonly.pb.h b/src/mesh/generated/meshtastic/localonly.pb.h
index 1799f49da..1b8123ef5 100644
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -182,7 +182,7 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalModuleConfig_size
 #define meshtastic_LocalConfig_size              537
-#define meshtastic_LocalModuleConfig_size        663
+#define meshtastic_LocalModuleConfig_size        685
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/mesh/generated/meshtastic/module_config.pb.h b/src/mesh/generated/meshtastic/module_config.pb.h
index ffda48704..f3c48ee6d 100644
--- a/src/mesh/generated/meshtastic/module_config.pb.h
+++ b/src/mesh/generated/meshtastic/module_config.pb.h
@@ -188,6 +188,10 @@ typedef struct _meshtastic_ModuleConfig_PaxcounterConfig {
     /* Enable the Paxcounter Module */
     bool enabled;
     uint32_t paxcounter_update_interval;
+    /* WiFi RSSI threshold. Defaults to -80 */
+    int32_t wifi_threshold;
+    /* BLE RSSI threshold. Defaults to -80 */
+    int32_t ble_threshold;
 } meshtastic_ModuleConfig_PaxcounterConfig;
 
 /* Serial Config */
@@ -467,7 +471,7 @@ extern "C" {
 #define meshtastic_ModuleConfig_NeighborInfoConfig_init_default {0, 0}
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_default {0, 0, 0, 0, "", 0, 0, 0}
 #define meshtastic_ModuleConfig_AudioConfig_init_default {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
-#define meshtastic_ModuleConfig_PaxcounterConfig_init_default {0, 0}
+#define meshtastic_ModuleConfig_PaxcounterConfig_init_default {0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0}
@@ -483,7 +487,7 @@ extern "C" {
 #define meshtastic_ModuleConfig_NeighborInfoConfig_init_zero {0, 0}
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_zero {0, 0, 0, 0, "", 0, 0, 0}
 #define meshtastic_ModuleConfig_AudioConfig_init_zero {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
-#define meshtastic_ModuleConfig_PaxcounterConfig_init_zero {0, 0}
+#define meshtastic_ModuleConfig_PaxcounterConfig_init_zero {0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0}
@@ -526,6 +530,8 @@ extern "C" {
 #define meshtastic_ModuleConfig_AudioConfig_i2s_sck_tag 7
 #define meshtastic_ModuleConfig_PaxcounterConfig_enabled_tag 1
 #define meshtastic_ModuleConfig_PaxcounterConfig_paxcounter_update_interval_tag 2
+#define meshtastic_ModuleConfig_PaxcounterConfig_wifi_threshold_tag 3
+#define meshtastic_ModuleConfig_PaxcounterConfig_ble_threshold_tag 4
 #define meshtastic_ModuleConfig_SerialConfig_enabled_tag 1
 #define meshtastic_ModuleConfig_SerialConfig_echo_tag 2
 #define meshtastic_ModuleConfig_SerialConfig_rxd_tag 3
@@ -695,7 +701,9 @@ X(a, STATIC,   SINGULAR, UINT32,   i2s_sck,           7)
 
 #define meshtastic_ModuleConfig_PaxcounterConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     enabled,           1) \
-X(a, STATIC,   SINGULAR, UINT32,   paxcounter_update_interval,   2)
+X(a, STATIC,   SINGULAR, UINT32,   paxcounter_update_interval,   2) \
+X(a, STATIC,   SINGULAR, INT32,    wifi_threshold,    3) \
+X(a, STATIC,   SINGULAR, INT32,    ble_threshold,     4)
 #define meshtastic_ModuleConfig_PaxcounterConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_PaxcounterConfig_DEFAULT NULL
 
@@ -836,7 +844,7 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_MQTTConfig_size  254
 #define meshtastic_ModuleConfig_MapReportSettings_size 12
 #define meshtastic_ModuleConfig_NeighborInfoConfig_size 8
-#define meshtastic_ModuleConfig_PaxcounterConfig_size 8
+#define meshtastic_ModuleConfig_PaxcounterConfig_size 30
 #define meshtastic_ModuleConfig_RangeTestConfig_size 10
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_size 96
 #define meshtastic_ModuleConfig_SerialConfig_size 28
diff --git a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
index 2d14f1ca1..c87f83d39 100644
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -2,7 +2,7 @@
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_420_M01
   -DEINK_WIDTH=300
   -DEINK_HEIGHT=400
diff --git a/variants/MakePython_nRF52840_eink/platformio.ini b/variants/MakePython_nRF52840_eink/platformio.ini
index f421466ec..b11b54c7d 100644
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/MakePython_nRF52840_eink/platformio.ini
@@ -3,7 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 
diff --git a/variants/MakePython_nRF52840_oled/platformio.ini b/variants/MakePython_nRF52840_oled/platformio.ini
index e0ddb1377..0146385e0 100644
--- a/variants/MakePython_nRF52840_oled/platformio.ini
+++ b/variants/MakePython_nRF52840_oled/platformio.ini
@@ -3,7 +3,7 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/TWC_mesh_v4/platformio.ini b/variants/TWC_mesh_v4/platformio.ini
index 481682143..4fb382334 100644
--- a/variants/TWC_mesh_v4/platformio.ini
+++ b/variants/TWC_mesh_v4/platformio.ini
@@ -2,7 +2,7 @@
 extends = nrf52840_base
 board = nordic_pca10059
 board_level = extra
-build_flags = ${nrf52840_base.build_flags} -I variants/TWC_mesh_v4 -D TWC_mesh_v4 -L".pio\libdeps\TWC_mesh_v4\BSEC2 Software Library\src\cortex-m4\fpv4-sp-d16-hard"
+build_flags = ${nrf52840_base.build_flags} -I variants/TWC_mesh_v4 -D TWC_mesh_v4 -L".pio\libdeps\TWC_mesh_v4\bsec2\src\cortex-m4\fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/TWC_mesh_v4>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/canaryone/platformio.ini b/variants/canaryone/platformio.ini
index 4917f52c7..5e01c3763 100644
--- a/variants/canaryone/platformio.ini
+++ b/variants/canaryone/platformio.ini
@@ -6,7 +6,7 @@ debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index 94d59553d..adc10de44 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -53,7 +53,7 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_xtal
   -D NRF52_PROMICRO_DIY
   -D OLED_RU
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
   ${nrf52840_base.lib_deps}
@@ -69,7 +69,7 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
   -D OLED_RU
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/feather_diy/platformio.ini b/variants/feather_diy/platformio.ini
index 47c864b8e..82dbb317c 100644
--- a/variants/feather_diy/platformio.ini
+++ b/variants/feather_diy/platformio.ini
@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = adafruit_feather_nrf52840
 build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/heltec_wsl_v3/variant.h b/variants/heltec_wsl_v3/variant.h
index d3a009ade..917ea7fb9 100644
--- a/variants/heltec_wsl_v3/variant.h
+++ b/variants/heltec_wsl_v3/variant.h
@@ -3,8 +3,6 @@
 
 #define LED_PIN LED
 
-#define HAS_SCREEN 0
-
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0
 
diff --git a/variants/lora_relay_v1/platformio.ini b/variants/lora_relay_v1/platformio.ini
index 8660bf64a..435d256c5 100644
--- a/variants/lora_relay_v1/platformio.ini
+++ b/variants/lora_relay_v1/platformio.ini
@@ -15,7 +15,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v1
   -DTFT_DC=ST7735_RS
   -DTFT_RST=ST7735_RESET
   -DSPI_FREQUENCY=27000000
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/lora_relay_v2/platformio.ini b/variants/lora_relay_v2/platformio.ini
index cd2109f00..3598466d5 100644
--- a/variants/lora_relay_v2/platformio.ini
+++ b/variants/lora_relay_v2/platformio.ini
@@ -17,7 +17,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v2
   -DSPI_FREQUENCY=27000000
   -DTFT_WR=ST7735_SDA
   -DTFT_SCLK=ST7735_SCK
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_relay_v2>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini
index f9d260e74..551419abc 100644
--- a/variants/monteops_hw1/platformio.ini
+++ b/variants/monteops_hw1/platformio.ini
@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/monteops_hw1 -D MONTEOPS_HW1
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/nano-g2-ultra/platformio.ini b/variants/nano-g2-ultra/platformio.ini
index 2b011e032..913b38e3f 100644
--- a/variants/nano-g2-ultra/platformio.ini
+++ b/variants/nano-g2-ultra/platformio.ini
@@ -5,7 +5,7 @@ board = nano-g2-ultra
 debug_tool = jlink
 
 build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/pca10056-rc-clock/platformio.ini b/variants/pca10056-rc-clock/platformio.ini
index 0467b1417..f8cff4d73 100644
--- a/variants/pca10056-rc-clock/platformio.ini
+++ b/variants/pca10056-rc-clock/platformio.ini
@@ -5,5 +5,5 @@ extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/pca10056-rc-clock>
\ No newline at end of file
diff --git a/variants/rak10701/platformio.ini b/variants/rak10701/platformio.ini
index ae43b1906..75e29bca0 100644
--- a/variants/rak10701/platformio.ini
+++ b/variants/rak10701/platformio.ini
@@ -4,7 +4,7 @@ extends = nrf52840_base
 board_level = extra
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak10701 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index 6495278bf..e1bd2b1b0 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -8,7 +8,7 @@ build_flags = ${rp2040_base.build_flags}
   -DRAK11310
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 115e96967..f64811429 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -4,7 +4,7 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/rak4631_epaper/platformio.ini b/variants/rak4631_epaper/platformio.ini
index ced732d94..1ca9a2157 100644
--- a/variants/rak4631_epaper/platformio.ini
+++ b/variants/rak4631_epaper/platformio.ini
@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
diff --git a/variants/rak4631_epaper_onrxtx/platformio.ini b/variants/rak4631_epaper_onrxtx/platformio.ini
index c4a13ec82..e0a0a5a58 100644
--- a/variants/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/rak4631_epaper_onrxtx/platformio.ini
@@ -4,7 +4,7 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN=34
   -D EINK_DISPLAY_MODEL=GxEPD2_213_BN
   -D EINK_WIDTH=250
diff --git a/variants/rp2040-lora/platformio.ini b/variants/rp2040-lora/platformio.ini
index a1d6bea9d..8499f6f3c 100644
--- a/variants/rp2040-lora/platformio.ini
+++ b/variants/rp2040-lora/platformio.ini
@@ -9,7 +9,7 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rp2040-lora
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
diff --git a/variants/rpipico-slowclock/platformio.ini b/variants/rpipico-slowclock/platformio.ini
index 0b94eb9c6..c21994249 100644
--- a/variants/rpipico-slowclock/platformio.ini
+++ b/variants/rpipico-slowclock/platformio.ini
@@ -19,7 +19,7 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rpipico-slowclock
   -DDEBUG_RP2040_PORT=Serial2
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -g
   -DNO_USB
 lib_deps =
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index 9537694ec..e4b9e479f 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -9,7 +9,7 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rpipico
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index 91ec964d9..2600b4b38 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -8,7 +8,7 @@ build_flags = ${rp2040_base.build_flags}
   -DRPI_PICO
   -Ivariants/rpipicow
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -fexceptions  # for exception handling in MQTT
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
diff --git a/variants/senselora_rp2040/platformio.ini b/variants/senselora_rp2040/platformio.ini
index 3b3253ee8..c719bd261 100644
--- a/variants/senselora_rp2040/platformio.ini
+++ b/variants/senselora_rp2040/platformio.ini
@@ -8,6 +8,6 @@ build_flags = ${rp2040_base.build_flags}
   -DSENSELORA_RP2040
   -Ivariants/senselora_rp2040
   -DDEBUG_RP2040_PORT=Serial
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini
index aa8177b33..5b295c96a 100644
--- a/variants/t-echo/platformio.ini
+++ b/variants/t-echo/platformio.ini
@@ -8,7 +8,7 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
   -DGPS_POWER_TOGGLE
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
   -DEINK_HEIGHT=200
diff --git a/variants/tbeam-s3-core/pins_arduino.h b/variants/tbeam-s3-core/pins_arduino.h
index 24edb7d9f..22ed814ff 100644
--- a/variants/tbeam-s3-core/pins_arduino.h
+++ b/variants/tbeam-s3-core/pins_arduino.h
@@ -6,14 +6,6 @@
 #define USB_VID 0x303a
 #define USB_PID 0x1001
 
-#define EXTERNAL_NUM_INTERRUPTS 46
-#define NUM_DIGITAL_PINS 48
-#define NUM_ANALOG_INPUTS 20
-
-#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
-#define digitalPinHasPWM(p) (p < 46)
-
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
diff --git a/variants/tbeam-s3-core/platformio.ini b/variants/tbeam-s3-core/platformio.ini
index e50d506b9..c71802255 100644
--- a/variants/tbeam-s3-core/platformio.ini
+++ b/variants/tbeam-s3-core/platformio.ini
@@ -4,6 +4,8 @@ extends = esp32s3_base
 board = tbeam-s3-core
 board_check = true
 
+platform = platformio/espressif32@6.7.0
+
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@1.0.1
diff --git a/variants/xiao_ble/platformio.ini b/variants/xiao_ble/platformio.ini
index c52e2c644..8e9a663a9 100644
--- a/variants/xiao_ble/platformio.ini
+++ b/variants/xiao_ble/platformio.ini
@@ -4,7 +4,7 @@ extends = nrf52840_base
 board = xiao_ble_sense
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Dxiao_ble -D EBYTE_E22
-  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
 lib_deps = 
   ${nrf52840_base.lib_deps}