Fix grand theme