Revert "scrap templates resolver since egos work"

This reverts commit 23153d0fe425eea975e303422d581648e9dabfb3.
back to using resolvers to avoid weird freezes