Switch to caf-new and use Archidroid Opts