Motion + Sunrise - doesn't turn off

[Eric.C.Miller]

Does this look like what you were explaining? (I still get a little lost parsing out the logic of these rules).

Thanks!