diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2228915..a7413eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(Spencer)
 set(PORT /dev/ttyUSB0)
-set(DEVICE cm:esp32:ringo)
+set(DEVICE cm:esp32:spencer)
 set(CMAKE_CXX_STANDARD 11)
 
 if(WIN32 OR CYGWIN)
@@ -20,53 +20,53 @@ else()
     set(ArduinoLibs ~/Arduino/libraries)
 endif()
 
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/Wire/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/FS/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/SD/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/SPI/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/WiFi/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/SPIFFS/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/HTTPClient/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/WebServer/src)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/libraries/DNSServer/src)
-
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/cores/esp32)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include/esp32)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include/freertos)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include/driver)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include/driver/driver)
-include_directories(${Arduino15}/packages/cm/hardware/esp32/1.0.4/tools/sdk/include/spi_flash)
-
-include_directories(${ArduinoLibs}/CircuitOS/src)
-include_directories(${ArduinoLibs}/TFT_eSPI)
-include_directories(${ArduinoLibs}/TFT_eSPI/Extensions)
-include_directories(${ArduinoLibs}/ESP8266Audio/src)
-include_directories(${ArduinoLibs}/SerialFlash)
-include_directories(${ArduinoLibs}/ArduinoJson/src)
-include_directories(${ArduinoLibs}/NTPClient)
-include_directories(${ArduinoLibs}/ESP32Ping)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/Wire/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/FS/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/SD/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/SPI/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/WiFi/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/SPIFFS/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/HTTPClient/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/WebServer/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/DNSServer/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/Spencer-Library/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/CircuitOS/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/TFT_eSPI)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/TFT_eSPI/Extensions)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/ESP8266Audio/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/SerialFlash)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/ArduinoJson/src)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/NTPClient)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/libraries/ESP32Ping)
 
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/cores/esp32)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include/esp32)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include/freertos)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include/driver)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include/driver/driver)
+include_directories(${Arduino15}/packages/cm/hardware/esp32/1.1.0/tools/sdk/include/spi_flash)
 
 AUX_SOURCE_DIRECTORY(src SOURCES)
-AUX_SOURCE_DIRECTORY(src/DataStream SOURCES)
 AUX_SOURCE_DIRECTORY(src/Intent SOURCES)
 AUX_SOURCE_DIRECTORY(src/Intent/Funpack SOURCES)
-AUX_SOURCE_DIRECTORY(src/LEDmatrix SOURCES)
 AUX_SOURCE_DIRECTORY(src/Services SOURCES)
-AUX_SOURCE_DIRECTORY(src/Services/Audio SOURCES)
 AUX_SOURCE_DIRECTORY(src/Services/LocationService SOURCES)
 AUX_SOURCE_DIRECTORY(src/Services/TimeService SOURCES)
 AUX_SOURCE_DIRECTORY(src/SetupServer SOURCES)
-AUX_SOURCE_DIRECTORY(src/Speech SOURCES)
 AUX_SOURCE_DIRECTORY(src/State SOURCES)
-AUX_SOURCE_DIRECTORY(src/Util SOURCES)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
 
 add_definitions(-DDEBUG)
 add_definitions(-DESP32)
+add_definitions(-DESP_PLATFORM)
+add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DCIRCUITOS_FREERTOS)
+add_definitions(-DCIRCUITOS_NVS)
+add_definitions(-DCIRCUITOS_LEDMATRIX)
+add_definitions(-DCIRCUITOS_SERIALFLASH)
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_PROJECT_NAME}.ino PROPERTIES LANGUAGE CXX)