Improved handling of CSS