Use new styling
Merge branch 'in-room-with-new-styles'