Rather major map coloring bug

Ensure disp__color is sorted
minor color logical errors
cleanup