SP-44: Grouping of Orca settings (part 2 of 2)