New style
merged, changes on styles