I would actually use modes and then check out the new Room Lighting app. It combines all the features of mode/motion lighting, along with groups and scenes into one app, and also adds additional features. If you already made some scenes you can import them to get started. There is a huge write up on the forms.
