Refactor & Support Gravatar