Added color rules and test