rearrange, add style definitions