changed type and colors