Fixed colour scaling

colour still doesn't update on merging though