Initial CSS update

Modifications for ECSEL-specific changes coming next.