Toggles are now grouped by OF keyword