Fixed some colour changing bugs