Major clean up of styles.xml