Modified CM media/audio/display

Hopefully this will actually compile...