diff --git a/README.md b/README.md
index ed6bf5f0..7c3605be 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smar
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
 [![version](https://img.shields.io/badge/version-1.13.0c-brightgreen.svg)](CHANGELOG.md)
-[![branch](https://img.shields.io/badge/branch-webui-filter-orange.svg)](https://github.org/xoseperez/espurna/tree/webui-filter/)
-[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=webui-filter)](https://travis-ci.org/xoseperez/espurna)
-[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/webui-filter.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
+[![branch](https://img.shields.io/badge/branch-webui-orange.svg)](https://github.org/xoseperez/espurna/tree/webui/)
+[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=webui)](https://travis-ci.org/xoseperez/espurna)
+[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/webui.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
 [![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
 <br />
 [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=xose%2eperez%40gmail%2ecom&lc=US&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
diff --git a/code/platformio.ini b/code/platformio.ini
index 3fbceb84..348e5413 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -196,6 +196,7 @@ build_flags = ${common.build_flags_4m1m} -DWEMOS_D1_MINI_RELAYSHIELD -DDEBUG_FAU
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:wemos-d1mini-relayshield-ota]
 platform = ${common.platform}
@@ -208,6 +209,7 @@ upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:nodemcu-lolin]
 platform = ${common.platform}
@@ -219,6 +221,7 @@ build_flags = ${common.build_flags_4m1m} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:nodemcu-lolin-ssl]
 platform = espressif8266@1.6.0
@@ -230,6 +233,7 @@ build_flags = ${common.build_flags_4m1m} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:nodemcu-lolin-ota]
 platform = ${common.platform}
@@ -243,6 +247,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts
+modules = ${common.modules}
 
 # ------------------------------------------------------------------------------
 # SPECIFIC BOARDS
@@ -257,7 +262,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DTINKERMAN_ESPURNA_H06
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:tinkerman-espurna-h06-ota]
 platform = ${common.platform}
@@ -272,7 +277,7 @@ upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 extra_scripts = ${common.extra_scripts
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:tinkerman-espurna-h08]
 platform = ${common.platform}
@@ -283,7 +288,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DTINKERMAN_ESPURNA_H08
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:tinkerman-espurna-h08-ota]
 platform = ${common.platform}
@@ -297,7 +302,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:tinkerman-espurna-switch]
 platform = ${common.platform}
@@ -308,6 +313,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DTINKERMAN_ESPURNA_SWITCH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} sensor
 
 [env:wemos-d1-tarpunashield]
 platform = ${common.platform}
@@ -318,7 +324,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DWEMOS_D1_TARPUNA_SHIELD
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 # ------------------------------------------------------------------------------
 
@@ -332,6 +338,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_BASIC
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-basic-ota]
 platform = ${common.platform}
@@ -346,6 +353,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-basic-dht]
 platform = ${common.platform}
@@ -357,7 +365,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-basic-dht-ota]
 platform = ${common.platform}
@@ -372,7 +380,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-basic-dallas]
 platform = ${common.platform}
@@ -384,7 +392,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-rf]
 platform = ${common.platform}
@@ -396,6 +404,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_RF
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-rf-ota]
 platform = ${common.platform}
@@ -410,6 +419,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-th]
 platform = ${common.platform}
@@ -421,6 +431,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_TH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-th-ota]
 platform = ${common.platform}
@@ -435,6 +446,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-pow]
 platform = ${common.platform}
@@ -446,7 +458,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_POW
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-pow-ota]
 platform = ${common.platform}
@@ -461,7 +473,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-pow-r2]
 platform = ${common.platform}
@@ -473,7 +485,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_POW_R2
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-pow-r2-ota]
 platform = ${common.platform}
@@ -488,7 +500,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-dual]
 platform = ${common.platform}
@@ -499,6 +511,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_DUAL
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-dual-ota]
 platform = ${common.platform}
@@ -512,6 +525,7 @@ upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-dual-r2]
 platform = ${common.platform}
@@ -522,6 +536,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_DUAL_R2
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-dual-ota-r2]
 platform = ${common.platform}
@@ -535,6 +550,7 @@ upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-4ch]
 platform = ${common.platform}
@@ -546,6 +562,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_4CH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-4ch-ota]
 platform = ${common.platform}
@@ -560,6 +577,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-4ch-pro]
 platform = ${common.platform}
@@ -571,6 +589,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_4CH_PRO
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-4ch-pro-ota]
 platform = ${common.platform}
@@ -585,6 +604,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-touch]
 platform = ${common.platform}
@@ -596,6 +616,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_TOUCH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-touch-ota]
 platform = ${common.platform}
@@ -610,6 +631,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-b1]
 platform = ${common.platform}
@@ -621,7 +643,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_B1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:itead-sonoff-b1-ota]
 platform = ${common.platform}
@@ -636,7 +658,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:itead-sonoff-t1-1ch]
 platform = ${common.platform}
@@ -648,6 +670,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_T1_1CH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-t1-1ch-ota]
 platform = ${common.platform}
@@ -662,6 +685,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-t1-2ch]
 platform = ${common.platform}
@@ -673,6 +697,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_T1_2CH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-t1-2ch-ota]
 platform = ${common.platform}
@@ -687,6 +712,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-t1-3ch]
 platform = ${common.platform}
@@ -698,6 +724,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_T1_3CH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-t1-3ch-ota]
 platform = ${common.platform}
@@ -712,6 +739,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-led]
 platform = ${common.platform}
@@ -723,7 +751,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_LED
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:itead-sonoff-led-ota]
 platform = ${common.platform}
@@ -738,7 +766,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:itead-sonoff-rfbridge]
 platform = ${common.platform}
@@ -750,7 +778,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_RFBRIDGE
 monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
-modules = rfbridge
+modules = ${common.modules} rfbridge
 
 [env:itead-sonoff-rfbridge-ota]
 platform = ${common.platform}
@@ -765,7 +793,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
-modules = rfbridge
+modules = ${common.modules} rfbridge
 
 [env:itead-sonoff-rfbridge-direct]
 platform = ${common.platform}
@@ -777,7 +805,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_RFBRIDGE -DRFB_DIRECT
 monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
-modules = rfbridge
+modules = ${common.modules} rfbridge
 
 [env:itead-sonoff-rfbridge-direct-ota]
 platform = ${common.platform}
@@ -792,7 +820,7 @@ upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
-modules = rfbridge
+modules = ${common.modules} rfbridge
 
 # ------------------------------------------------------------------------------
 
@@ -806,6 +834,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SLAMPHER
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-slampher-ota]
 platform = ${common.platform}
@@ -820,6 +849,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-s20]
 platform = ${common.platform}
@@ -831,6 +861,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_S20
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-s20-ota]
 platform = ${common.platform}
@@ -845,6 +876,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-1ch-inching]
 platform = ${common.platform}
@@ -856,6 +888,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_1CH_INCHING
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-1ch-inching-ota]
 platform = ${common.platform}
@@ -870,6 +903,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-motor]
 platform = ${common.platform}
@@ -881,6 +915,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_MOTOR
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-motor-ota]
 platform = ${common.platform}
@@ -895,6 +930,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-sv]
 platform = ${common.platform}
@@ -906,6 +942,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_SV
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-sv-ota]
 platform = ${common.platform}
@@ -919,6 +956,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:itead-sonoff-s31]
 platform = ${common.platform}
@@ -930,6 +968,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_S31
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} sensor
 
 [env:itead-sonoff-s31-ota]
 platform = ${common.platform}
@@ -943,6 +982,7 @@ upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} sensor
 
 # ------------------------------------------------------------------------------
 
@@ -955,6 +995,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:electrodragon-wifi-iot-ota]
 platform = ${common.platform}
@@ -968,6 +1009,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:workchoice-ecoplug]
 platform = ${common.platform}
@@ -979,6 +1021,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DWORKCHOICE_ECOPLUG
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:workchoice-ecoplug-ota]
 platform = ${common.platform}
@@ -993,6 +1036,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jangoe-wifi-relay-nc]
 platform = ${common.platform}
@@ -1003,6 +1047,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DJANGOE_WIFI_RELAY_NC
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jangoe-wifi-relay-nc-ota]
 platform = ${common.platform}
@@ -1016,6 +1061,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jangoe-wifi-relay-no]
 platform = ${common.platform}
@@ -1026,6 +1072,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DJANGOE_WIFI_RELAY_NO
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jangoe-wifi-relay-no-ota]
 platform = ${common.platform}
@@ -1039,6 +1086,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:openenergymonitor-mqtt-relay]
 platform = ${common.platform}
@@ -1049,6 +1097,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPPORT=1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:openenergymonitor-mqtt-relay-ota]
 platform = ${common.platform}
@@ -1062,6 +1111,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jorgegarcia-wifi-relays]
 platform = ${common.platform}
@@ -1072,6 +1122,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DJORGEGARCIA_WIFI_RELAYS
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:jorgegarcia-wifi-relays-ota]
 platform = ${common.platform}
@@ -1085,6 +1136,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:aithinker-ai-light]
 platform = ${common.platform}
@@ -1096,7 +1148,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DAITHINKER_AI_LIGHT
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:aithinker-ai-light-ota]
 platform = ${common.platform}
@@ -1111,7 +1163,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:magichome-led-controller]
 platform = ${common.platform}
@@ -1123,7 +1175,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DMAGICHOME_LED_CONTROLLER
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:magichome-led-controller-ota]
 platform = ${common.platform}
@@ -1138,7 +1190,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:magichome-led-controller-20]
 platform = ${common.platform}
@@ -1150,7 +1202,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DMAGICHOME_LED_CONTROLLER_20
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:magichome-led-controller-20-ota]
 platform = ${common.platform}
@@ -1164,7 +1216,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:huacanxing-h801]
 platform = ${common.platform}
@@ -1176,7 +1228,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DHUACANXING_H801
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:huacanxing-h801-ota]
 platform = ${common.platform}
@@ -1191,7 +1243,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:huacanxing-h802]
 platform = ${common.platform}
@@ -1203,7 +1255,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DHUACANXING_H802
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:huacanxing-h802-ota]
 platform = ${common.platform}
@@ -1218,7 +1270,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc01]
 platform = ${common.platform}
@@ -1230,7 +1282,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARILUX_AL_LC01
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc01-ota]
 platform = ${common.platform}
@@ -1245,7 +1297,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc02]
 platform = ${common.platform}
@@ -1257,7 +1309,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARILUX_AL_LC02
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc02-ota]
 platform = ${common.platform}
@@ -1272,7 +1324,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc06]
 platform = ${common.platform}
@@ -1284,7 +1336,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARILUX_AL_LC06
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc06-ota]
 platform = ${common.platform}
@@ -1299,7 +1351,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc11]
 platform = ${common.platform}
@@ -1311,7 +1363,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARILUX_AL_LC11
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-al-lc11-ota]
 platform = ${common.platform}
@@ -1326,7 +1378,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:arilux-e27]
 platform = ${common.platform}
@@ -1338,6 +1390,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARILUX_E27
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} light
 
 [env:arilux-e27-ota]
 platform = ${common.platform}
@@ -1352,6 +1405,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} light
 
 [env:itead-bnsz01]
 platform = ${common.platform}
@@ -1363,7 +1417,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_BNSZ01
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:itead-bnsz01-ota]
 platform = ${common.platform}
@@ -1378,7 +1432,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:wion-50055]
 platform = ${common.platform}
@@ -1390,7 +1444,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DWION_50055
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules}
 
 [env:wion-50055-ota]
 platform = ${common.platform}
@@ -1405,7 +1459,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules}
 
 [env:exs-wifi-relay-v31]
 platform = ${common.platform}
@@ -1417,6 +1471,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DEXS_WIFI_RELAY_V31
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:exs-wifi-relay-v31-ota]
 platform = ${common.platform}
@@ -1431,6 +1486,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:wemos-v9261f]
 platform = ${common.platform}
@@ -1442,7 +1498,7 @@ build_flags = ${common.build_flags_4m1m} -DGENERIC_V9261F
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:wemos-v9261f-ota]
 platform = ${common.platform}
@@ -1456,7 +1512,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:esp01-v9261f]
 platform = ${common.platform}
@@ -1468,7 +1524,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_V9261F
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:esp01-v9261f-ota]
 platform = ${common.platform}
@@ -1483,7 +1539,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:wemos-ech1560]
 platform = ${common.platform}
@@ -1495,7 +1551,7 @@ build_flags = ${common.build_flags_4m1m} -DGENERIC_ECH1560
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:wemos-ech1560-ota]
 platform = ${common.platform}
@@ -1509,7 +1565,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:esp01-ech1560]
 platform = ${common.platform}
@@ -1521,7 +1577,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_ECH1560
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:esp01-ech1560-ota]
 platform = ${common.platform}
@@ -1536,7 +1592,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:mancavemade-esplive]
 platform = ${common.platform}
@@ -1548,6 +1604,7 @@ build_flags = ${common.build_flags_4m1m} -DMANCAVEMADE_ESPLIVE
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:mancavemade-esplive-ota]
 platform = ${common.platform}
@@ -1561,6 +1618,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:intermittech-quinled]
 platform = ${common.platform}
@@ -1572,7 +1630,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DINTERMITTECH_QUINLED
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:intermittech-quinled-ota]
 platform = ${common.platform}
@@ -1587,7 +1645,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:xenon-sm-pw702u]
 platform = ${common.platform}
@@ -1599,6 +1657,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DXENON_SM_PW702U
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:xenon-sm-pw702u-ota]
 platform = ${common.platform}
@@ -1613,6 +1672,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:authometion-lyt8266]
 platform = ${common.platform}
@@ -1624,7 +1684,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DAUTHOMETION_LYT8266
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:authometion-lyt8266-ota]
 platform = ${common.platform}
@@ -1639,7 +1699,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = light
+modules = ${common.modules} light
 
 [env:kmc-70011]
 platform = ${common.platform}
@@ -1651,7 +1711,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DKMC_70011
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:kmc-70011-ota]
 platform = ${common.platform}
@@ -1666,7 +1726,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:yjzk-switch-2ch]
 platform = ${common.platform}
@@ -1678,6 +1738,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DYJZK_SWITCH_2CH
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:yjzk-switch-2ch-ota]
 platform = ${common.platform}
@@ -1692,6 +1753,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:generic-8ch]
 platform = ${common.platform}
@@ -1703,6 +1765,7 @@ build_flags = ${common.build_flags_4m1m} -DGENERIC_8CH
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:gizwits-witty-cloud]
 platform = ${common.platform}
@@ -1714,6 +1777,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DGIZWITS_WITTY_CLOUD
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:gizwits-witty-cloud-ota]
 platform = ${common.platform}
@@ -1727,6 +1791,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:euromate-wifi-stecker-shuko]
 platform = ${common.platform}
@@ -1738,6 +1803,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DEUROMATE_WIFI_STECKER_SCHUKO
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:euromate-wifi-stecker-shuko-ota]
 platform = ${common.platform}
@@ -1751,6 +1817,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:tonbux-powerstrip02]
 platform = ${common.platform}
@@ -1762,6 +1829,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DTONBUX_POWERSTRIP02
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:tonbux-powerstrip02-ota]
 platform = ${common.platform}
@@ -1775,6 +1843,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:lingan-swa1]
 platform = ${common.platform}
@@ -1786,6 +1855,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DLINGAN_SWA1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:lingan-swa1-ota]
 platform = ${common.platform}
@@ -1799,6 +1869,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:stm-relay]
 platform = ${common.platform}
@@ -1810,6 +1881,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DSTM_RELAY
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:stm-relay-ota]
 platform = ${common.platform}
@@ -1824,6 +1896,7 @@ upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:heygo-hy02]
 platform = ${common.platform}
@@ -1835,6 +1908,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DHEYGO_HY02
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:heygo-hy02-ota]
 platform = ${common.platform}
@@ -1848,6 +1922,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:maxcio-wus002s]
 platform = ${common.platform}
@@ -1859,6 +1934,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DMAXCIO_WUS002S
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:maxcio-wus002s-ota]
 platform = ${common.platform}
@@ -1872,6 +1948,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:yidian-xsssa05]
 platform = ${common.platform}
@@ -1883,7 +1960,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DYIDIAN_XSSSA05
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:yidian-xsssa05-ota]
 platform = ${common.platform}
@@ -1897,7 +1974,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:tonbux-xsssa06]
 platform = ${common.platform}
@@ -1909,6 +1986,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DTONBUX_XSSSA06
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:tonbux-xsssa06-ota]
 platform = ${common.platform}
@@ -1922,6 +2000,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:green-esp8266relay]
 platform = ${common.platform}
@@ -1933,6 +2012,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DGREEN_ESP8266RELAY
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:green-esp8266relay-ota]
 platform = ${common.platform}
@@ -1946,6 +2026,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:ike-espike]
 platform = ${common.platform}
@@ -1957,6 +2038,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DIKE_ESPIKE
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:ike-espike-ota]
 platform = ${common.platform}
@@ -1970,6 +2052,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:arniex-swifitch]
 platform = ${common.platform}
@@ -1981,6 +2064,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DARNIEX_SWIFITCH
 extra_scripts = ${common.extra_scripts}
 monitor_speed = 115200
+modules = ${common.modules}
 
 [env:arniex-swifitch-ota]
 platform = ${common.platform}
@@ -1994,6 +2078,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:zhilde-eu44-w]
 platform = ${common.platform}
@@ -2005,6 +2090,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DZHILDE_EU44_W
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:zhilde-eu44-w-ota]
 platform = ${common.platform}
@@ -2019,6 +2105,7 @@ upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:luani-hvio]
 platform = ${common.platform}
@@ -2030,6 +2117,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DLUANI_HVIO
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:luani-hvio-ota]
 platform = ${common.platform}
@@ -2044,6 +2132,7 @@ upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:neo-coolcam-power-plug-wifi]
 platform = ${common.platform}
@@ -2055,6 +2144,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_POWER_PLUG_WIFI
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:neo-coolcam-power-plug-wifi-ota]
 platform = ${common.platform}
@@ -2068,6 +2158,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:estink-wifi-power-strip]
 platform = ${common.platform}
@@ -2079,6 +2170,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_4m1m} -DESTINK_WIFI_POWER_STRIP
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:estink-wifi-power-strip-ota]
 platform = ${common.platform}
@@ -2092,6 +2184,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 # ------------------------------------------------------------------------------
 # GENERIC OTA ENVIRONMENTS
@@ -2107,6 +2200,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_RELAY_V40
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:generic-esp01s-relay-40-ota]
 platform = ${common.platform}
@@ -2120,6 +2214,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:generic-esp01s-rgbled-10]
 platform = ${common.platform}
@@ -2131,6 +2226,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_RGBLED_V10
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:generic-esp01s-rgbled-10-ota]
 platform = ${common.platform}
@@ -2144,6 +2240,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:generic-esp01s-dht11-10]
 platform = ${common.platform}
@@ -2155,7 +2252,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_DHT11_V10
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:generic-esp01s-dht11-10-ota]
 platform = ${common.platform}
@@ -2169,7 +2266,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:generic-esp01s-ds18b20-10]
 platform = ${common.platform}
@@ -2181,7 +2278,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DGENERIC_ESP01S_DS18B20_V10
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:generic-esp01s-ds18b20-10-ota]
 platform = ${common.platform}
@@ -2195,7 +2292,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:heltec-touch-relay]
 platform = ${common.platform}
@@ -2207,6 +2304,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DHELTEC_TOUCHRELAY
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:heltec-touch-relay-ota]
 platform = ${common.platform}
@@ -2220,6 +2318,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:allnet-4duino-iot-wlan-relais]
 platform = ${common.platform}
@@ -2231,6 +2330,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DALLNET_4DUINO_IOT_WLAN_RELAIS
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:allnet-4duino-iot-wlan-relais-ota]
 platform = ${common.platform}
@@ -2244,6 +2344,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:tonbux-mosquito-killer]
 platform = ${common.platform}
@@ -2255,6 +2356,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DTONBUX_MOSQUITO_KILLER
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:tonbux-mosquito-killer-ota]
 platform = ${common.platform}
@@ -2268,6 +2370,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
+modules = ${common.modules}
 
 [env:pilotak-esp-din-v1]
 platform = ${common.platform}
@@ -2279,7 +2382,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DPILOTAK_ESP_DIN_V1
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:pilotak-esp-din-v1-ota]
 platform = ${common.platform}
@@ -2293,7 +2396,7 @@ upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
 
 [env:nodemcu-geiger]
 platform = ${common.platform}
@@ -2301,8 +2404,22 @@ framework = arduino
 board = nodemcu
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m0m} -DNODEMCU_BASIC -DNOWSAUTH -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
+build_flags = ${common.build_flags_1m0m} -DNODEMCU_BASIC -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
 upload_speed = 460800
 monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
-modules = sensor
+modules = ${common.modules} sensor
+
+[env:nodemcu-geiger-ota]
+platform = ${common.platform}
+framework = arduino
+board = nodemcu
+lib_deps = ${common.lib_deps}
+lib_ignore = ${common.lib_ignore}
+build_flags = ${common.build_flags_1m0m} -DNODEMCU_BASIC -DGEIGER_SUPPORT=1 -DEVENTS_SUPPORT=0 -DINFLUXDB_SUPPORT=1 -DALEXA_SUPPORT=0 -DALEXA_ENABLED=0
+upload_speed = 460800
+monitor_speed = 115200
+upload_port = "${env.ESPURNA_IP}"
+upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
+extra_scripts = ${common.extra_scripts}
+modules = ${common.modules} sensor