Move styles from core to app