new-theme fixed