Fix colorSet and basic shapes