Updated stuff to work with Color