Refactoring
Edit color parser