diff --git a/platformio.ini b/platformio.ini
index 089bed6..3a361a4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -25,26 +25,28 @@ check_flags =
 
 [env:heltec_wifi_lora_32_V1]
 board = ttgo-lora32-v1
-build_flags = -DHELTEC_WIFI_LORA_32_V1
+build_flags = -Werror -Wall -DHELTEC_WIFI_LORA_32_V1
 
 [env:heltec_wifi_lora_32_V2]
 board = ttgo-lora32-v1
-build_flags = -DHELTEC_WIFI_LORA_32_V2
+build_flags = -Werror -Wall -DHELTEC_WIFI_LORA_32_V2
 
 [env:ttgo-lora32-v1]
 board = ttgo-lora32-v1
+build_flags = -Werror -Wall -DTTGO_LORA32_V1
 
 [env:ttgo-lora32-v2]
 board = ttgo-lora32-v1
-build_flags = -DARDUINO_LORA32_V2
+build_flags = -Werror -Wall -DTTGO_LORA32_V2
 
 [env:ttgo-t-beam-v1]
 board = ttgo-t-beam
+build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0
 
 [env:ttgo-t-beam-v0_7]
 board = ttgo-t-beam
-build_flags = -DARDUINO_T_Beam_V0_7
+build_flags = -Werror -Wall -DTTGO_T_Beam_V0_7
 
 [env:TrackerD-OE1ACM]
 board = esp32doit-devkit-v1
-build_flags = -DTRACKERD -DLORA_SCK=18 -DLORA_MISO=19 -DLORA_MOSI=23 -DLORA_CS=16 -DLORA_RST=14 -DLORA_IRQ=26
+build_flags = -Werror -Wall -DTRACKERD -DLORA_SCK=18 -DLORA_MISO=19 -DLORA_MOSI=23 -DLORA_CS=16 -DLORA_RST=14 -DLORA_IRQ=26
diff --git a/src/display.h b/src/display.h
index 889c162..2aec8de 100644
--- a/src/display.h
+++ b/src/display.h
@@ -11,10 +11,4 @@ void show_display(String header, String line1, String line2, String line3, int w
 void show_display(String header, String line1, String line2, String line3, String line4, int wait = 0);
 void show_display(String header, String line1, String line2, String line3, String line4, String line5, int wait = 0);
 
-#ifdef ARDUINO_T_Beam
-#define OLED_SDA 21
-#define OLED_SCL 22
-#define OLED_RST 4
-#endif
-
 #endif
diff --git a/src/pins.h b/src/pins.h
index 34ce13a..1ae3438 100644
--- a/src/pins.h
+++ b/src/pins.h
@@ -1,28 +1,17 @@
 #ifndef PINS_H_
 #define PINS_H_
 
-#ifndef DHELTEC_WIFI_LORA_32_V1
-	#undef OLED_SDA
-	#undef OLED_SCL
-	#undef OLED_RST
+#undef OLED_SDA
+#undef OLED_SCL
+#undef OLED_RST
+
+#if defined(HELTEC_WIFI_LORA_32_V1) || defined(HELTEC_WIFI_LORA_32_V2) || defined(TTGO_LORA32_V1)
 	#define OLED_SDA	4
 	#define OLED_SCL	15
 	#define OLED_RST	16
 #endif
 
-#ifndef DHELTEC_WIFI_LORA_32_V2
-	#undef OLED_SDA
-	#undef OLED_SCL
-	#undef OLED_RST
-	#define OLED_SDA	4
-	#define OLED_SCL	15
-	#define OLED_RST	16
-#endif
-
-#ifdef ARDUINO_LORA32_V2
-	#undef OLED_SDA
-	#undef OLED_SCL
-	#undef OLED_RST
+#if defined(TTGO_LORA32_V2) || defined(TTGO_T_Beam_V0_7) || defined(TTGO_T_Beam_V1_0)
 	#define OLED_SDA	21
 	#define OLED_SCL	22
 	#define OLED_RST	16