Revisions

Updated type colors, removed/renamed multiple feature and type
interactions.