Move "Music" to "Entertainment"

And added spotify, youtube, vimeo, twitch.