Fixed a small bug with themes
merging
Fixed bug with drumroll track.  Fixed bug with spites switched