Theme Chnage Issue Fix