added color categories, customized diamond form