THEME UPDATES WIP (MAY NEED REVERT)