fix color stuff
fix color bug
updates