merge conflict
Started adding colors for specific items.