Added color support + better format handling