Added music and preferences
merge conflict fixes