Sync styles with upstream