Move symbology selection, in preparation for composites
Add HIBC support