nitg-s: merged typeids, type_colors and type_masks into type_layout