Moving styles from includes/styles to styles