This plus Smarter Bulbs (with changes) works well. I’ll put my Smarter Bulbs changes in the same repo.