Replaced styles from latest code base