Pull in some updates to basic.scss