New styles from master branch added
Merge branch 'kram-dev' into kram-chat