Part 5 of UU/UB changes

Changes implemented though Maya
Exceptions:
Mali Mint: Unchanged (Unit production not clear)
Maya Ball Court: Unchanged (XP with theatre unclear)