updated type & colors

rearranged asset locations
resolve conflict