new static syntax for sensors and config keys, plus tidy