re style
merging with rich
Merge branch 'rich/style' of github.com:StormCreative/chat into dave/cobra