Fix colors bugs and improve gitinore