Add new styles
Merge branch 'master' into dev