Feature/coloring