Refactor colors/highlighting