Fixed cg-video and cg-audio directives with new system.
related #137
related #138