Alarms type restructured - needs work on save