add the ChangeTheme part