Clean up and adjust colors, looking for performance increases