Add colour object changes from old fork.
& tests now fail all due to color's not being integers anymore