Update more colors
Lots of method fixes
Fixed mismatched duels, simplified code a bit, still too complex