diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 5b03b1d0f..0ddd62de4 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -75,7 +75,8 @@ set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 add_custom_command(
   OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
-  COMMAND make lbm
+  COMMAND make lbm PCB=9X
+  COMMAND make lbm PCB=TARANIS
   DEPENDS ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm
   WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index ac826da9e..27c92e70e 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -97,16 +97,16 @@ inline int geteepromsize() {
 #include "radio/src/gui/menus.cpp"
 #include "radio/src/gui/menu_model.cpp"
 #include "radio/src/gui/menu_model_select.cpp"
-#include "radio/src/gui/menu_model_setup.cpp"
+#include "radio/src/gui/Taranis/menu_model_setup.cpp"
 #include "radio/src/gui/menu_model_heli.cpp"
-#include "radio/src/gui/menu_model_flightmodes.cpp"
+#include "radio/src/gui/Taranis/menu_model_flightmodes.cpp"
 #include "radio/src/gui/menu_model_inputs_mixes.cpp"
 #include "radio/src/gui/menu_model_curves.cpp"
 #include "radio/src/gui/Taranis/menu_model_logical_switches.cpp"
 #include "radio/src/gui/menu_model_custom_functions.cpp"
 #include "radio/src/gui/menu_model_custom_scripts.cpp"
 #include "radio/src/gui/menu_model_gvars.cpp"
-#include "radio/src/gui/menu_model_limits.cpp"
+#include "radio/src/gui/Taranis/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_telemetry.cpp"
 #include "radio/src/gui/menu_general.cpp"
 #include "radio/src/gui/menu_general_setup.cpp"
diff --git a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
index d80d6239e..d8e1a2a6f 100755
--- a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
@@ -99,11 +99,11 @@ inline int geteepromsize() {
 #include "radio/src/gui/menus.cpp"
 #include "radio/src/gui/menu_model.cpp"
 #include "radio/src/gui/menu_model_select.cpp"
-#include "radio/src/gui/menu_model_setup.cpp"
+#include "radio/src/gui/Taranis/menu_model_setup.cpp"
 #include "radio/src/gui/menu_model_heli.cpp"
-#include "radio/src/gui/menu_model_flightmodes.cpp"
+#include "radio/src/gui/Taranis/menu_model_flightmodes.cpp"
 #include "radio/src/gui/menu_model_inputs_mixes.cpp"
-#include "radio/src/gui/menu_model_limits.cpp"
+#include "radio/src/gui/Taranis/menu_model_limits.cpp"
 #include "radio/src/gui/menu_model_curves.cpp"
 #include "radio/src/gui/Taranis/menu_model_logical_switches.cpp"
 #include "radio/src/gui/menu_model_custom_functions.cpp"
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 6c67d8ab0..b280079c1 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1614,7 +1614,8 @@ clean_list :
 	$(REMOVE) stamp-opentx.h
 	$(REMOVE) *.lbm 
 	$(REMOVE) bitmaps/*.lbm 
-	$(REMOVE) bitmaps/*/*.lbm 
+	$(REMOVE) bitmaps/*/*.lbm
+	$(REMOVE) bitmaps/*/*/*.lbm 
 	$(REMOVE) fonts/*.lbm
 	$(REMOVE) fonts/*/*.lbm
 	$(REMOVE) lua_exports.txt lua_exports.cpp lua_fields.txt
diff --git a/radio/src/gui/Taranis/menu_model_flightmodes.cpp b/radio/src/gui/Taranis/menu_model_flightmodes.cpp
index dc6d140eb..5ed29a1f5 100755
--- a/radio/src/gui/Taranis/menu_model_flightmodes.cpp
+++ b/radio/src/gui/Taranis/menu_model_flightmodes.cpp
@@ -33,7 +33,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
 {
diff --git a/radio/src/gui/Taranis/menu_model_limits.cpp b/radio/src/gui/Taranis/menu_model_limits.cpp
index 410118aaa..aa29efe78 100755
--- a/radio/src/gui/Taranis/menu_model_limits.cpp
+++ b/radio/src/gui/Taranis/menu_model_limits.cpp
@@ -33,7 +33,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 bool isThrottleOutput(uint8_t ch)
 {
diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp
index 4ebbecf97..32036d4b6 100644
--- a/radio/src/gui/Taranis/menu_model_setup.cpp
+++ b/radio/src/gui/Taranis/menu_model_setup.cpp
@@ -33,7 +33,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 uint8_t g_moduleIdx;
 void menuModelFailsafe(uint8_t event);