Is there a way to fix the issues (eg, AMOLED Night Clock) without loosing ROOT?

I have the Galaxy S6 Edge and I have it Rooted. I don't want to loose the capabilities that root offers but the AMOLED Night Clock issue drives me crazy, as does the screen auto brightness not working correctly. I've read that the newest update from AT&T fixes these issues but I don't want to loose root. Does anyone know of a fix without having to give upp root? Does OTA Root Keeper work? I'm to the point that if there isn't a fix I'll decide between giving up root or not. Thanks in advance for any help you guys can offer.