Finished this round of refactoring. Added color category.