Some styles update part 1