diff --git a/platformio.ini b/platformio.ini
index c76d2b7d..b0783259 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -59,18 +59,17 @@ monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 display_library = ; set by build.py and taken from hal file
 lib_deps_lora =
-    MCCI LoRaWAN LMIC library@3.2.0 ; MCCI LMIC by Terrill Moore
+    mcci-catena/MCCI LoRaWAN LMIC library @ ^3.2.0
 lib_deps_display =
     OneBitDisplay@1.5.0
     QRCode@0.0.1
-    BitBang_I2C@2.1.1
     TFT_eSPI@>=2.2.18
 lib_deps_ledmatrix =
     Ultrathin_LED_Matrix@>=1.0.0
 lib_deps_rgbled =
     SmartLeds@>=1.2.1
 lib_deps_gps =
-    1655@>=1.0.2 ; #1655 TinyGPSPlus by Mikal Hart
+    mikalhart/TinyGPSPlus @ ^1.0.2
 lib_deps_sensors =
     Adafruit Unified Sensor@>=1.1.4
     Adafruit BME280 Library@>=2.1.0
@@ -79,12 +78,12 @@ lib_deps_sensors =
     https://github.com/ricki-z/SDS011.git
 lib_deps_basic =
     ArduinoJson@<6
-    76@>=1.2.4 ; #76 Timezone by Jack Christensen
-    274@>=2.3.5 ; #274 RTC by Michael Miller
+    jchristensen/Timezone @ ^1.2.4
+    makuna/RTC @ ^2.3.5
     SimpleButton
-    AXP202X_Library@>=1.1.2 ; AXP202 PMU lib by Lewis He
+    lewisxhe/AXP202X_Library @ ^1.1.2
     esp32-micro-sdcard
-    MQTT@>=2.4.7 ; MQTT client maintained by Joel Gaehwiler
+    256dpi/MQTT @ ^2.4.7
 lib_deps_all =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}
@@ -113,13 +112,14 @@ framework = arduino
 board = esp32dev
 board_build.partitions = min_spiffs.csv
 upload_speed = ${common.upload_speed}
-;upload_port = COM7
+;upload_port = COM8
 platform = ${common.platform_espressif32}
 lib_deps = ${common.lib_deps_all}
 build_flags = ${common.build_flags_all}
 upload_protocol = ${common.upload_protocol}
 extra_scripts = ${common.extra_scripts}
 monitor_speed = ${common.monitor_speed}
+lib_ldf_mode = deep
 
 [env:ota]
 upload_protocol = custom