Fix color encoder
Expand color support