Added per-geometry color