diff --git a/code/espurna/button.ino b/code/espurna/button.ino
index 642e04fa..dcef559d 100644
--- a/code/espurna/button.ino
+++ b/code/espurna/button.ino
@@ -186,6 +186,7 @@ void buttonSetup() {
     #else
 
         unsigned long btnDelay = getSetting("btnDelay", BUTTON_DBLCLICK_DELAY).toInt();
+        UNUSED(btnDelay);
 
         #if BUTTON1_PIN != GPIO_NONE
         {
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index fbf932e9..197c25b6 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -34,28 +34,27 @@
     #define MANUFACTURER            "ESPRESSIF"
     #define DEVICE                  "ESPURNA_CORE"
 
-    // UI modules
-    #define BUTTON_SUPPORT          0
-    #define MDNS_SERVER_SUPPORT     0
-    #define NTP_SUPPORT             0
-    #define WEB_SUPPORT             0
-
     // Disable non-core modules
     #define ALEXA_SUPPORT           0
+    #define API_SUPPORT             0
     #define BROKER_SUPPORT          0
     #define DOMOTICZ_SUPPORT        0
+    #define DEBUG_SERIAL_SUPPORT    0
+    #define DEBUG_TELNET_SUPPORT    0
+    #define DEBUG_WEB_SUPPORT       0
     #define HOMEASSISTANT_SUPPORT   0
     #define I2C_SUPPORT             0
     #define MQTT_SUPPORT            0
+    #define NTP_SUPPORT             0
     #define SCHEDULER_SUPPORT       0
     #define SENSOR_SUPPORT          0
     #define THINGSPEAK_SUPPORT      0
+    #define WEB_SUPPORT             0
 
     // Extra light-weight image
-    //#define DEBUG_SERIAL_SUPPORT    0
-    //#define DEBUG_TELNET_SUPPORT    0
-    //#define DEBUG_WEB_SUPPORT       0
+    //#define BUTTON_SUPPORT          0
     //#define LED_SUPPORT             0
+    //#define MDNS_SERVER_SUPPORT     0
     //#define TELNET_SUPPORT          0
     //#define TERMINAL_SUPPORT        0
 
diff --git a/code/espurna/config/prototypes.h b/code/espurna/config/prototypes.h
index 9805983b..684637c4 100644
--- a/code/espurna/config/prototypes.h
+++ b/code/espurna/config/prototypes.h
@@ -8,6 +8,8 @@ extern "C" {
     #include "user_interface.h"
 }
 
+#define UNUSED(x) (void)(x)
+
 // -----------------------------------------------------------------------------
 // API
 // -----------------------------------------------------------------------------
diff --git a/code/espurna/pwm.c b/code/espurna/pwm.c
index b925da8e..e85500b4 100644
--- a/code/espurna/pwm.c
+++ b/code/espurna/pwm.c
@@ -445,5 +445,5 @@ get_pwm_version(void)
 void ICACHE_FLASH_ATTR
 set_pwm_debug_en(uint8_t print_en)
 {
-	(void) print_en;
+	UNUSED(print_en);
 }
diff --git a/code/espurna/sensors/ECH1560Sensor.h b/code/espurna/sensors/ECH1560Sensor.h
index 5fe7419e..48541ca0 100644
--- a/code/espurna/sensors/ECH1560Sensor.h
+++ b/code/espurna/sensors/ECH1560Sensor.h
@@ -127,7 +127,7 @@ class ECH1560Sensor : public BaseSensor {
 
         void ICACHE_RAM_ATTR handleInterrupt(unsigned char gpio) {
 
-            (void) gpio;
+            UNSUSED(gpio);
 
             // if we are trying to find the sync-time (CLK goes high for 1-2ms)
             if (_dosync == false) {
diff --git a/code/espurna/sensors/EmonADC121Sensor.h b/code/espurna/sensors/EmonADC121Sensor.h
index cfe09b9e..84617bab 100644
--- a/code/espurna/sensors/EmonADC121Sensor.h
+++ b/code/espurna/sensors/EmonADC121Sensor.h
@@ -140,7 +140,7 @@ class EmonADC121Sensor : public EmonSensor {
         }
 
         unsigned int readADC(unsigned char channel) {
-            (void) channel;
+            UNUSED(channel);
             unsigned int value = i2c_read_uint16(_address, ADC121_REG_RESULT) & 0x0FFF;
             return value;
         }
diff --git a/code/espurna/sensors/EmonADS1X15Sensor.h b/code/espurna/sensors/EmonADS1X15Sensor.h
index bbd7eadd..e50b0460 100644
--- a/code/espurna/sensors/EmonADS1X15Sensor.h
+++ b/code/espurna/sensors/EmonADS1X15Sensor.h
@@ -325,7 +325,7 @@ class EmonADS1X15Sensor : public EmonSensor {
         }
 
         unsigned int readADC(unsigned char channel) {
-            (void) channel;
+            UNUSED(channel);
             unsigned int value = i2c_read_uint16(_address, ADS1X15_REG_POINTER_CONVERT);
             if (_type = ADS1X15_CHIP_ADS1015) value >>= ADS1015_BIT_SHIFT;
             delayMicroseconds(500);
diff --git a/code/espurna/sensors/EmonAnalogSensor.h b/code/espurna/sensors/EmonAnalogSensor.h
index 9a2cfe88..97b19043 100644
--- a/code/espurna/sensors/EmonAnalogSensor.h
+++ b/code/espurna/sensors/EmonAnalogSensor.h
@@ -119,7 +119,7 @@ class EmonAnalogSensor : public EmonSensor {
     protected:
 
         unsigned int readADC(unsigned char channel) {
-            (void) channel;
+            UNUSED(channel);
             return analogRead(0);
         }
 
diff --git a/code/espurna/sensors/EventSensor.h b/code/espurna/sensors/EventSensor.h
index 9b1c9fae..4910e9b8 100644
--- a/code/espurna/sensors/EventSensor.h
+++ b/code/espurna/sensors/EventSensor.h
@@ -123,7 +123,7 @@ class EventSensor : public BaseSensor {
 
         // Handle interrupt calls
         void ICACHE_RAM_ATTR handleInterrupt(unsigned char gpio) {
-            (void) gpio;
+            UNUSED(gpio);
             static unsigned long last = 0;
 
             // clock count in 32bit value, overflowing:
diff --git a/code/espurna/sensors/GeigerSensor.h b/code/espurna/sensors/GeigerSensor.h
index 7165ed61..44dbbdba 100644
--- a/code/espurna/sensors/GeigerSensor.h
+++ b/code/espurna/sensors/GeigerSensor.h
@@ -169,7 +169,7 @@ double value(unsigned char index) {
 
 // Handle interrupt calls
 void handleInterrupt(unsigned char gpio) {
-        (void) gpio;
+        UNUSED(gpio);
         static unsigned long last = 0;
         if (millis() - last > _debounce) {
                 _events = _events + 1;
diff --git a/code/espurna/terminal.ino b/code/espurna/terminal.ino
index 7ffa7710..4e97d970 100644
--- a/code/espurna/terminal.ino
+++ b/code/espurna/terminal.ino
@@ -71,6 +71,7 @@ void _terminalKeysCommand() {
     }
 
     unsigned long freeEEPROM = SPI_FLASH_SEC_SIZE - settingsSize();
+    UNUSED(freeEEPROM);
     DEBUG_MSG_P(PSTR("Number of keys: %d\n"), keys.size());
     DEBUG_MSG_P(PSTR("Current EEPROM sector: %u\n"), EEPROMr.current());
     DEBUG_MSG_P(PSTR("Free EEPROM: %d bytes (%d%%)\n"), freeEEPROM, 100 * freeEEPROM / SPI_FLASH_SEC_SIZE);
diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino
index 536e4f53..c236efd6 100644
--- a/code/espurna/utils.ino
+++ b/code/espurna/utils.ino
@@ -206,6 +206,9 @@ void heartbeat() {
 
     unsigned long uptime_seconds = getUptime();
     unsigned int free_heap = getFreeHeap();
+    
+    UNUSED(uptime_seconds);
+    UNUSED(free_heap);
 
     #if MQTT_SUPPORT
         unsigned char _heartbeat_mode = getHeartbeatMode();
@@ -418,6 +421,7 @@ void info() {
     // -------------------------------------------------------------------------
 
     FlashMode_t mode = ESP.getFlashChipMode();
+    UNUSED(mode);
     DEBUG_MSG_P(PSTR("[MAIN] Flash chip ID: 0x%06X\n"), ESP.getFlashChipId());
     DEBUG_MSG_P(PSTR("[MAIN] Flash speed: %u Hz\n"), ESP.getFlashChipSpeed());
     DEBUG_MSG_P(PSTR("[MAIN] Flash mode: %s\n"), mode == FM_QIO ? "QIO" : mode == FM_QOUT ? "QOUT" : mode == FM_DIO ? "DIO" : mode == FM_DOUT ? "DOUT" : "UNKNOWN");
diff --git a/code/platformio.ini b/code/platformio.ini
index f90ff394..29562679 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -1,5 +1,5 @@
 [platformio]
-env_default = nodemcu-lolin
+env_default = wemos-d1mini-relayshield
 src_dir = espurna
 data_dir = espurna/data
 
@@ -13,14 +13,16 @@ data_dir = espurna/data
 #   arduino core 2.4.0 = platformIO 1.6.0
 #   arduino core 2.4.1 = platformIO 1.7.3
 #   arduino core 2.4.2 = platformIO 1.8.0
+#   arduino core 2.5.0 = platformIO 2.0.4
 # ------------------------------------------------------------------------------
 arduino_core_2_3_0 = espressif8266@1.5.0
 arduino_core_2_4_0 = espressif8266@1.6.0
 arduino_core_2_4_1 = espressif8266@1.7.3
 arduino_core_2_4_2 = espressif8266@1.8.0
+arduino_core_2_5_0 = espressif8266@2.0.4
 
 platform = ${common.arduino_core_2_3_0}
-platform_latest = ${common.arduino_core_2_4_2}
+platform_latest = ${common.arduino_core_2_5_0}
 
 # ------------------------------------------------------------------------------
 # FLAGS: DEBUG
@@ -116,7 +118,7 @@ board = ${common.board_1m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m0m} -DESPURNA_CORE
+build_flags = ${common.build_flags_1m0m} -DESPURNA_CORE -DJUSTWIFI_ENABLE_WPS=1
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
@@ -127,7 +129,7 @@ board = ${common.board_2m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_2m1m} -DESPURNA_CORE
+build_flags = ${common.build_flags_2m1m} -DESPURNA_CORE -DJUSTWIFI_ENABLE_WPS=1
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
@@ -138,7 +140,7 @@ board = ${common.board_4m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_4m1m} -DESPURNA_CORE
+build_flags = ${common.build_flags_4m1m} -DESPURNA_CORE -DJUSTWIFI_ENABLE_WPS=1
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
@@ -250,7 +252,7 @@ monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-d1mini-relayshield-ssl]
-platform = ${common.platform_173}
+platform = ${common.arduino_core_2_5_0}
 framework = ${common.framework}
 board = ${common.board_4m}
 board_build.flash_mode = ${common.flash_mode}
@@ -287,7 +289,7 @@ monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
 [env:nodemcu-lolin-ssl]
-platform = ${common.platform_173}
+platform = ${common.arduino_core_2_5_0}
 framework = ${common.framework}
 board = ${common.board_4m}
 board_build.flash_mode = ${common.flash_mode}