Extended config and better audio swap