Hi @Paul_P - I hope you don’t mind that I moved your post out of the beta thread and into the relevant feature request that @plb44 recently created. Feel free to scroll up and cast a vote. 
–
Note that you can add offsets to sunrise/sunset as part of triggers:
And you can do conditions between a time and sunset/sunrise – you can do this by adding them as two separate conditions rather than using ‘between’:
