merged css from nightly work