Typos
Residual useless code
Fix updating activity themes when switching from prod to test