diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
index 3883918849fbbf895f6bc78a49eb7e187c1e5bb6..f69cc98b0fe94ba81ac9869bece8e9f3fb8b6619 100644
--- a/variants/esp320/pins_arduino.h
+++ b/variants/esp320/pins_arduino.h
@@ -9,6 +9,12 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
+static const uint8_t LED_BUILTIN = 5;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
 static const uint8_t SDA = 2;
 static const uint8_t SCL = 14;
 
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
index 6485bc09763da444ffbc84ebf367a5315c1abd3b..3da4bf2ba007b4735c1f169db1b3b0183ba94bd0 100644
--- a/variants/esp32thing/pins_arduino.h
+++ b/variants/esp32thing/pins_arduino.h
@@ -9,6 +9,11 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
+static const uint8_t LED_BUILTIN = 5;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
+
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
index c87e1a23cb503b16765a5c9ac7b54055207542bd..8ce2507d6272938ce7fdf90b69aea33bef742d3e 100644
--- a/variants/espea32/pins_arduino.h
+++ b/variants/espea32/pins_arduino.h
@@ -9,7 +9,10 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-#define LED_BUILTIN             5
+static const uint8_t LED_BUILTIN = 5;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
index a76095fe06d97ca1d4a5089e1494e0217f91fa01..ef1005755944cc61c20541bd1753a77ce187463d 100644
--- a/variants/hornbill32dev/pins_arduino.h
+++ b/variants/hornbill32dev/pins_arduino.h
@@ -9,7 +9,12 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-static const uint8_t TX = 1;  
+static const uint8_t LED_BUILTIN = 13;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
+
+static const uint8_t TX = 1;
 static const uint8_t RX = 3;  
 
 static const uint8_t SDA = 21;  
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
index cde7c0b4107e9776d7bfce8d0e7f8eaa8c7bfe33..e341357b0c56e26196061712a619681f338439a1 100644
--- a/variants/lolin32/pins_arduino.h
+++ b/variants/lolin32/pins_arduino.h
@@ -9,8 +9,10 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-#define LED_BUILTIN 2
-#define KEY_BUILTIN 0
+static const uint8_t LED_BUILTIN = 2;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
index 7a1cb982509dd0452b3c8bb75e01e3757ffd1cae..e50bd30d988097db010833cddb7ec9623fd868da 100644
--- a/variants/nano32/pins_arduino.h
+++ b/variants/nano32/pins_arduino.h
@@ -9,7 +9,10 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-#define LED_BUILTIN 16
+static const uint8_t LED_BUILTIN = 16;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t BUILTIN_KEY = 0;
 
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
index 85452d36dd57ec4caa658f9392c0b52f5fb331bf..e341357b0c56e26196061712a619681f338439a1 100644
--- a/variants/node32s/pins_arduino.h
+++ b/variants/node32s/pins_arduino.h
@@ -9,6 +9,11 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
+static const uint8_t LED_BUILTIN = 2;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t KEY_BUILTIN = 0;
+
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;