Add nightwaking; ESR on UIs