NXIDE-273 - wip - better marketplace templating