add on backlights in wait mode; code refactoring