Update broke all kinds of CSS

The update from 2.1.1 to 2.1.7 broke all kinds of custom CSS.

Please stop changing the element names between revisions.