Revert "Revert "Changes Avatar to Katniss and Legolas""

This reverts commit 356c5c8b0d9918ebd08ecc98a8a260a78cc19dcb.