Multimedia: Reapply changes from #882

- Also replaced include with extend/placeholder
- Spacing