Extract "gravatars" macro
Cleanup templates