diff --git a/Makefile b/Makefile
index 1572e2e..b2300df 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@ t ?= esp32
 ifeq ($t, esp8266)
 BOARD := d1_mini
 UPLOAD_SPEED := 921600
+TERMINAL_SPEED := 115200
 SPIFFS_DIR := programs
 FLASH_SIZE := 4M1M
 F_CPU := 80
-CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER \
-	-DTFT_WIDTH=240 -DTFT_HEIGHT=320 \
-	-DTFT_CS=PIN_D6 -DTFT_DC=PIN_D8 \
-	-DTFT_RST=-1 -DSPI_FREQUENCY=40000000 -DLOAD_GLCD
+CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER -DTFT_CS=PIN_D8 -DTFT_DC=PIN_D1 \
+	-DTFT_RST=-1 -DSPI_FREQUENCY=40000000 -DLOAD_GLCD \
+	-DHARDWARE_H=\"hw/esp8266-pwm-fs.h\" -DTERMINAL_SPEED=$(TERMINAL_SPEED)
 LIBRARIES := TFT_eSPI
 endif
 
diff --git a/apple1.ino b/apple1.ino
index 902d594..f238cec 100644
--- a/apple1.ino
+++ b/apple1.ino
@@ -43,7 +43,9 @@ void reset() {
 }
 
 void setup() {
-	Serial.begin(115200);
+#if defined(DEBUGGING) || defined(CPU_DEBUG)
+	Serial.begin(TERMINAL_SPEED);
+#endif
 	hardware_init(cpu);
 		
 	for (unsigned i = 0; i < RAM_SIZE; i += 1024)