diff --git a/main/ZgatewayRFM69.ino b/main/ZgatewayRFM69.ino
index eca5a09..61ef27e 100644
--- a/main/ZgatewayRFM69.ino
+++ b/main/ZgatewayRFM69.ino
@@ -34,7 +34,6 @@
 
 #  include <EEPROM.h>
 #  include <RFM69.h> //https://www.github.com/lowpowerlab/rfm69
-#  include <SPI.h>
 
 char RadioConfig[128];
 
diff --git a/platformio.ini b/platformio.ini
index 610bb66..da03b6a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -65,27 +65,29 @@ extra_configs =
 
 [libraries]
 arduinojson = ArduinoJson@5.13.4
-arduinolog = 1technophile/Arduino-Log#d13cd80
+arduinolog = https://github.com/1technophile/Arduino-Log.git#d13cd80
 pubsubclient = PubSubClient@2.8
-rc-switch = 1technophile/rc-switch#8fc6d06
-newremoteswitch = 1technophile/NewRemoteSwitch#8eb980e
-ble = eos1d3/ESP32_BLE#9d6c1ed
+rc-switch = https://github.com/1technophile/rc-switch.git#8fc6d06
+newremoteswitch = https://github.com/1technophile/NewRemoteSwitch.git#8eb980e
+ble = https://github.com/eos1d3/ESP32_BLE.git#9d6c1ed
 irremoteesp = IRremoteESP8266@2.7.7
 irremote = IRremote
-lora = sandeepmistry/arduino-LoRa#f4a1d27
+lora = https://github.com/sandeepmistry/arduino-LoRa.git#f4a1d27
 esppilight = ESPiLight@0.16.2
 rfWeatherStation = WeatherStationDataRx@0.3.1
-rfm69 = RFM69@4a6f77ad47
+rfm69 = https://github.com/LowPowerLab/RFM69.git#2e915ea
+rfm69spi = https://github.com/lowpowerlab/spiflash.git#9c0c2b9
+rfm69_low-power = Low-Power@1.6
 dht = DHT sensor library@1.3.0
 unifiedsensor = Adafruit Unified Sensor@1.0.2
 tsl2561 = Adafruit TSL2561@1.0.3
 bme280 = SparkFun BME280@2.0.4
-bmp180 = BMP180@efac46bd8d
-htu21 = SparkFun HTU21D Humidity and Temperature Sensor Br@1.1.3
+bmp180 = BMP180#efac46bd8d
+htu21 = SparkFun HTU21D Humidity and Temperature Sensor Breakout@1.1.3
 ahtx0 = Adafruit AHTX0
-ina226 = jarzebski/Arduino-INA226#968a684
-a6lib = 1technophile/A6lib
-wifimanager = tzapu/WiFiManager#c3ff582
+ina226 = https://github.com/jarzebski/Arduino-INA226.git#968a684
+a6lib = https://github.com/1technophile/A6lib.git
+wifimanager = https://github.com/tzapu/WiFiManager.git#c3ff582
 ethernet = Ethernet
 esp8266_mdns = esp8266_mdns
 wire = Wire
@@ -169,6 +171,7 @@ lib_deps =
   ${libraries.irremoteesp}
   ${libraries.lora}
   ${libraries.rfm69}
+  ${libraries.rfm69spi}
   ${libraries.rc-switch}
   ${libraries.newremoteswitch}
   ${libraries.bme280}
@@ -363,6 +366,7 @@ lib_deps =
   ${libraries.esppilight}
   ${libraries.irremoteesp}
   ${libraries.rfm69}
+  ${libraries.rfm69spi}
   ${libraries.rc-switch}
   ${libraries.newremoteswitch}
   ${libraries.bme280}
@@ -596,6 +600,8 @@ lib_deps =
   ${com-arduino.lib_deps}
   ${libraries.irremote}
   ${libraries.rfm69}
+  ${libraries.rfm69spi}
+  ${libraries.rfm69_low-power}
   ${libraries.rc-switch}
   ${libraries.newremoteswitch}
   ${libraries.bme280}