diff --git a/platformio.ini b/platformio.ini
index 2044bb55..5c83e4ab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -8,7 +8,7 @@ lib_deps_external =
 	knolleary/PubSubClient
 
 [env]
-extra_scripts = pre:prebuildscript.py
+extra_scripts = pre:tools/prebuildscript.py
 
 [env:esp8266_1mb_ota]
 lib_deps = 
@@ -401,6 +401,8 @@ lib_deps =
 	adafruit/Adafruit BMP280 Library
 	beegee-tokyo/DHT sensor library for ESPx
 	https://github.com/milesburton/Arduino-Temperature-Control-Library
+	https://github.com/GyverLibs/GyverINA
+	https://github.com/GyverLibs/GyverINA
 	https://github.com/tremaru/iarduino_RTC
 	robtillaart/SHT2x@^0.1.1
 	WEMOS SHT3x@1.0.0
@@ -412,6 +414,8 @@ lib_deps =
 	adafruit/Adafruit BusIO @ ^1.13.2
 	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
 	marcoschwartz/LiquidCrystal_I2C@^1.1.4
+	https://github.com/maxint-rd/TM16xx
+	adafruit/Adafruit GFX Library @ ^1.11.5
 build_src_filter = 
 	+<modules/virtual/Cron>
 	+<modules/virtual/Loging>
@@ -429,6 +433,8 @@ build_src_filter =
 	+<modules/sensors/Dht1122>
 	+<modules/sensors/Ds18b20>
 	+<modules/sensors/Impulse>
+	+<modules/sensors/Ina219>
+	+<modules/sensors/Ina226>
 	+<modules/sensors/Pzem004t>
 	+<modules/sensors/RTC>
 	+<modules/sensors/S8>
@@ -448,73 +454,40 @@ build_src_filter =
 	+<modules/exec/Pwm8266>
 	+<modules/exec/TelegramLT>
 	+<modules/display/Lcd2004>
+	+<modules/display/TM16XX>
 
 [env:esp32_4mb_fromitems]
 lib_deps = 
-	https://github.com/enjoyneering/AHTxx.git
-	adafruit/Adafruit BME280 Library
-	adafruit/Adafruit BMP280 Library
-	beegee-tokyo/DHT sensor library for ESPx
-	https://github.com/milesburton/Arduino-Temperature-Control-Library
-	https://github.com/tremaru/iarduino_RTC
-	robtillaart/SHT2x@^0.1.1
-	WEMOS SHT3x@1.0.0
-	plerup/EspSoftwareSerial
-	gyverlibs/EncButton @ ^2.0
-	https://github.com/RoboticsBrno/ServoESP32
-	adafruit/Adafruit MCP23017 Arduino Library@^2.1.0
-	adafruit/Adafruit BusIO @ ^1.13.2
-	dfrobot/DFRobotDFPlayerMini @ ^1.0.5
-	adafruit/Adafruit BusIO @ ^1.13.2
-	https://github.com/robotclass/RobotClass_LiquidCrystal_I2C
-	marcoschwartz/LiquidCrystal_I2C@^1.1.4
+	https://github.com/adafruit/Adafruit_INA219.git
 build_src_filter = 
 	+<modules/virtual/Cron>
+	+<modules/virtual/GoogleSheet>
 	+<modules/virtual/Loging>
 	+<modules/virtual/LogingDaily>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
 	+<modules/virtual/VariableColor>
 	+<modules/virtual/VButton>
-	+<modules/sensors/Acs712>
-	+<modules/sensors/AhtXX>
-	+<modules/sensors/AnalogAdc>
-	+<modules/sensors/Bme280>
-	+<modules/sensors/Bmp280>
-	+<modules/sensors/Dht1122>
-	+<modules/sensors/Ds18b20>
-	+<modules/sensors/Impulse>
-	+<modules/sensors/Pzem004t>
-	+<modules/sensors/RTC>
-	+<modules/sensors/S8>
-	+<modules/sensors/Sht20>
-	+<modules/sensors/Sht30>
-	+<modules/sensors/Sonar>
-	+<modules/sensors/UART>
-	+<modules/exec/ButtonIn>
-	+<modules/exec/ButtonOut>
-	+<modules/exec/Buzzer>
-	+<modules/exec/Enconder>
-	+<modules/exec/IoTServo>
-	+<modules/exec/Mcp23017>
-	+<modules/exec/Mp3>
-	+<modules/exec/Multitouch>
-	+<modules/exec/Pcf8574>
-	+<modules/exec/Pwm32>
+	+<modules/sensors/ExternalMQTT>
+	+<modules/sensors/Ina219>
+	+<modules/exec/Ftp>
 	+<modules/exec/TelegramLT>
-	+<modules/display/Lcd2004>
-	+<modules/display/Smi2_m>
 
 [env:esp32s2_4mb_fromitems]
 lib_deps = 
+	adafruit/Adafruit BME280 Library
+	https://github.com/adafruit/Adafruit_INA219.git
 build_src_filter = 
 	+<modules/virtual/Cron>
+	+<modules/virtual/GoogleSheet>
 	+<modules/virtual/Loging>
 	+<modules/virtual/LogingDaily>
 	+<modules/virtual/Timer>
 	+<modules/virtual/Variable>
 	+<modules/virtual/VariableColor>
 	+<modules/virtual/VButton>
-	+<modules/sensors/Acs712>
+	+<modules/sensors/Bme280>
+	+<modules/sensors/Ina219>
+	+<modules/exec/Ftp>
 	+<modules/exec/TelegramLT>
 
diff --git a/prebuildscript.py b/tools/prebuildscript.py
similarity index 100%
rename from prebuildscript.py
rename to tools/prebuildscript.py