WIP on restoring AddColor support in portable document model.

Also slight clean-up of naming of constants to follow same conventions as Forge.