change paladin to yellow and reorganize colors