sass colouring fix
merge