Added color parsing