Ok I was stupid, had to re-assign the button after changing the values obviously. It works now, thank you.
These look very well sorted, finally the control setup starts to make sense. :) If I had one suggestion, I'd create a seperate 'Lights' category so 'Systems' isn't that crowded.
Thanks for sharing!