Uses the RSVP promise implementation in the options UI - fixes #25