Fix colors numeration etc