Updated for theme additions.