1.0 beta 30.4
Remove duplicate code in themes / themes-v11