Now using @mixin tag and a few minor fixes