Tweaks before reverting back to Light UI.
Reverted to Light UI.