#257: added the style in more classes