Fixed Type and removed Color Nonsense