Adjustments to align with hardcoded light_values defaults