Renaming.
Added color for constants other than numbers. Leaves room for improvement.