Simplify light scheme a little