On a related note though, the thermostat definitions still do not allow the controller ID to be added to the item definition. (I know, that should have been reported when thermostats were being worked on, but it is the same related issue that the temp/humidity sensors had).
Per comment in #113