Upgrade bengott:avatar and theme