Fine tune coloring, revise key positioning