Re-strucutred SCSS a little to accommodate colour partial