updates for basic styles.
resolvevd conflicts.