Issue #2226207 by drunken monkey: Adapted to new default "template" for theme functions.