some modifications and black theme