white-black theme bug fixed