Update overrides and add bluetooth to modular UA