Merge branch 'cleanup-styles' into dev