Correct Checkmark and Coloring
merged