City themes

And made the correct music in places.