Core changes related to CSS