change theme fixed bugs