Yup. I too noticed horrible battery life after upgrading to diablo. Thinking of flashing back. But I'll try it for a few more days. I just changed a wifi setting. Hope it helps. Also I've not used modest nor set it up.