Fixed the Colors/Names problem.

However, I am not done editing.