cleanup
color parsing fixed