Modifying color scheme for consistency and better contrast