More CSS upgrades