diff --git a/.gitmodules b/.gitmodules
index 22b9907d..b380c9d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "code/vendor/embedis"]
-	path = code/vendor/embedis
-	url = https://github.com/thingSoC/embedis.git
 [submodule "code/vendor/nofuss"]
 	path = code/vendor/nofuss
 	url = https://bitbucket.org/xoseperez/nofuss.git
diff --git a/code/platformio.custom.ini b/code/platformio.custom.ini
index f57c87a9..dc59f9b3 100644
--- a/code/platformio.custom.ini
+++ b/code/platformio.custom.ini
@@ -12,7 +12,7 @@ env_default = node-debug
 [common]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = 19,31,44,64,305,306,346,408,727
 extra_script = pio_hooks.py
 
 [ota]
diff --git a/code/platformio.ini b/code/platformio.ini
index ca92094a..818bd510 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -2,7 +2,7 @@
 env_default = node-debug
 
 [common]
-lib_install = 19,31,44,64,305,306,346,727
+lib_install = 19,31,44,64,305,306,346,408,727
 
 [env:sonoff-debug]
 platform = espressif8266
diff --git a/code/platformio.official.ini b/code/platformio.official.ini
index 8400b7c6..818bd510 100644
--- a/code/platformio.official.ini
+++ b/code/platformio.official.ini
@@ -1,10 +1,13 @@
 [platformio]
-env_default = sonoff-pow-debug
+env_default = node-debug
+
+[common]
+lib_install = 19,31,44,64,305,306,346,408,727
 
 [env:sonoff-debug]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
@@ -12,7 +15,7 @@ build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
 [env:sonoff-debug-ota]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
@@ -23,15 +26,26 @@ upload_flags = --auth=fibonacci --port 8266
 [env:sonoff-pow-debug]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
+extra_script = pio_hooks.py
+board = esp01_1m
+build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW
+
+[env:sonoff-pow-debug-ota]
+platform = espressif8266
+framework = arduino
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF_POW
+upload_speed = 115200
+upload_port = "192.168.4.1"
+upload_flags = --auth=fibonacci --port 8266
 
 [env:slampher-debug]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER
@@ -39,7 +53,7 @@ build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER
 [env:slampher-debug-ota]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSLAMPHER
@@ -50,7 +64,7 @@ upload_flags = --auth=fibonacci --port 8266
 [env:s20-debug]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
@@ -58,7 +72,7 @@ build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
 [env:s20-debug-ota]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
@@ -69,7 +83,7 @@ upload_flags = --auth=fibonacci --port 8266
 [env:node-debug]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = nodemcuv2
 build_flags = -DNODEMCUV2 -DDEBUG_PORT=Serial
@@ -77,7 +91,7 @@ build_flags = -DNODEMCUV2 -DDEBUG_PORT=Serial
 [env:node-debug-ota]
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = nodemcuv2
 build_flags = -DNODEMCUV2 -DDEBUG_PORT=Serial
@@ -91,7 +105,7 @@ upload_flags = --auth=fibonacci --port 8266
 topic = /home/cellar/airconditioner/ip
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DS20
@@ -103,7 +117,7 @@ upload_flags = --auth=fibonacci --port 8266
 topic = /home/cellar/washer/ip
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 upload_speed = 115200
@@ -115,7 +129,7 @@ build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE
 topic = /home/studio/lamp/ip
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
@@ -127,7 +141,7 @@ upload_flags = --auth=fibonacci --port 8266
 topic = /home/living/lamp/ip
 platform = espressif8266
 framework = arduino
-lib_install = 19,31,44,64,89,549,727
+lib_install = ${common.lib_install}
 extra_script = pio_hooks.py
 board = esp01_1m
 build_flags = -Wl,-Tesp8266.flash.1m256.ld -DDEBUG_PORT=Serial -DSONOFF
diff --git a/code/vendor/embedis b/code/vendor/embedis
deleted file mode 160000
index abf54647..00000000
--- a/code/vendor/embedis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit abf54647b3f41d85a8fa13e76106e34f4699db55