Added more 'music' and 'sfx' macros

I don't care for these, but there were some appropriate places for them
to be used.