Fixing themeHelpers