Update Theme Manager WIP Do Not Build