Update core options and retroinput inline with nightly git repo