Added 'None' option for audio device, updated xml replacement code/structure