Rename new themes. And some minor fixes (#15156)

Change-Id: I5d01dc91acf167e754468752a46702ee6040f398