Reorganize the options into universal and add-specific lists.