Added color and stuff