i125258 reworked some of the style hierarchy stuff