Some refactoring, and added new colors