Display neutral traits in yellow instead of red
Add missing bits
Merge PR #1532 - neutral trait coloring