Merge adding theme support for audio and video