Adjust styles

Supports #341