Reorganzation of coloring functions done