Moved styles from base to elements