basic music and preferences
Merge branch 'sound'