fix bug and update color