More upstream stylesheet changes