A music service remote from a local device user identifies matching video and music content. An identification of a piece of media content that is part of a collection or playlist, is received by the service, the selected piece of media content being included in a unified catalog of video and music content that is accessible by the music service. If the selected piece of media content has a matching member in the unified catalog, the matching member replaces the selected piece of media content during playback of the collection on the local device. The service analyzes a collection of media content associated with the user, the content collection being either i) stored locally on the local device, or ii) stored remotely from the local device in a store that is accessible by the music service, or iii) stored using a combination of local and remote storage.