diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
index 5ba719020d..13c9a6eb76 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
@@ -172,8 +172,11 @@ namespace NAMESPACE {
 #include "radio/src/gui/horus/view_about.cpp"
 #include "radio/src/gui/horus/lcd.cpp"
 #include "radio/src/gui/horus/splash.cpp"
-#include "radio/src/gui/horus/widget.cpp"
+#include "radio/src/gui/horus/theme.cpp"
 #include "radio/src/gui/horus/layout.cpp"
+#include "radio/src/gui/horus/widget.cpp"
+#include "radio/src/gui/horus/themes/default.cpp"
+#include "radio/src/gui/horus/themes/darkblue.cpp"
 #include "radio/src/gui/horus/layouts/layout2+1.cpp"
 #include "radio/src/gui/horus/layouts/layout1x1.cpp"
 #include "radio/src/gui/horus/layouts/layout2x2.cpp"
diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp
index 8baa19cc7d..6cd03f2298 100644
--- a/radio/src/gui/horus/screens_setup.cpp
+++ b/radio/src/gui/horus/screens_setup.cpp
@@ -255,12 +255,15 @@ bool menuScreensTheme(evt_t event)
         break;
     }
   }
+
+  return true;
 }
 
 bool menuScreenAdd(evt_t event)
 {
   int menuItemsCount = updateMainviewsMenu();
   MENU_WITH_OPTIONS("Add main view", LBM_MAINVIEWS_ICONS, menuTabMainviews, menuItemsCount, menuItemsCount-1, 0, { uint8_t(NAVIGATION_LINE_BY_LINE|uint8_t(countRegisteredLayouts-1)), ORPHAN_ROW, 0, 0, 0, 0 });
+  return true;
 }
 
 template <int T>
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 058664fc53..3a5c0152c0 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -806,7 +806,9 @@ const luaR_value_entry opentxConstants[] = {
   { "INVERS", INVERS },
   { "BOLD", BOLD },
   { "BLINK", BLINK },
+#if !defined(COLORLCD)
   { "FIXEDWIDTH", FIXEDWIDTH },
+#endif
   { "LEFT", LEFT },
   { "PREC1", PREC1 },
   { "PREC2", PREC2 },