Import field groups from themes and plugins, refactored