updated gems and changed color
merge