Updated the tests and refactored the code some.

Reworked the hash structure of colors.