refactored drawing code with more colors