fixes in generator and color
fixes in generator and color