Ui/coloring lines

Only changed files pushed