Add new styling.
Resolve merge conflict.