diff --git a/components/TFT_eSPI b/components/TFT_eSPI
index b9f354f..61dd1b8 160000
--- a/components/TFT_eSPI
+++ b/components/TFT_eSPI
@@ -1 +1 @@
-Subproject commit b9f354f5bf1d4340c69dd140f5baeb2c2dac29f9
+Subproject commit 61dd1b856ceece1e2083e6828a10c1d4376e1131
diff --git a/components/espwifistack b/components/espwifistack
index 2d088a9..2bf332f 160000
--- a/components/espwifistack
+++ b/components/espwifistack
@@ -1 +1 @@
-Subproject commit 2d088a948077c1cdef1e2caea6842422fec1fc86
+Subproject commit 2bf332f3eb6816721f0f9a60c0ca14787cacbc65
diff --git a/config_feedc0de_new.cmake b/config_feedc0de_new.cmake
index 27cbe2c..bc88230 100644
--- a/config_feedc0de_new.cmake
+++ b/config_feedc0de_new.cmake
@@ -53,19 +53,4 @@ set(BOBBYCAR_BUILDFLAGS
     -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
     -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
     -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
-#    -DFEATURE_DPAD_5WIRESW_2OUT
-#    -DPINS_DPAD_5WIRESW_OUT1=18
-#    -DPINS_DPAD_5WIRESW_OUT2=19
-#    -DPINS_DPAD_5WIRESW_IN1=27
-#    -DPINS_DPAD_5WIRESW_IN2=32
-#    -DPINS_DPAD_5WIRESW_IN3=33
-#    -DFEATURE_DPAD_6WIRESW
-#    -DPINS_DPAD_6WIRESW_OUT=4
-#    -DPINS_DPAD_6WIRESW_IN1=5
-#    -DPINS_DPAD_6WIRESW_IN2=27
-#    -DPINS_DPAD_6WIRESW_IN3=18
-#    -DPINS_DPAD_6WIRESW_IN4=19
-#    -DPINS_DPAD_6WIRESW_IN5=26
-#    -DFEATURE_GSCHISSENE_DIODE
-#    -DDPAD_BOARDCOMPUTER_V2
 )
diff --git a/main/cloud.cpp b/main/cloud.cpp
index 669d7e8..c664be2 100644
--- a/main/cloud.cpp
+++ b/main/cloud.cpp
@@ -996,7 +996,7 @@ void cloudEventHandler(void *event_handler_arg, esp_event_base_t event_base, int
         cloudStarted = false;
         break;
     default:
-        ESP_LOGI(TAG, "%s unknown event_id %i", event_base, event_id);
+        ESP_LOGI(TAG, "%s unknown event_id %li", event_base, event_id);
     }
 }
 
diff --git a/sdkconfig_feedc0de_new b/sdkconfig_feedc0de_new
index e55eb46..fbfa3d2 100644
--- a/sdkconfig_feedc0de_new
+++ b/sdkconfig_feedc0de_new
@@ -1734,8 +1734,8 @@ CONFIG_TFT_ST7789_DRIVER=y
 # CONFIG_TFT_SSD1963_800ALT_DRIVER is not set
 # CONFIG_TFT_ILI9225_DRIVER is not set
 # CONFIG_TFT_GC9A01_DRIVER is not set
-CONFIG_TFT_RGB_ORDER=y
-# CONFIG_TFT_BGR_ORDER is not set
+# CONFIG_TFT_RGB_ORDER is not set
+CONFIG_TFT_BGR_ORDER=y
 CONFIG_TFT_WIDTH=240
 CONFIG_TFT_HEIGHT=320
 # CONFIG_TFT_INVERSION_DISABLE is not set