Fixed some bugs
More colour choices