Added a few missing fields and updated colors.