More CSS shortcuts and replace Static with Discharge