Refactor code for dropdown color change :smiley: