diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index c7e892d3..677a1713 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -9,7 +9,8 @@
 
 //#define NODEMCU_LOLIN
 //#define WEMOS_D1_MINI_RELAYSHIELD
-//#define TINKERMAN_ESPURNA_H
+//#define TINKERMAN_ESPURNA_H06
+//#define TINKERMAN_ESPURNA_H07
 //#define ITEAD_SONOFF_BASIC
 //#define ITEAD_SONOFF_RF
 //#define ITEAD_SONOFF_TH
@@ -34,14 +35,20 @@
 //#define WORKCHOICE_ECOPLUG
 //#define AITHINKER_AI_LIGHT
 //#define MAGICHOME_LED_CONTROLLER
-//#define MAGICHOME_LED_CONTROLLER_IR
+//#define MAGICHOME_LED_CONTROLLER_20
 //#define HUACANXING_H801
+//#define HUACANXING_H802
 //#define JANGOE_WIFI_RELAY_NC
 //#define JANGOE_WIFI_RELAY_NO
 //#define JORGEGARCIA_WIFI_RELAYS
 //#define OPENENERGYMONITOR_MQTT_RELAY
-//#define HUACANXING_H802
-//#define QUINLED
+//#define WION_50055
+//#define EXS_WIFI_RELAY_V31
+//#define GENERIC_V9261F
+//#define GENERIC_ECH1560
+//#define MANCAVEMADE_ESPLIVE
+//#define INTERMITTECH_QUINLED
+//#define ARILUX_AL_LC06
 
 //--------------------------------------------------------------------------------
 // Features (values below are non-default values)
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 93c58d62..24924997 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -805,7 +805,7 @@
     #endif
 
 // -----------------------------------------------------------------------------
-// HUACANXING H801
+// HUACANXING H801 & H802
 // -----------------------------------------------------------------------------
 
 #elif defined(HUACANXING_H801)
@@ -834,6 +834,26 @@
     #define LIGHT_CH4_INVERSE   0
     #define LIGHT_CH5_INVERSE   0
 
+#elif defined(HUACANXING_H802)
+
+    // Info
+    #define MANUFACTURER        "HUACANXING"
+    #define DEVICE              "H802"
+    #define RELAY_PROVIDER      RELAY_PROVIDER_LIGHT
+    #define LIGHT_PROVIDER      LIGHT_PROVIDER_DIMMER
+    #define DUMMY_RELAY_COUNT   1
+
+    // Channels
+    #define LIGHT_CH1_PIN       12      // RED
+    #define LIGHT_CH2_PIN       14      // GREEN
+    #define LIGHT_CH3_PIN       13      // BLUE
+    #define LIGHT_CH4_PIN       15      // WHITE
+
+    #define LIGHT_CH1_INVERSE   0
+    #define LIGHT_CH2_INVERSE   0
+    #define LIGHT_CH3_INVERSE   0
+    #define LIGHT_CH4_INVERSE   0
+
 // -----------------------------------------------------------------------------
 // Jan Goedeke Wifi Relay
 // https://github.com/JanGoe/esp8266-wifi-relay
@@ -977,30 +997,6 @@
     #define RELAY1_TYPE         RELAY_TYPE_LATCHED
     #define RELAY1_RESET_PIN    12
 
-// -----------------------------------------------------------------------------
-// HUACANXING H802
-// -----------------------------------------------------------------------------
-
-#elif defined(HUACANXING_H802)
-
-    // Info
-    #define MANUFACTURER        "HUACANXING"
-    #define DEVICE              "H802"
-    #define RELAY_PROVIDER      RELAY_PROVIDER_LIGHT
-    #define LIGHT_PROVIDER      LIGHT_PROVIDER_DIMMER
-    #define DUMMY_RELAY_COUNT   1
-
-    // Channels
-    #define LIGHT_CH1_PIN       12      // RED
-    #define LIGHT_CH2_PIN       14      // GREEN
-    #define LIGHT_CH3_PIN       13      // BLUE
-    #define LIGHT_CH4_PIN       15      // WHITE
-
-    #define LIGHT_CH1_INVERSE   0
-    #define LIGHT_CH2_INVERSE   0
-    #define LIGHT_CH3_INVERSE   0
-    #define LIGHT_CH4_INVERSE   0
-
 // -----------------------------------------------------------------------------
 // V9261F
 // -----------------------------------------------------------------------------