Remove avoidance of style class generation (further extensions easier); Bugfixing