diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index 4fc0a1e75..264685b2d 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -1801,13 +1801,15 @@ bool menuModelSetup(event_t event)
 #endif
 
 #if defined(MULTIMODULE) || defined(AFHDS3)
-#if defined(HARDWARE_INTERNAL_MODULE)
+#if defined(MULTIMODULE) && defined(HARDWARE_INTERNAL_MODULE)
     case ITEM_MODEL_SETUP_INTERNAL_MODULE_STATUS:
 #endif
 #if defined(AFHDS3)
     case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS:
 #endif
+#if defined(MULTIMODULE)
     case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS:
+#endif
     {
       lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MODULE_STATUS);
 
@@ -1817,13 +1819,15 @@ bool menuModelSetup(event_t event)
       break;
     }
 
-#if defined(HARDWARE_INTERNAL_MODULE)
+#if defined(MULTIMODULE) && defined(HARDWARE_INTERNAL_MODULE)
     case ITEM_MODEL_SETUP_INTERNAL_MODULE_SYNCSTATUS:
 #endif
 #if defined(AFHDS3)
     case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS:
 #endif
+#if defined(MULTIMODULE)
     case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS:
+#endif
     {
 #if defined(AFHDS3)
       if (isModuleAFHDS3(moduleIdx)) {
diff --git a/tools/build-frsky.py b/tools/build-frsky.py
index 6e3b7de85..fc33d2b80 100755
--- a/tools/build-frsky.py
+++ b/tools/build-frsky.py
@@ -11,149 +11,93 @@ import tempfile
 boards = {
     "XLITE_FCC": {
         "PCB": "XLITE",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "MODULE_SIZE_STD": "NO",
         "PPM": "NO",
         "DSM2": "NO",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "SBUS": "NO",
     },
     "XLITE_LBT": {
         "PCB": "XLITE",
         "MODULE_PROTOCOL_D8": "NO",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "MODULE_SIZE_STD": "NO",
         "PPM": "NO",
         "DSM2": "NO",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "SBUS": "NO",
     },
     "XLITES": {
         "PCB": "XLITES",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "AUTOUPDATE": "YES",
         "PXX1": "YES",
         "XJT": "NO",
         "MODULE_SIZE_STD": "NO",
         "PPM": "NO",
         "DSM2": "NO",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "SBUS": "NO",
     },
     "X9LITE": {
         "PCB": "X9LITE",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "AUTOUPDATE": "YES",
         "PXX1": "YES",
         "XJT": "NO",
         "MODULE_SIZE_STD": "NO",
         "PPM": "NO",
         "DSM2": "NO",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "SBUS": "NO",
         "DEFAULT_MODE": "2",
     },
     "X9LITES": {
         "PCB": "X9LITES",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "AUTOUPDATE": "YES",
         "PXX1": "YES",
         "XJT": "NO",
         "MODULE_SIZE_STD": "NO",
         "PPM": "NO",
         "DSM2": "NO",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "SBUS": "NO",
         "DEFAULT_MODE": "2",
     },
     "X9D+2019": {
         "PCB": "X9D+",
         "PCBREV": "2019",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "AUTOUPDATE": "YES",
         "PXX1": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X9D+": {
         "PCB": "X9D+",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X9E": {
         "PCB": "X9E",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X7_FCC": {
         "PCB": "X7",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X7_LBT": {
         "PCB": "X7",
         "MODULE_PROTOCOL_D8": "NO",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X7ACCESS": {
         "PCB": "X7",
         "PCBREV": "ACCESS",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
         "AUTOUPDATE": "YES",
         "PXX1": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X10S": {
         "PCB": "X10",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X10SExpress": {
         "PCB": "X10",
         "PCBREV": "EXPRESS",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
     "X12S": {
         "PCB": "X12S",
-        "LUA": "NO_MODEL_SCRIPTS",
-        "GVARS": "YES",
-        "MULTIMODULE": "NO",
-        "CROSSFIRE": "NO",
         "DEFAULT_MODE": "2",
     },
 }
@@ -163,13 +107,21 @@ translations = [
     "CZ"
 ]
 
+common_options = {
+    "MULTIMODULE": "NO",
+    "CROSSFIRE": "NO",
+    "AFHDS3": "NO",
+    "GVARS": "YES",
+    "LUA": "NO_MODEL_SCRIPTS",
+}
+
 
 def timestamp():
     return datetime.datetime.now().strftime("%y%m%d")
 
 
 def build(board, translation, srcdir):
-    cmake_options = " ".join(["-D%s=%s" % (key, value) for key, value in boards[board].items()])
+    cmake_options = " ".join(["-D%s=%s" % (key, value) for key, value in list(boards[board].items()) + list(common_options.items())])
     cwd = os.getcwd()
     if not os.path.exists("output"):
         os.mkdir("output")