Modernize some media files

And also add braces everywhere.

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/1582/