diff --git a/src/hal/heltec.h b/src/hal/heltec.h
index 761d2b2c..5535c12d 100644
--- a/src/hal/heltec.h
+++ b/src/hal/heltec.h
@@ -12,13 +12,13 @@
 #define HAS_LORA 1 // comment out if device shall not send data via LoRa
 #define CFG_sx1276_radio 1
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
-#define HAS_LED (25)                                  // white LED on board
-#define HAS_BUTTON (0)                                // button "PROG" on board
+#define HAS_LED LED_BUILTIN                           // white LED on board
+#define HAS_BUTTON KEY_BUILTIN                        // button "PROG" on board
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA (4)
-#define MY_OLED_SCL (15)
-#define MY_OLED_RST (16)
+#define MY_OLED_SDA OLED_SDA
+#define MY_OLED_SCL OLED_SCL
+#define MY_OLED_RST OLED_RST
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC
diff --git a/src/hal/heltecv2.h b/src/hal/heltecv2.h
index a07147e2..dc3cb305 100644
--- a/src/hal/heltecv2.h
+++ b/src/hal/heltecv2.h
@@ -14,13 +14,13 @@
 #define CFG_sx1276_radio 1
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
-#define HAS_LED (25) // white LED on board
-#define HAS_BUTTON (0) // button "PROG" on board
+#define HAS_LED LED_BUILTIN                           // white LED on board
+#define HAS_BUTTON KEY_BUILTIN                        // button "PROG" on board
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA (4)
-#define MY_OLED_SCL (15)
-#define MY_OLED_RST (16)
+#define MY_OLED_SDA OLED_SDA
+#define MY_OLED_SCL OLED_SCL
+#define MY_OLED_RST OLED_RST
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC
diff --git a/src/hal/lolin32lite.h b/src/hal/lolin32lite.h
index 8e19f322..3995fac7 100644
--- a/src/hal/lolin32lite.h
+++ b/src/hal/lolin32lite.h
@@ -7,9 +7,8 @@
 
 // Hardware related definitions for lolin32lite (without LoRa shield)
 
-#define CFG_sx1272_radio 1 // dummy
-
-#define HAS_LED (5)       // on board LED on GPIO5
-#define LED_ACTIVE_LOW 1  // Onboard LED is active when pin is LOW
+#define CFG_sx1272_radio 1  // dummy
+#define HAS_LED LED_BUILTIN // on board LED on GPIO5
+#define LED_ACTIVE_LOW 1    // Onboard LED is active when pin is LOW
 
 #endif
\ No newline at end of file
diff --git a/src/hal/ttgov1.h b/src/hal/ttgov1.h
index 38513579..ce926175 100644
--- a/src/hal/ttgov1.h
+++ b/src/hal/ttgov1.h
@@ -12,22 +12,17 @@
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
 //#define DISPLAY_FLIP  1 // uncomment this for rotated display
-#define HAS_LED (2) // white LED on board
+#define HAS_LED LED_BUILTIN
 #define LED_ACTIVE_LOW 1  // Onboard LED is active when pin is LOW
-#define HAS_BUTTON (0) // button "PRG" on board
+#define HAS_BUTTON KEY_BUILTIN
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA (4)
-#define MY_OLED_SCL (15)
-#define MY_OLED_RST (16)
+#define MY_OLED_SDA OLED_SDA
+#define MY_OLED_SCL OLED_SCL
+#define MY_OLED_RST OLED_RST
 
-// Pins for LORA chip SPI interface, reset line and interrupt lines
-#define LORA_SCK  (5) 
-#define LORA_CS   (18)
-#define LORA_MISO (19)
-#define LORA_MOSI (27)
-#define LORA_RST  (14)
-#define LORA_IRQ  (26)
+// Pins for LORA chip SPI interface come from board file, we need some
+// additional definitions for LMIC
 #define LORA_IO1  (33)
 #define LORA_IO2  LMIC_UNUSED_PIN
 
diff --git a/src/hal/ttgov2.h b/src/hal/ttgov2.h
index fdd021ef..9a982dda 100644
--- a/src/hal/ttgov2.h
+++ b/src/hal/ttgov2.h
@@ -18,17 +18,13 @@
 #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA (21)
-#define MY_OLED_SCL (22)
+#define MY_OLED_SDA OLED_SDA
+#define MY_OLED_SCL OLED_SCL
 #define MY_OLED_RST U8X8_PIN_NONE
 
-// Pins for LORA chip SPI interface, reset line and interrupt lines
-#define LORA_SCK  (5) 
-#define LORA_CS   (18)
-#define LORA_MISO (19)
-#define LORA_MOSI (27)
+// Pins for LORA chip SPI interface come from board file, we need some
+// additional definitions for LMIC
 #define LORA_RST  LMIC_UNUSED_PIN
-#define LORA_IRQ  (26)
 #define LORA_IO1  (33)
 #define LORA_IO2  LMIC_UNUSED_PIN