Improved rules for merge with a11y.css