Issue #2195067 by chertzog: Update D7 Theme functions.