diff --git a/code/debug b/code/debug
index b225b90e..7ccba580 100755
--- a/code/debug
+++ b/code/debug
@@ -4,7 +4,7 @@
 # CONFIGURATION
 # ------------------------------------------------------------------------------
 
-ENVIRONMENT="node-debug"
+ENVIRONMENT="d1-debug"
 ADDR2LINE=$HOME/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-addr2line
 DECODER=utils/EspStackTraceDecoder.jar
 DECODER_ORIGIN=https://github.com/littleyoda/EspStackTraceDecoder/releases/download/untagged-83b6db3208da17a0f1fd/EspStackTraceDecoder.jar
diff --git a/code/espurna/config/all.h b/code/espurna/config/all.h
index 7c49a3e4..ddbefc6d 100644
--- a/code/espurna/config/all.h
+++ b/code/espurna/config/all.h
@@ -1,4 +1,5 @@
 #include "version.h"
+#include "arduino.h"
 #include "debug.h"
 #include "general.h"
 #include "hardware.h"
diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
new file mode 100644
index 00000000..dd6eb88c
--- /dev/null
+++ b/code/espurna/config/arduino.h
@@ -0,0 +1,40 @@
+//--------------------------------------------------------------------------------
+// This setting is normally provided by PlatformIO
+// Uncomment the appropiate line to build from the Arduino IDE
+//--------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------
+// General
+//--------------------------------------------------------------------------------
+
+//#define DEBUG_PORT              Serial
+
+//--------------------------------------------------------------------------------
+// Hardware
+//--------------------------------------------------------------------------------
+
+//#define D1_RELAYSHIELD
+//#define NODEMCUV2
+//#define SONOFF
+//#define SONOFF_TH
+//#define SLAMPHER
+//#define S20
+//#define SONOFF_SV
+//#define SONOFF_POW
+//#define SONOFF_DUAL
+//#define SONOFF_4CH
+//#define ESP_RELAY_BOARD
+//#define ECOPLUG
+//#define ESPURNA
+
+//--------------------------------------------------------------------------------
+// Features
+//--------------------------------------------------------------------------------
+
+//#define ENABLE_DHT            1
+//#define ENABLE_DS18B20        1
+//#define ENABLE_EMON           1
+//#define ENABLE_HLW8018        1
+//#define ENABLE_RF             1
+//#define ENABLE_FAUXMO         0
+//#define ENABLE_NOFUSS         1
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 2d0d90f9..399f8867 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -106,4 +106,7 @@
 // FAUXO
 // -----------------------------------------------------------------------------
 
+#ifndef ENABLE_FAUXMO
+    #define ENABLE_FAUXMO       1
+#endif
 #define FAUXMO_ENABLED          1
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index a2748b94..1616de35 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -1,34 +1,3 @@
-//--------------------------------------------------------------------------------
-// HARDWARE
-// This setting is normally provided by PlatformIO
-// Uncomment the appropiate line to build from the Arduino IDE
-//--------------------------------------------------------------------------------
-
-//#define NODEMCUV2
-//#define SONOFF
-//#define SONOFF_TH
-//#define SLAMPHER
-//#define S20
-//#define SONOFF_SV
-//#define SONOFF_POW
-//#define SONOFF_DUAL
-//#define SONOFF_4CH
-//#define ESP_RELAY_BOARD
-//#define ECOPLUG
-//#define ESPURNA
-
-//#define ENABLE_DHT            1
-//#define ENABLE_DS18B20        1
-//#define ENABLE_EMON           1
-//#define ENABLE_HLW8018        1
-//#define ENABLE_RF             1
-//#define ENABLE_FAUXMO         0
-//#define ENABLE_NOFUSS         1
-
-#ifndef ENABLE_FAUXMO
-    #define ENABLE_FAUXMO       1
-#endif
-
 // -----------------------------------------------------------------------------
 // Development boards
 // -----------------------------------------------------------------------------