Simplify styles
Merge pull request #1 from Warry/wip-styles

Simplify styles