changes for new theme engine from bamf and superuser from koush