Fixed coloring of units. Still needs a little polishing