diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 644aeb17..b32c7574 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -34,20 +34,22 @@
     #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 BROKER_SUPPORT          0
-    #define BUTTON_SUPPORT          0
     #define DOMOTICZ_SUPPORT        0
     #define HOMEASSISTANT_SUPPORT   0
     #define I2C_SUPPORT             0
-    #define MDNS_SERVER_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