Added better color support. WIP though