Convention tweaks to the Timbre recipe (and a light move)