Reworked decorator gen; Added CSS value builders