Final Color Fixes