Consolidate level index -> color mappings in SecOrg to a single place

bundle update some stuff