Improved support for multitenant themes & plugins