diff --git a/Makefile b/Makefile
index 927aacf..17dd95b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
-BOARD := d1_mini
-UPLOAD_SPEED := 921600
-SPIFFS_DIR := programs
-FLASH_SIZE := 4M1M
-BUILD_FCPU := 80000000L
-
-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
-LIBRARIES := TFT_eSPI
-
-include arduino-esp.mk
-
-#PROCESSOR_FAMILY := lm4f
-#BOARD := lplm4f120h5qr
-#CPPFLAGS := -DDEBUGGING -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
-#LIBRARIES := UTFT SD
+#BOARD := d1_mini
+#UPLOAD_SPEED := 921600
+#SPIFFS_DIR := programs
+#FLASH_SIZE := 4M1M
+#BUILD_FCPU := 80000000L
 #
-#include energia10.mk
+#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
+#LIBRARIES := TFT_eSPI
+#
+#include arduino-esp.mk
+
+PROCESSOR_FAMILY := lm4f
+BOARD := lplm4f120h5qr
+CPPFLAGS := -DDEBUGGING -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
+LIBRARIES := UTFT SD SpiRAM
+
+include energia10.mk
diff --git a/apple1.ino b/apple1.ino
index c38c448..76452af 100644
--- a/apple1.ino
+++ b/apple1.ino
@@ -1,12 +1,7 @@
 #include <stdarg.h>
-#include <r65emu.h>
-
 #include <SPI.h>
 
-#if defined(SPIRAM_CS)
-#include <SpiRAM.h>
-#endif
-
+#include <r65emu.h>
 #include <r6502.h>
 
 #include "pia.h"
@@ -46,7 +41,7 @@ void setup() {
 	for (unsigned i = 0; i < RAM_SIZE; i += 1024)
 		memory.put(pages[i / 1024], i);
 
-#if defined(SPIRAM_CS)
+#if defined(USE_SPIRAM)
 	memory.put(sram, SPIRAM_BASE, SPIRAM_EXTENT);
 #endif
 	memory.put(io, 0xd000);
diff --git a/config.h b/config.h
index 8852f0c..cc148e1 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#if defined(SPIRAM_CS)
+#if defined(USE_SPIRAM)
 #define RAM_SIZE	0x3000
 #define SPIRAM_BASE	0x3000
 #define SPIRAM_EXTENT	(20 * 1024 / 256)