added additional theme name replacement - now recursive