diff --git a/Processors/TFT_eSPI_K210.cpp b/Processors/TFT_eSPI_K210.cpp
index 331be1d..e613915 100644
--- a/Processors/TFT_eSPI_K210.cpp
+++ b/Processors/TFT_eSPI_K210.cpp
@@ -10,7 +10,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
 // Select the SPI port to use
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
   SPIClass spi_(SPI0, TFT_SCLK, TFT_MISO, TFT_MOSI, -1, SPI_FREQUENCY);
 #else
   SPIClass spi_(SPI0);
diff --git a/Processors/TFT_eSPI_K210.h b/Processors/TFT_eSPI_K210.h
index 7872140..f73861d 100644
--- a/Processors/TFT_eSPI_K210.h
+++ b/Processors/TFT_eSPI_K210.h
@@ -19,10 +19,10 @@
 #include "sleep.h"
 #include <User_Setups/Setup210_Maixduino.h>
 
-#if defined(ARDUINO_MAIX_AMIGO) || defined(ARDUINO_MAIX_CUBE)
+#if defined(MAIX_AMIGO) || defined(MAIX_CUBE)
   #include <Wire.h>
   #include <AXP173.h>
-#elif defined(ARDUINO_M5STICK_V)
+#elif defined(M5STICK_V)
   #include <Wire.h>
   #include <AXP192.h>
 #endif
@@ -41,11 +41,11 @@ static spi_device_num_t g_spi_num;
 
 void tft_io_init(void)
 {
-#if defined(ARDUINO_MAIX_AMIGO) || defined(ARDUINO_MAIX_CUBE)
+#if defined(MAIX_AMIGO) || defined(MAIX_CUBE)
   AXP173 Axp = AXP173();
   Wire.begin((uint8_t) SDA, (uint8_t) SCL, 400000);
   Axp.begin(true); //Wire is already enabled
-#elif defined(ARDUINO_M5STICK_V)
+#elif defined(M5STICK_V)
   sysctl_set_power_mode(SYSCTL_POWER_BANK3,SYSCTL_POWER_V33);
   AXP192 Axp = AXP192();
   Wire.begin((uint8_t) SDA, (uint8_t) SCL, 400000);
@@ -56,7 +56,7 @@ void tft_io_init(void)
   g_ss = SS_PIN;
   /* Init SPI IO map and function settings */
   fpioa_set_function(TFT_CS, (fpioa_function_t)(FUNC_SPI0_SS0 + SS_PIN));
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
   fpioa_set_function(TFT_SCLK, FUNC_SPI0_SCLK);
 #else
   fpioa_set_function(TFT_WR,   FUNC_SPI0_SCLK);
@@ -75,7 +75,7 @@ void tft_io_init(void)
   gpio_set_pin(g_gpio_rst, GPIO_PV_HIGH);
 
   gpio_set_pin(g_gpio_rst, GPIO_PV_LOW);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
   spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
   spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
@@ -87,7 +87,7 @@ void tft_io_init(void)
 void tft_write_command(uint8_t cmd)
 {
     gpio_set_pin(g_gpio_dcx, GPIO_PV_LOW);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
@@ -99,7 +99,7 @@ void tft_write_command(uint8_t cmd)
 void tft_write_byte(uint8_t *data_buf, uint32_t length)
 {
     gpio_set_pin(g_gpio_dcx, GPIO_PV_HIGH);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
@@ -111,7 +111,7 @@ void tft_write_byte(uint8_t *data_buf, uint32_t length)
 void tft_write_half(uint16_t *data_buf, uint32_t length)
 {
     gpio_set_pin(g_gpio_dcx, GPIO_PV_HIGH);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 16, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 16, 0);
@@ -123,7 +123,7 @@ void tft_write_half(uint16_t *data_buf, uint32_t length)
 void tft_write_word(uint32_t *data_buf, uint32_t length)
 {
     gpio_set_pin(g_gpio_dcx, GPIO_PV_HIGH);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 32, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 32, 0);
@@ -135,7 +135,7 @@ void tft_write_word(uint32_t *data_buf, uint32_t length)
 void tft_fill_data(uint32_t *data_buf, uint32_t length)
 {
     gpio_set_pin(g_gpio_dcx, GPIO_PV_HIGH);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 32, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 32, 0);
@@ -146,7 +146,7 @@ void tft_fill_data(uint32_t *data_buf, uint32_t length)
 
 void tft_write_cs()
 {
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
@@ -165,7 +165,7 @@ void tft_write_a_byte(uint8_t data)
 void tft_write_a_half(uint16_t data)
 {
 //    dmac_wait_done(g_dma_ch);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 16, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 16, 0);
@@ -178,7 +178,7 @@ void tft_write_a_word(uint32_t data)
 {
     uint8_t tmp[4] = { static_cast<uint8_t>((data >> 24) & 0xff), static_cast<uint8_t>((data >> 16) & 0xff), static_cast<uint8_t>((data >> 8) & 0xff), static_cast<uint8_t>(data & 0xff) };
     dmac_wait_done(g_dma_ch);
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
@@ -190,7 +190,7 @@ void tft_write_a_word(uint32_t data)
 uint8_t tft_read_a_byte(void)
 {
     uint8_t tmp;
-#if defined (ARDUINO_M5STICK_V)
+#if defined (M5STICK_V)
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_STANDARD, 8, 0);
 #else
     spi_init(g_spi_num, SPI_WORK_MODE_0, SPI_FF_OCTAL, 8, 0);
diff --git a/User_Setup_Select.h b/User_Setup_Select.h
index f199233..2071a0c 100644
--- a/User_Setup_Select.h
+++ b/User_Setup_Select.h
@@ -19,7 +19,7 @@
 
 // Only ONE line below should be uncommented.  Add extra lines and files as needed.
 
-#include <User_Setup.h>           // Default setup is root library folder
+//#include <User_Setup.h>           // Default setup is root library folder
 
 //#include <User_Setups/Setup1_ILI9341.h>  // Setup file configured for my ILI9341
 //#include <User_Setups/Setup2_ST7735.h>   // Setup file configured for my ST7735
@@ -76,7 +76,7 @@
 
 //#include <User_Setups/Setup135_ST7789.h>           // Setup file for ESP8266 and ST7789 135 x 240 TFT
 
-//#include <User_Setups/Setup210_Maixduino.h>        // Setup file for all K210 with 1- or 8-wire SPI TFT
+#include <User_Setups/Setup210_Maixduino.h>        // Setup file for all K210 with 1- or 8-wire SPI TFT
 
 //#include <User_Setups/SetupX_Template.h>
 
diff --git a/User_Setups/Setup210_Maixduino.h b/User_Setups/Setup210_Maixduino.h
index 7d92d22..8b04d52 100644
--- a/User_Setups/Setup210_Maixduino.h
+++ b/User_Setups/Setup210_Maixduino.h
@@ -1,11 +1,7 @@
 //Use Maixduino Core and https://github.com/sipeed/Maixduino/pull/99
 // or https://github.com/UT2UH/Maixduino with missing boards added
-//Define your board here as compile-time variable ARDUINO_{build.board} does not work (for me only?)
-#define ARDUINO_MAIX_AMIGO
-//#define ARDUINO_MAIX_GO
-//#define ARDUINO_M5STICK_V
 
-#if defined (ARDUINO_MAIX_AMIGO)
+#if defined (MAIX_AMIGO)
   // ILI9486 320 x 480 display in 8-bit parallel mode
   #define ILI9486_DRIVER   // Configure all registers
   #define TFT_WIDTH        320
@@ -24,7 +20,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_MAIX_CUBE)
+#elif defined (MAIX_CUBE)
   // ST7789 240 x 240 1.3" IPS display in 8-bit parallel mode
   #define ST7789_2_DRIVER   // Configure all registers
   #define TFT_WIDTH        240
@@ -45,7 +41,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_MAIX_GO)
+#elif defined (MAIX_GO)
   // ST7789 240 x 320 display in 8-bit parallel mode
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  240
@@ -66,7 +62,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined(ARDUINO_MAIX_DUINO)
+#elif defined(MAIX_DUINO)
   // ST7789 240 x 320 display in 8-bit parallel mode
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  240
@@ -84,7 +80,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_DOCK_M1) || defined (ARDUINO_DOCK_M1W)
+#elif defined (MAIX_DOCK_M1) || defined (MAIX_DOCK_M1W)
   // ST7789 240 x 320 display in 8-bit parallel mode
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  240
@@ -101,7 +97,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_MAIX_BIT) || defined (ARDUINO_MAIX_BIT_MIC)
+#elif defined (MAIX_BIT) || defined (MAIX_BIT_MIC)
   // ST7789 240 x 320 display in 8-bit parallel mode
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  240
@@ -118,7 +114,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_AIOT_DAAN)
+#elif defined (AIOT_DAAN)
   // ST7789 240 x 320 display in 8-bit parallel mode
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  240
@@ -134,7 +130,7 @@
 
   #define SPI_FREQUENCY     20000000
 
-#elif defined (ARDUINO_M5STICK_V)
+#elif defined (M5STICK_V)
 // ST7789 240 x 280 display
   #define ST7789_2_DRIVER    // Configure all registers
   #define TFT_WIDTH  135