Revert "THEME UPDATES WIP (MAY NEED REVERT)"

This reverts commit 13cdb51860357a84ab1f42317bdd06c7e422956b.