diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index e173fe1f..12449895 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -66,6 +66,7 @@
 //--------------------------------------------------------------------------------
 
 //#define ALEXA_SUPPORT          0
+//#define BROKER_SUPPORT         0
 //#define DEBUG_SERIAL_SUPPORT   0
 //#define DEBUG_TELNET_SUPPORT   0
 //#define DEBUG_UDP_SUPPORT      1
@@ -77,7 +78,6 @@
 //#define LLMNR_SUPPORT          1  // Only with Arduino Core 2.4.0
 //#define MDNS_SERVER_SUPPORT    0
 //#define MDNS_CLIENT_SUPPORT    1
-//#define BROKER_SUPPORT         0
 //#define MQTT_SUPPORT           0
 //#define NETBIOS_SUPPORT        1  // Only with Arduino Core 2.4.0
 //#define NOFUSS_SUPPORT         1
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index a20ff152..8ca8ff3a 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -15,24 +15,6 @@
 #define ARRAYINIT(type, name, ...) \
     type name[] = {__VA_ARGS__};
 
-//------------------------------------------------------------------------------
-// ESPURNA CORE
-//------------------------------------------------------------------------------
-
-#ifdef ESPURNA_CORE
-    #define ALEXA_SUPPORT           0
-    #define BROKER_SUPPORT          0
-    #define DOMOTICZ_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
-#endif
-
 //------------------------------------------------------------------------------
 // TELNET
 //------------------------------------------------------------------------------
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 2ea44670..17986527 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -20,11 +20,38 @@
 //
 // Besides, other hardware specific information should be stated here
 
+// -----------------------------------------------------------------------------
+// ESPurna Core
+// -----------------------------------------------------------------------------
+
+#if defined(ESPURNA_CORE)
+
+    // This is a special device targeted to generate a light-weight binary image
+    // meant to be able to do two-step-updates:
+    // https://github.com/xoseperez/espurna/wiki/TwoStepUpdates
+
+    // Info
+    #define MANUFACTURER            "ESPRESSIF"
+    #define DEVICE                  "ESPURNA_CORE"
+
+    // Disable non-core modules
+    #define ALEXA_SUPPORT           0
+    #define BROKER_SUPPORT          0
+    #define DOMOTICZ_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
+
 // -----------------------------------------------------------------------------
 // Development boards
 // -----------------------------------------------------------------------------
 
-#if defined(NODEMCU_LOLIN)
+#elif defined(NODEMCU_LOLIN)
 
     // Info
     #define MANUFACTURER        "NODEMCU"
diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino
index 3d86c767..8ad092d5 100644
--- a/code/espurna/utils.ino
+++ b/code/espurna/utils.ino
@@ -336,7 +336,8 @@ void info() {
 
     #if SENSOR_SUPPORT
 
-        DEBUG_MSG_P(PSTR("\n[INIT] SENSORS:"));
+        DEBUG_MSG_P(PSTR("\n"));
+        DEBUG_MSG_P(PSTR("[INIT] SENSORS:"));
 
         #if ANALOG_SUPPORT
             DEBUG_MSG_P(PSTR(" ANALOG"));
diff --git a/code/platformio.ini b/code/platformio.ini
index 71b16330..a8d2e7cc 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -44,7 +44,7 @@ board = esp01_1m
 board_flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC -DESPURNA_CORE
+build_flags = ${common.build_flags_1m} -DESPURNA_CORE
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
@@ -55,7 +55,7 @@ board = d1_mini
 board_flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags} -DITEAD_SONOFF_BASIC -DESPURNA_CORE
+build_flags = ${common.build_flags} -DESPURNA_CORE
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}