added theme audio
fixed merge conflicts
made gulp happy
fixed merge conflicts with audio import