diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 61b2532fac..93ff5a4d29 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1959,6 +1959,13 @@ end_struct
 #define ts_show_injection_mode true
 #define ts_show_ignition_pins true
 #define ts_show_ignition_mode true
+#define ts_show_energySystems true
+#define ts_show_acSettings true
+#define ts_show_idle true
+#define ts_show_boost true
+#define ts_show_vvt true
+#define ts_show_pedal true
+#define ts_show_maf true
 
 ! we need to improve this further - at the moment we need too many boards to prepend 'false'
 #define show_test_presets true
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 78be1b4afd..27f890a3b6 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1666,12 +1666,12 @@ menuDialog = main
 		subMenu = triggerConfiguration,		"Trigger"
 		subMenu = trigger_advanced, "Advanced Trigger"
 		subMenu = std_separator
-		subMenu = energySystems,			"Battery and alternator"
-		subMenu = std_separator
+		subMenu = energySystems,			"Battery and alternator" @@if_ts_show_energySystems
+		subMenu = std_separator @@if_ts_show_energySystems
 
 		# Digital outputs
 		subMenu = outputsDialog,			"Outputs"
-		subMenu = acSettings,				"Air Conditioning"
+		subMenu = acSettings,				"Air Conditioning" @@if_ts_show_acSettings
 
 	menu = "Fuel"
 		# basic
@@ -1799,41 +1799,41 @@ menuDialog = main
 		subMenu = cltCrankingCurve,			"Cranking IAC CLT multiplier", 0, {overrideCrankingIacSetting == 1}
 		subMenu = cltCrankingTaperDurationCurve,			"Cranking taper duration multiplier", 0, {useCrankingIdleTaperTableSetting == 1}
 
-	menu = "&Idle"
-		subMenu = idleSettings,				"Idle settings"
-		subMenu = idlehw,					"Idle hardware"
-		subMenu = std_separator
-		subMenu = cltIdleRPMCurve,			"Target RPM"
-		subMenu = cltIdleCurve,				"CLT multiplier"
-		subMenu = std_separator
-		subMenu = idleTimingPidCorrDialog,	"Closed-loop idle timing"
-		subMenu = iacPidMultTbl,			"IAC PID multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1}
-		subMenu = iacCoastingCurve,			"Coasting IAC position", 0, {useIacTableForCoasting == 1}
-		subMenu = std_separator
-		subMenu = idleVeTableTbl,				"Idle VE", 0, {useSeparateVeForIdle == 1}
-		subMenu = idleAdvanceCurve,			"Ignition advance", 0, {useSeparateAdvanceForIdle == 1}
+	menu = "&Idle" @@if_ts_show_idle
+		subMenu = idleSettings,				"Idle settings" @@if_ts_show_idle
+		subMenu = idlehw,					"Idle hardware" @@if_ts_show_idle
+		subMenu = std_separator @@if_ts_show_idle
+		subMenu = cltIdleRPMCurve,			"Target RPM" @@if_ts_show_idle
+		subMenu = cltIdleCurve,				"CLT multiplier" @@if_ts_show_idle
+		subMenu = std_separator @@if_ts_show_idle
+		subMenu = idleTimingPidCorrDialog,	"Closed-loop idle timing" @@if_ts_show_idle
+		subMenu = iacPidMultTbl,			"IAC PID multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} @@if_ts_show_idle
+		subMenu = iacCoastingCurve,			"Coasting IAC position", 0, {useIacTableForCoasting == 1} @@if_ts_show_idle
+		subMenu = std_separator @@if_ts_show_idle
+		subMenu = idleVeTableTbl,				"Idle VE", 0, {useSeparateVeForIdle == 1} @@if_ts_show_idle
+		subMenu = idleAdvanceCurve,			"Ignition advance", 0, {useSeparateAdvanceForIdle == 1} @@if_ts_show_idle
 
 	menu = "&Advanced"
 		subMenu = smLaunchControl,			"Launch Control"
 		subMenu = ignitionCylExtra,			"Cylinder offsets", 0
 
-		subMenu = std_separator
-		subMenu = boostDialog,			"Boost control"
-		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled }
-		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 }
-		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 }
+		subMenu = std_separator @@if_ts_show_boost
+		subMenu = boostDialog,			"Boost control" @@if_ts_show_boost
+		subMenu = boostOpenLoopDialog,	"Boost control open loop", { isBoostControlEnabled } @@if_ts_show_boost
+		subMenu = boostPidDialog,		"Boost control PID", { isBoostControlEnabled && boostType == 1 } @@if_ts_show_boost
+		subMenu = boostTargetDialog,	"Boost control target", { isBoostControlEnabled && boostType == 1 } @@if_ts_show_boost
 
-		groupMenu = "Boost blend tables"
-		groupChildMenu = boostOpenBlend1Cfg,		"Open loop 1 bias",		{ isBoostControlEnabled }
-		groupChildMenu = boostOpenBlend1Table,		"Open loop 1 adder",	{ isBoostControlEnabled && boostOpenLoopBlends1_blendParameter != 0 }
-		groupChildMenu = boostOpenBlend2Cfg,		"Open loop 2 bias",		{ isBoostControlEnabled }
-		groupChildMenu = boostOpenBlend2Table,		"Open loop 2 adder",	{ isBoostControlEnabled && boostOpenLoopBlends2_blendParameter != 0 }
-		groupChildMenu = boostClosedBlend1Cfg,		"Closed loop 1 bias",	{ isBoostControlEnabled && boostType == 1 }
-		groupChildMenu = boostClosedBlend2Table,	"Closed loop 1 adder",	{ isBoostControlEnabled && boostType == 1 && boostClosedLoopBlends1_blendParameter != 0 }
-		groupChildMenu = boostClosedBlend2Cfg,		"Closed loop 2 bias",	{ isBoostControlEnabled && boostType == 1 }
-		groupChildMenu = boostClosedBlend2Table,	"Closed loop 2 adder",	{ isBoostControlEnabled && boostType == 1 && boostClosedLoopBlends2_blendParameter != 0 }
+		groupMenu = "Boost blend tables" @@if_ts_show_boost
+		groupChildMenu = boostOpenBlend1Cfg,		"Open loop 1 bias",		{ isBoostControlEnabled } @@if_ts_show_boost
+		groupChildMenu = boostOpenBlend1Table,		"Open loop 1 adder",	{ isBoostControlEnabled && boostOpenLoopBlends1_blendParameter != 0 } @@if_ts_show_boost
+		groupChildMenu = boostOpenBlend2Cfg,		"Open loop 2 bias",		{ isBoostControlEnabled } @@if_ts_show_boost
+		groupChildMenu = boostOpenBlend2Table,		"Open loop 2 adder",	{ isBoostControlEnabled && boostOpenLoopBlends2_blendParameter != 0 } @@if_ts_show_boost
+		groupChildMenu = boostClosedBlend1Cfg,		"Closed loop 1 bias",	{ isBoostControlEnabled && boostType == 1 } @@if_ts_show_boost
+		groupChildMenu = boostClosedBlend2Table,	"Closed loop 1 adder",	{ isBoostControlEnabled && boostType == 1 && boostClosedLoopBlends1_blendParameter != 0 } @@if_ts_show_boost
+		groupChildMenu = boostClosedBlend2Cfg,		"Closed loop 2 bias",	{ isBoostControlEnabled && boostType == 1 } @@if_ts_show_boost
+		groupChildMenu = boostClosedBlend2Table,	"Closed loop 2 adder",	{ isBoostControlEnabled && boostType == 1 && boostClosedLoopBlends2_blendParameter != 0 } @@if_ts_show_boost
 
-		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == @@dc_function_e_DC_Wastegate@@ || etbFunctions2 == @@dc_function_e_DC_Wastegate@@ }
+		subMenu = boostEtbPid,			"ETB-style Wastegate Actuator", { etbFunctions1 == @@dc_function_e_DC_Wastegate@@ || etbFunctions2 == @@dc_function_e_DC_Wastegate@@ } @@if_ts_show_boost
 
 		subMenu = std_separator
 		subMenu = gppwm1, "General Purpose PWM 1"
@@ -1847,10 +1847,10 @@ menuDialog = main
 		subMenu = pedalToTpsTbl,			"ETB pedal target" @@if_ts_show_etb
 		subMenu = throttle2TrimTbl,			"ETB #2 Trim", { tps2_1AdcChannel != @@ADC_CHANNEL_NONE@@ } @@if_ts_show_etb
 
-		subMenu = std_separator
-		subMenu = vvtPidDialog,				"VVT outputs and PID", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ }
-		subMenu = vvtTable1Tbl,				"VVT intake target", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ }
-		subMenu = vvtTable2Tbl,				"VVT exhaust target", { vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ }
+		subMenu = std_separator @@if_ts_show_vvt
+		subMenu = vvtPidDialog,				"VVT outputs and PID", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ } @@if_ts_show_vvt
+		subMenu = vvtTable1Tbl,				"VVT intake target", { vvtMode1 != @@vvt_mode_e_VVT_INACTIVE@@ } @@if_ts_show_vvt
+		subMenu = vvtTable2Tbl,				"VVT exhaust target", { vvtMode2 != @@vvt_mode_e_VVT_INACTIVE@@ } @@if_ts_show_vvt
 
 		subMenu = std_separator
 		subMenu = auxInputsDialog,			"Lua Analog Aux Inputs"
@@ -1893,7 +1893,7 @@ menuDialog = main
 
 		# TPS/pedal
 		subMenu = tpsSensor,				"TPS"
-		subMenu = pedalSensor,				"Accelerator pedal"
+		subMenu = pedalSensor,				"Accelerator pedal" @@if_ts_show_pedal
 		subMenu = std_separator
 
 		# MAP/Baro
@@ -1903,9 +1903,9 @@ menuDialog = main
 		subMenu = std_separator
 
 		# MAF
-		subMenu = mafSettings,				"MAF sensor"
-		subMenu = mafDecodingCurve,			"MAF transfer function", 0, {mafAdcChannel != @@ADC_CHANNEL_NONE@@ }
-		subMenu = std_separator
+		subMenu = mafSettings,				"MAF sensor" @@if_ts_show_maf
+		subMenu = mafDecodingCurve,			"MAF transfer function", 0, {mafAdcChannel != @@ADC_CHANNEL_NONE@@ } @@if_ts_show_maf
+		subMenu = std_separator @@if_ts_show_maf
 
 		# O2 sensor(s)
 		subMenu = egoSettings,				"EGO sensor"