Contine refactor of media tones