Theme is now a proper class field to avoid marshaling warnings