Theme Updates after Refactor