Fixed bug when lightening \#fff color failed with NaN
Merged conflicts