diff --git a/src/mainboard/starlabs/adl/cfr.c b/src/mainboard/starlabs/adl/cfr.c
index 4f920a69f6..634f945f6e 100644
--- a/src/mainboard/starlabs/adl/cfr.c
+++ b/src/mainboard/starlabs/adl/cfr.c
@@ -7,58 +7,76 @@
 #include <intelblocks/cfr.h>
 #include <common/cfr.h>
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
-		&fan_mode,
-		&memory_speed,
-		&power_profile,
-		NULL
-	},
-};
-
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
-	.obj_list = (const struct sm_object *[]) {
-		&me_state,
-		&me_state_counter,
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
-	.obj_list = (const struct sm_object *[]) {
-		&max_charge,
 		&charging_speed,
-		&power_led,
-		&charge_led,
+		&max_charge,
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		NULL
+	},
+};
+
+static struct sm_obj_form leds_group = {
+	.ui_name = "LEDs",
+	.obj_list = (const struct sm_object *[]) {
+		&charge_led,
+		&power_led,
+		NULL
+	},
+};
+
 static struct sm_obj_form keyboard_group = {
 	.ui_name = "Keyboard",
 	.obj_list = (const struct sm_object *[]) {
-		&kbl_timeout,
 		&fn_ctrl_swap,
+		&kbl_timeout,
 		NULL
 	},
 };
 
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
+static struct sm_obj_form audio_video_group = {
+	.ui_name = "Audio/Video",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth,
-		&display_native_res,
-		&gna,
-		&lid_switch,
 		&microphone,
 		&webcam,
-		&wifi,
+		NULL
+	},
+};
+
+static struct sm_obj_form display_group = {
+	.ui_name = "Display",
+	.obj_list = (const struct sm_object *[]) {
+		&display_native_res,
+		NULL
+	},
+};
+
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
+	.obj_list = (const struct sm_object *[]) {
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		NULL
+	},
+};
+
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
+	.obj_list = (const struct sm_object *[]) {
+		&fan_mode,
+		&gna,
+		&memory_speed,
+		&power_profile,
 		NULL
 	},
 };
@@ -68,37 +86,51 @@ static struct sm_obj_form security_group = {
 	.obj_list = (const struct sm_object *[]) {
 		&bios_lock,
 		&intel_tme,
+		&me_state,
+		&me_state_counter,
 		NULL
 	},
 };
 
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
 	.obj_list = (const struct sm_object *[]) {
-		&pciexp_clk_pm,
-		&pciexp_aspm,
-		&pciexp_l1ss,
+		&lid_switch,
+		&s0ix_enable,
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth,
+		&wifi,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
-	&performance_group,
-	&processor_group,
-	&power_group,
+	&audio_video_group,
+	&battery_group,
+	&debug_group,
+	&display_group,
 	&keyboard_group,
-	&devices_group,
+	&leds_group,
+	&pcie_power_management_group,
+	&performance_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };
 
diff --git a/src/mainboard/starlabs/byte_adl/cfr.c b/src/mainboard/starlabs/byte_adl/cfr.c
index d67d501508..bf658a4249 100644
--- a/src/mainboard/starlabs/byte_adl/cfr.c
+++ b/src/mainboard/starlabs/byte_adl/cfr.c
@@ -8,41 +8,38 @@
 #include <variants.h>
 #include <common/cfr.h>
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
-	.obj_list = (const struct sm_object *[]) {
-		&bluetooth_rtd3,
-		&fan_mode,
-		&power_profile,
-		NULL
-	},
-};
-
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
-	.obj_list = (const struct sm_object *[]) {
-		&me_state,
-		&me_state_counter,
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth,
+		&debug_level,
+		NULL
+	},
+};
+
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
+	.obj_list = (const struct sm_object *[]) {
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		NULL
+	},
+};
+
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
+	.obj_list = (const struct sm_object *[]) {
+		&fan_mode,
 		&gna,
-		&wifi,
+		&power_profile,
 		NULL
 	},
 };
@@ -52,37 +49,47 @@ static struct sm_obj_form security_group = {
 	.obj_list = (const struct sm_object *[]) {
 		&bios_lock,
 		&intel_tme,
+		&me_state,
+		&me_state_counter,
 		NULL
 	},
 };
 
-
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
 	.obj_list = (const struct sm_object *[]) {
-		&pciexp_clk_pm,
-		&pciexp_aspm,
-		&pciexp_l1ss,
+		&s0ix_enable,
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth,
+		&bluetooth_rtd3,
+		&wifi,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
+	&battery_group,
+	&debug_group,
+	&pcie_power_management_group,
 	&performance_group,
-	&processor_group,
-	&power_group,
-	&devices_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };
 
diff --git a/src/mainboard/starlabs/lite/cfr.c b/src/mainboard/starlabs/lite/cfr.c
index 0ca59b8e48..4a91a46a06 100644
--- a/src/mainboard/starlabs/lite/cfr.c
+++ b/src/mainboard/starlabs/lite/cfr.c
@@ -8,48 +8,44 @@
 #include <variants.h>
 #include <common/cfr.h>
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
+static struct sm_obj_form audio_video_group = {
+	.ui_name = "Audio/Video",
 	.obj_list = (const struct sm_object *[]) {
-		&power_profile,
+		&microphone,
+		&webcam,
 		NULL
 	},
 };
 
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
-	.obj_list = (const struct sm_object *[]) {
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		NULL
+	},
+};
+
+static struct sm_obj_form io_expansion_group = {
+	.ui_name = "I/O / Expansion",
+	.obj_list = (const struct sm_object *[]) {
+		&card_reader,
+		NULL
+	},
+};
+
 static struct sm_obj_form keyboard_group = {
 	.ui_name = "Keyboard",
 	.obj_list = (const struct sm_object *[]) {
-		&kbl_timeout,
 		&fn_ctrl_swap,
-		NULL
-	},
-};
-
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
-	.obj_list = (const struct sm_object *[]) {
-		&bluetooth,
-		&card_reader,
-		&microphone,
-		&webcam,
-		&wifi,
+		&kbl_timeout,
 		NULL
 	},
 };
@@ -63,36 +59,63 @@ static struct sm_obj_form security_group = {
 	},
 };
 
-
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
 	.obj_list = (const struct sm_object *[]) {
 		#if CONFIG(SOC_INTEL_ALDERLAKE)
-		&pciexp_clk_pm,
 		&pciexp_aspm,
+		&pciexp_clk_pm,
 		&pciexp_l1ss,
 		#endif
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&power_profile,
+		NULL
+	},
+};
+
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
+	.obj_list = (const struct sm_object *[]) {
+		&s0ix_enable,
+		NULL
+	},
+};
+
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
+	.obj_list = (const struct sm_object *[]) {
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth,
+		&wifi,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
-	&performance_group,
-	&processor_group,
-	&power_group,
+	&audio_video_group,
+	&battery_group,
+	&debug_group,
+	&io_expansion_group,
 	&keyboard_group,
-	&devices_group,
+	&pcie_power_management_group,
+	&performance_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };
 
diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c
index f95ff65cb3..10263c45fa 100644
--- a/src/mainboard/starlabs/starbook/cfr.c
+++ b/src/mainboard/starlabs/starbook/cfr.c
@@ -7,79 +7,107 @@
 #include <intelblocks/cfr.h>
 #include <common/cfr.h>
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
+static struct sm_obj_form audio_video_group = {
+	.ui_name = "Audio/Video",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth_rtd3,
-		&fan_mode,
-		&power_profile,
+		&microphone,
+		&webcam,
 		NULL
 	},
 };
 
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
-		&me_state,
-		&me_state_counter,
-		#if CONFIG(BOARD_SUPPORTS_HT)
-		&hyper_threading,
-		#endif
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
-	.obj_list = (const struct sm_object *[]) {
-		&max_charge,
 		#if CONFIG(EC_STARLABS_CHARGING_SPEED)
 		&charging_speed,
 		#endif
-		&power_led,
-		&charge_led,
+		&max_charge,
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		NULL
+	},
+};
+
+#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
+static struct sm_obj_form display_group = {
+	.ui_name = "Display",
+	.obj_list = (const struct sm_object *[]) {
+		&display_native_res,
+		NULL
+	},
+};
+#endif
+
+static struct sm_obj_form io_expansion_group = {
+	.ui_name = "I/O / Expansion",
+	.obj_list = (const struct sm_object *[]) {
+		&card_reader,
+		#if CONFIG(BOARD_STARLABS_STARBOOK_ADL)
+		&pci_hot_plug,
+		#endif
+		#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
+		&thunderbolt,
+		#endif
+		NULL
+	},
+};
+
 static struct sm_obj_form keyboard_group = {
 	.ui_name = "Keyboard",
 	.obj_list = (const struct sm_object *[]) {
-		&kbl_timeout,
 		&fn_ctrl_swap,
+		&kbl_timeout,
 		NULL
 	},
 };
 
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
+static struct sm_obj_form leds_group = {
+	.ui_name = "LEDs",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth,
-		&card_reader,
-		#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
-		&display_native_res,
+		&charge_led,
+		&power_led,
+		NULL
+	},
+};
+
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
+	.obj_list = (const struct sm_object *[]) {
+		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
+		#if CONFIG(BOARD_STARLABS_STARBOOK_RPL)
+		&pciexp_aspm_cpu,
+		#else
+		&pciexp_aspm,
 		#endif
-		#if CONFIG(BOARD_HAS_FPR)
-		&fingerprint_reader,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
 		#endif
+		NULL
+	},
+};
+
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
+	.obj_list = (const struct sm_object *[]) {
+		&fan_mode,
 		#if CONFIG(BOARD_HAS_GNA)
 		&gna,
 		#endif
-		#if CONFIG(EC_STARLABS_LID_SWITCH)
-		&lid_switch,
-		#endif
-		&microphone,
-		#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
-		&thunderbolt,
+		#if CONFIG(BOARD_SUPPORTS_HT)
+		&hyper_threading,
 		#endif
+		&power_profile,
 		#if CONFIG(SOC_INTEL_METEORLAKE)
 		&vpu,
 		#endif
-		&webcam,
-		&wifi,
 		NULL
 	},
 };
@@ -88,47 +116,61 @@ static struct sm_obj_form security_group = {
 	.ui_name = "Security",
 	.obj_list = (const struct sm_object *[]) {
 		&bios_lock,
+		#if CONFIG(BOARD_HAS_FPR)
+		&fingerprint_reader,
+		#endif
 		&intel_tme,
+		&me_state,
+		&me_state_counter,
 		NULL
 	},
 };
 
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
 	.obj_list = (const struct sm_object *[]) {
-		#if CONFIG(BOARD_STARLABS_STARBOOK_ADL)
-		&pci_hot_plug,
-		#endif
-		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
-		&pciexp_clk_pm,
-		#if CONFIG(BOARD_STARLABS_STARBOOK_RPL)
-		&pciexp_aspm_cpu,
-		#else
-		&pciexp_aspm,
-		#endif
-		&pciexp_l1ss,
+		#if CONFIG(EC_STARLABS_LID_SWITCH)
+		&lid_switch,
 		#endif
+		&s0ix_enable,
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth,
+		&bluetooth_rtd3,
+		&wifi,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
-	&performance_group,
-	&processor_group,
-	&power_group,
+	&audio_video_group,
+	&battery_group,
+	&debug_group,
+	#if CONFIG(BOARD_USES_FIXED_MODE_VBT)
+	&display_group,
+	#endif
+	&io_expansion_group,
 	&keyboard_group,
-	&devices_group,
+	&leds_group,
+	&pcie_power_management_group,
+	&performance_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };
 
diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c
index dc306f5776..cb092cae33 100644
--- a/src/mainboard/starlabs/starfighter/cfr.c
+++ b/src/mainboard/starlabs/starfighter/cfr.c
@@ -8,65 +8,87 @@
 #include <variants.h>
 #include <common/cfr.h>
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth_rtd3,
-		&memory_speed,
-		&fan_mode,
-		&power_profile,
-		NULL
-	},
-};
-
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
-	.obj_list = (const struct sm_object *[]) {
-		&me_state,
-		&me_state_counter,
-		&hyper_threading,
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
-	.obj_list = (const struct sm_object *[]) {
-		&max_charge,
 		#if CONFIG(EC_STARLABS_CHARGING_SPEED)
 		&charging_speed,
 		#endif
-		&power_led,
-		&charge_led,
+		&max_charge,
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
-static struct sm_obj_form keyboard_group = {
-	.ui_name = "Keyboard",
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
 	.obj_list = (const struct sm_object *[]) {
-		&kbl_timeout,
-		&fn_ctrl_swap,
+		&debug_level,
 		NULL
 	},
 };
 
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
+static struct sm_obj_form display_group = {
+	.ui_name = "Display",
 	.obj_list = (const struct sm_object *[]) {
+		&display_native_res,
+		NULL
+	},
+};
+
+#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
+static struct sm_obj_form io_expansion_group = {
+	.ui_name = "I/O / Expansion",
+	.obj_list = (const struct sm_object *[]) {
+		&thunderbolt,
+		NULL
+	},
+};
+#endif
+
+static struct sm_obj_form keyboard_group = {
+	.ui_name = "Keyboard",
+	.obj_list = (const struct sm_object *[]) {
+		&fn_ctrl_swap,
+		&kbl_timeout,
+		NULL
+	},
+};
+
+static struct sm_obj_form leds_group = {
+	.ui_name = "LEDs",
+	.obj_list = (const struct sm_object *[]) {
+		&charge_led,
+		&power_led,
+		NULL
+	},
+};
+
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
+	.obj_list = (const struct sm_object *[]) {
+		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
+		&pciexp_aspm,
+		#if CONFIG(HAS_INTEL_CPU_ROOT_PORTS)
+		&pciexp_aspm_cpu,
+		#endif
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		#endif
+		NULL
+	},
+};
+
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
+	.obj_list = (const struct sm_object *[]) {
+		&fan_mode,
 		#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
 		&gna,
 		#endif
-		&display_native_res,
-		#if CONFIG(EC_STARLABS_LID_SWITCH)
-		&lid_switch,
-		#endif
-		#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
-		&thunderbolt,
-		#endif
+		&hyper_threading,
+		&memory_speed,
+		&power_profile,
 		#if CONFIG(SOC_INTEL_METEORLAKE)
 		&vpu,
 		#endif
@@ -79,42 +101,54 @@ static struct sm_obj_form security_group = {
 	.obj_list = (const struct sm_object *[]) {
 		&bios_lock,
 		&intel_tme,
+		&me_state,
+		&me_state_counter,
 		NULL
 	},
 };
 
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
 	.obj_list = (const struct sm_object *[]) {
-		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
-		&pciexp_clk_pm,
-		&pciexp_aspm,
-		#if CONFIG(HAS_INTEL_CPU_ROOT_PORTS)
-		&pciexp_aspm_cpu,
-		#endif
-		&pciexp_l1ss,
+		#if CONFIG(EC_STARLABS_LID_SWITCH)
+		&lid_switch,
 		#endif
+		&s0ix_enable,
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth_rtd3,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
-	&performance_group,
-	&processor_group,
-	&power_group,
+	&battery_group,
+	&debug_group,
+	&display_group,
+	#if CONFIG(DRIVERS_INTEL_USB4_RETIMER)
+	&io_expansion_group,
+	#endif
 	&keyboard_group,
-	&devices_group,
+	&leds_group,
+	&pcie_power_management_group,
+	&performance_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };
 
diff --git a/src/mainboard/starlabs/starlite_adl/cfr.c b/src/mainboard/starlabs/starlite_adl/cfr.c
index 004cd75945..0cf911b9f2 100644
--- a/src/mainboard/starlabs/starlite_adl/cfr.c
+++ b/src/mainboard/starlabs/starlite_adl/cfr.c
@@ -26,58 +26,82 @@ void cfr_touchscreen_update(struct sm_object *new_obj)
 		new_obj->sm_bool.flags = CFR_OPTFLAG_SUPPRESS;
 }
 
-static struct sm_obj_form performance_group = {
-	.ui_name = "Performance",
+static struct sm_obj_form audio_video_group = {
+	.ui_name = "Audio/Video",
 	.obj_list = (const struct sm_object *[]) {
-		&bluetooth_rtd3,
-		&memory_speed,
-		&power_profile,
+		&microphone,
+		&webcam,
 		NULL
 	},
 };
 
-static struct sm_obj_form processor_group = {
-	.ui_name = "Processor",
+static struct sm_obj_form battery_group = {
+	.ui_name = "Battery",
 	.obj_list = (const struct sm_object *[]) {
-		&me_state,
-		&me_state_counter,
-		&s0ix_enable,
-		&vtd,
-		NULL
-	},
-};
-
-static struct sm_obj_form power_group = {
-	.ui_name = "Power",
-	.obj_list = (const struct sm_object *[]) {
-		&max_charge,
 		#if CONFIG(EC_STARLABS_CHARGING_SPEED)
 		&charging_speed,
 		#endif
-		&power_led,
-		&charge_led,
+		&max_charge,
 		&power_on_after_fail_bool,
 		NULL
 	},
 };
 
-static struct sm_obj_form devices_group = {
-	.ui_name = "Devices",
+static struct sm_obj_form debug_group = {
+	.ui_name = "Debug",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		NULL
+	},
+};
+
+static struct sm_obj_form display_group = {
+	.ui_name = "Display",
 	.obj_list = (const struct sm_object *[]) {
 		&accelerometer,
-		&bluetooth,
-		&card_reader,
 		&display_native_res,
+		&touchscreen,
+		NULL
+	},
+};
+
+static struct sm_obj_form io_expansion_group = {
+	.ui_name = "I/O / Expansion",
+	.obj_list = (const struct sm_object *[]) {
+		&card_reader,
+		NULL
+	},
+};
+
+static struct sm_obj_form leds_group = {
+	.ui_name = "LEDs",
+	.obj_list = (const struct sm_object *[]) {
+		&charge_led,
+		&power_led,
+		NULL
+	},
+};
+
+static struct sm_obj_form pcie_power_management_group = {
+	.ui_name = "PCIe Power Management",
+	.obj_list = (const struct sm_object *[]) {
+		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		#endif
+		NULL
+	},
+};
+
+static struct sm_obj_form performance_group = {
+	.ui_name = "Performance",
+	.obj_list = (const struct sm_object *[]) {
 		#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE)
 		&gna,
 		#endif
-		#if CONFIG(EC_STARLABS_LID_SWITCH)
-		&lid_switch,
-		#endif
-		&microphone,
-		&touchscreen,
-		&webcam,
-		&wifi,
+		&memory_speed,
+		&power_profile,
 		NULL
 	},
 };
@@ -87,38 +111,54 @@ static struct sm_obj_form security_group = {
 	.obj_list = (const struct sm_object *[]) {
 		&bios_lock,
 		&intel_tme,
+		&me_state,
+		&me_state_counter,
 		NULL
 	},
 };
 
-static struct sm_obj_form pci_group = {
-	.ui_name = "PCI",
+static struct sm_obj_form suspend_lid_group = {
+	.ui_name = "Suspend & Lid",
 	.obj_list = (const struct sm_object *[]) {
-		#if CONFIG(SOC_INTEL_COMMON_BLOCK_ASPM)
-		&pciexp_clk_pm,
-		&pciexp_aspm,
-		&pciexp_l1ss,
+		#if CONFIG(EC_STARLABS_LID_SWITCH)
+		&lid_switch,
 		#endif
+		&s0ix_enable,
 		NULL
 	},
 };
 
-static struct sm_obj_form coreboot_group = {
-	.ui_name = "coreboot",
+static struct sm_obj_form virtualization_group = {
+	.ui_name = "Virtualization",
 	.obj_list = (const struct sm_object *[]) {
-		&debug_level,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form wireless_group = {
+	.ui_name = "Wireless",
+	.obj_list = (const struct sm_object *[]) {
+		&bluetooth,
+		&bluetooth_rtd3,
+		&wifi,
 		NULL
 	},
 };
 
 static struct sm_obj_form *sm_root[] = {
+	&audio_video_group,
+	&battery_group,
+	&debug_group,
+	&display_group,
+	&io_expansion_group,
+	&leds_group,
+	&pcie_power_management_group,
 	&performance_group,
-	&processor_group,
-	&power_group,
-	&devices_group,
 	&security_group,
-	&pci_group,
-	&coreboot_group,
+	&suspend_lid_group,
+	&virtualization_group,
+	&wireless_group,
 	NULL
 };