Merge branch 'fc/styles'