Added color support (Still in-progress)