diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 94d79317b..0b56cc1fe 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -742,7 +742,7 @@ PACK(struct TrainerData {
   #define EXTRA_GENERAL_FIELDS
 #endif
 
-#if defined(COLORLCD)
+#if defined(COLORLCD) && !defined(BACKUP)
   #include "theme.h"
   #define THEME_NAME_LEN 8
   #define THEME_DATA \
diff --git a/radio/src/targets/common/arm/stm32/board_common.h b/radio/src/targets/common/arm/stm32/board_common.h
index 7ddeafa01..0ead6ffbd 100644
--- a/radio/src/targets/common/arm/stm32/board_common.h
+++ b/radio/src/targets/common/arm/stm32/board_common.h
@@ -29,10 +29,10 @@
 #else
 
 #if __clang__
-// clang is very picky about the use of "register"
-// Tell clang to ignore the warnings for the following files
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-register"
+  // clang is very picky about the use of "register"
+  // Tell clang to ignore the warnings for the following files
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wdeprecated-register"
 #endif
 
 #if defined(STM32F4)
diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt
index 8d1c498a4..36abd74e9 100644
--- a/radio/src/targets/horus/CMakeLists.txt
+++ b/radio/src/targets/horus/CMakeLists.txt
@@ -243,7 +243,7 @@ if(PYTHONINTERP_FOUND)
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
-    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBHORUS -DPCBX10 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include ${arm_gcc_include_path} > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBHORUS -DPCBX10 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Igui/colorlcd -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/libopenui/src -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/STM32F4xx_StdPeriph_Driver/inc -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.8.0/Libraries/CMSIS/Include ${arm_gcc_include_path} > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
     DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
     )
   add_custom_target(datacopy
diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
index b7331738d..bab61504d 100644
--- a/radio/src/targets/horus/board.h
+++ b/radio/src/targets/horus/board.h
@@ -35,10 +35,10 @@ PACK(typedef struct {
 extern HardwareOptions hardwareOptions;
 
 #if !defined(LUA_EXPORT_GENERATION)
-#include "stm32f4xx_sdio.h"
-#include "stm32f4xx_dma2d.h"
-#include "stm32f4xx_ltdc.h"
-#include "stm32f4xx_fmc.h"
+  #include "stm32f4xx_sdio.h"
+  #include "stm32f4xx_dma2d.h"
+  #include "stm32f4xx_ltdc.h"
+  #include "stm32f4xx_fmc.h"
 #endif
 
 #define FLASHSIZE                      0x200000
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 882e53546..5cce8bc93 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 882e53546b9e0808bc7e3912788e2d38a4734950
+Subproject commit 5cce8bc9300da8b0332b1f9c496e5d527861fe10