Update styles
Merge branch 'staging'