Improve light scheme