Added back new coloring of entries