WIP: Multimedia improvments

/cc @crichard 
scss-lint is complaining about a missing blank line before this line.