Fix issues with color controls