rect & triangles, adjusted colors