Add support for "None" as a ringtone and refactor adding tones