Include Select or Other as a dependency
Add Payment Options field map table and theme
Payment method selection and settings array updates