Added colors to shapes