added color stream
fixed merge conflicts