Revert "Remove custom theme helper capability..."

This reverts commit f55946ca01e846c1b7a95080fb30ad72d16b463c.