drawing refactoring, new Colors