RGB-18

Taxonomy upgrade extras: