Refactor colors a bit