Fix some issues with light scheme