Hoang: giga_change_1218 : update color