Minor changes on color