Yarp. Battle music vs ambient music should be two separate things. Some of hte dungeon music is really nice, and the old (and frankly tired) battle music interrupts the feeling.