update colors
fix names