Style system improvements