more changes to flat and light scheme