Grouped types and added colors