Fixed colour not changing according to the selected colour
Merge branch 'master' of https://github.com/enterprisecoding/yatm