More 5.3 fixes. Added enum values to color and types fields.