Move theme helpers to theme class