I suggest adding a "no change" option to the "Choose sensors to arm" part of Modes.
So you would have "ARMED", "NO CHANGE", "DISARMED"
This would be useful for sensors which are manually or automatically armed (e.g. based on time, or other sensors) and not based on the mode.
It also allows the "armed" status to be used more generically - currently it seemed to be very strongly biased towards security.
(An even better option would to add an "enabled" or "disabled" switch, but that is probably a lot more complex...)