tidied color rules and added usage tests