Move away from Mac stuff, also do colours properly