Some code cleanup and added the initial stuff for Value to Colors